diff options
| author | Huang Jiachai <hjc@rock-chips.com> | 2016-10-09 14:16:05 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2016-10-09 18:42:27 +0800 |
| commit | ca39ea0b6d0f75645c1f6c63448bf356bae22b35 (patch) | |
| tree | 5654915ce3407d5e407665c2de6929e131e2518b /drivers | |
| parent | 7b2fd8b3f59b8ccce3b8df3f11e528e934866b41 (diff) | |
video: rockchip: vop: 3399: fix vop little win1/3 property error
Change-Id: I32580745f0b4ad252225756d793ec7c0247be452
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/rockchip/lcdc/rk322x_lcdc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c index eaef51f4cdc7..a3ba69d8103b 100644 --- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c @@ -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"); |