Skip to content

Commit ca39ea0

Browse files
sandy-huangrkhuangtao
authored andcommitted
video: rockchip: vop: 3399: fix vop little win1/3 property error
Change-Id: I32580745f0b4ad252225756d793ec7c0247be452 Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
1 parent 7b2fd8b commit ca39ea0

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/video/rockchip/lcdc/rk322x_lcdc.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5122,11 +5122,6 @@ static int vop_probe(struct platform_device *pdev)
51225122
dev_drv->property.max_output_x = 4096;
51235123
dev_drv->property.max_output_y = 2160;
51245124

5125-
if ((VOP_CHIP(vop_dev) == VOP_RK3399) && (vop_dev->id == 1)) {
5126-
vop_dev->data->win[1].property.feature &= ~SUPPORT_HW_EXIST;
5127-
vop_dev->data->win[3].property.feature &= ~SUPPORT_HW_EXIST;
5128-
}
5129-
51305125
init_waitqueue_head(&vop_dev->wait_vop_switch_queue);
51315126
vop_dev->vop_switch_status = 0;
51325127
init_waitqueue_head(&vop_dev->wait_dmc_queue);
@@ -5137,6 +5132,12 @@ static int vop_probe(struct platform_device *pdev)
51375132
dev_err(dev, "register fb for lcdc%d failed!\n", vop_dev->id);
51385133
return ret;
51395134
}
5135+
5136+
if ((VOP_CHIP(vop_dev) == VOP_RK3399) && (vop_dev->id == 1)) {
5137+
dev_drv->win[1]->property.feature &= ~SUPPORT_HW_EXIST;
5138+
dev_drv->win[3]->property.feature &= ~SUPPORT_HW_EXIST;
5139+
}
5140+
51405141
vop_dev->screen = dev_drv->screen0;
51415142
dev_info(dev, "lcdc%d probe ok, iommu %s\n",
51425143
vop_dev->id, dev_drv->iommu_enabled ? "enabled" : "disabled");

0 commit comments

Comments
 (0)