drivers/video/rockchip/rk_fb.c.rej

   1 --- drivers/video/rockchip/rk_fb.c
   2 +++ drivers/video/rockchip/rk_fb.c
   3 @@ -1858,7 +1874,7 @@
   4                 win_data = rk_fb_get_win_data(regs, i);
   5                 if (win_data) {
   6                         if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
   7 -                            win_data->data_format == YUV420)
   8 +                            win_data->reg_area_data[0].data_format == YUV420)
   9                                 continue;
  10                         rk_fb_update_win(dev_drv, win, win_data);
  11                         win->state = 1;
  12 @@ -1930,7 +1948,7 @@
  13                 for (i = 0; i < dev_drv->lcdc_win_num; i++) {
  14                         if (dev_drv->win[i]->state == 1) {
  15                                 if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
  16 -                                   (dev_drv->win[i]->format == YUV420 ||
  17 +                                   (dev_drv->win[i]->area[0].format == YUV420 ||
  18                                      !strcmp(dev_drv->win[i]->name, "hwc"))) {
  19                                         continue;
  20                                 } else {