video: rockchip: vop: 3399: fix vop little win1/3 property error
authorHuang Jiachai <hjc@rock-chips.com>
Sun, 9 Oct 2016 06:16:05 +0000 (14:16 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Sun, 9 Oct 2016 10:42:27 +0000 (18:42 +0800)
Change-Id: I32580745f0b4ad252225756d793ec7c0247be452
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
drivers/video/rockchip/lcdc/rk322x_lcdc.c

index eaef51f4cdc759875e42decaae08af35550f54ca..a3ba69d8103b9b0be346e53fdee4af774b700801 100644 (file)
@@ -5122,11 +5122,6 @@ static int vop_probe(struct platform_device *pdev)
        dev_drv->property.max_output_x = 4096;
        dev_drv->property.max_output_y = 2160;
 
-       if ((VOP_CHIP(vop_dev) == VOP_RK3399) && (vop_dev->id == 1)) {
-               vop_dev->data->win[1].property.feature &= ~SUPPORT_HW_EXIST;
-               vop_dev->data->win[3].property.feature &= ~SUPPORT_HW_EXIST;
-       }
-
        init_waitqueue_head(&vop_dev->wait_vop_switch_queue);
        vop_dev->vop_switch_status = 0;
        init_waitqueue_head(&vop_dev->wait_dmc_queue);
@@ -5137,6 +5132,12 @@ static int vop_probe(struct platform_device *pdev)
                dev_err(dev, "register fb for lcdc%d failed!\n", vop_dev->id);
                return ret;
        }
+
+       if ((VOP_CHIP(vop_dev) == VOP_RK3399) && (vop_dev->id == 1)) {
+               dev_drv->win[1]->property.feature &= ~SUPPORT_HW_EXIST;
+               dev_drv->win[3]->property.feature &= ~SUPPORT_HW_EXIST;
+       }
+
        vop_dev->screen = dev_drv->screen0;
        dev_info(dev, "lcdc%d probe ok, iommu %s\n",
                 vop_dev->id, dev_drv->iommu_enabled ? "enabled" : "disabled");