shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: move devm_request_irq to the end of vop2_bind

Browse Source 
At MOS environment, the irq handle may be triggered immediately
after request irq, the irq handle maybe access vop2 memory, e.g.,
vop3_vp_isr() -> vop2_wb_handler() access vop2->wb->regs, so move
devm_request_irq() to the end of this function to make sure vop2 is
initialized.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3df1cc08069ffcffefa91a523db75fb67cd47de3
This commit is contained in:
Sandy Huang
2025-01-13 12:03:11 +08:00
committed by Tao Huang
parent 0520bd5114
commit aeda6a1feb
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -15454,13 +15454,6 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
INIT_WORK(&vop2->post_buf_empty_work, post_buf_empty_work_event);
}
if (vop2->merge_irq == false)
ret = devm_request_irq(dev, vop2->irq, vop3_sys_isr, IRQF_SHARED, dev_name(dev), vop2);
else
ret = devm_request_irq(dev, vop2->irq, vop2_isr, IRQF_SHARED, dev_name(dev), vop2);
if (ret)
return ret;
vop2_dovi_data_init(vop2);
vop2_dsc_data_init(vop2);
@@ -15468,6 +15461,30 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
if (registered_num_crtcs <= 0)
return -ENODEV;
ret = vop2_gamma_init(vop2);
if (ret)
return ret;
vop2_clk_init(vop2);
vop2_cubic_lut_init(vop2);
vop2_wb_connector_init(vop2, registered_num_crtcs);
rockchip_drm_dma_init_device(drm_dev, vop2->dev);
pm_runtime_enable(&pdev->dev);
rockchip_vop2_devfreq_init(vop2);
/**
* At MOS environment, the irq handle may be triggered immediately
* after request irq, the irq handle maybe access vop2 memory, e.g.,
* vop3_vp_isr() -> vop2_wb_handler() access vop2->wb->regs,
* so move devm_request_irq() to the end of this function to make sure
* vop2 is initialized.
*/
if (vop2->merge_irq == false)
ret = devm_request_irq(dev, vop2->irq, vop3_sys_isr, IRQF_SHARED, dev_name(dev), vop2);
else
ret = devm_request_irq(dev, vop2->irq, vop2_isr, IRQF_SHARED, dev_name(dev), vop2);
if (ret)
return ret;
if (vop2->merge_irq == false) {
struct drm_crtc *crtc;
char irq_name[12];
@@ -15491,16 +15508,6 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
}
}
ret = vop2_gamma_init(vop2);
if (ret)
return ret;
vop2_clk_init(vop2);
vop2_cubic_lut_init(vop2);
vop2_wb_connector_init(vop2, registered_num_crtcs);
rockchip_drm_dma_init_device(drm_dev, vop2->dev);
pm_runtime_enable(&pdev->dev);
rockchip_vop2_devfreq_init(vop2);
return 0;
}