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

DRM: move irq request after crtc created.

Browse Source 
PD#168985: fix vblank irq panic when crtc not created.

Change-Id: I369a8a0159549001ae0ef216391be730664a4690
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
This commit is contained in:
sky zhou
2018-06-21 12:49:06 +08:00
committed by Yixun Lan
parent caafd46cc9
commit fa6fba6130
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/amlogic/drm/am_meson_vpu.c
View File

@@ -732,20 +732,6 @@ static int am_meson_vpu_bind(struct device *dev,
dev_set_drvdata(dev, amcrtc);
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(dev, "cannot find irq for vpu\n");
return irq;
}
amcrtc->irq = (unsigned int)irq;
ret = devm_request_irq(dev, amcrtc->irq, am_meson_vpu_irq,
IRQF_SHARED, dev_name(dev), drm_dev);
if (ret)
return ret;
/* IRQ is initially disabled; it gets enabled in crtc_enable */
disable_irq(amcrtc->irq);
/* init reserved memory */
ret = of_reserved_mem_device_init(&pdev->dev);
if (ret != 0)
@@ -782,6 +768,22 @@ static int am_meson_vpu_bind(struct device *dev,
return ret;
am_meson_register_crtc_funcs(private->crtc, &meson_private_crtc_funcs);
/*vsync irq.*/
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(dev, "cannot find irq for vpu\n");
return irq;
}
amcrtc->irq = (unsigned int)irq;
ret = devm_request_irq(dev, amcrtc->irq, am_meson_vpu_irq,
IRQF_SHARED, dev_name(dev), drm_dev);
if (ret)
return ret;
/* IRQ is initially disabled; it gets enabled in crtc_enable */
disable_irq(amcrtc->irq);
INIT_DELAYED_WORK(&osd_dwork, mem_free_work);
schedule_delayed_work(&osd_dwork, msecs_to_jiffies(60 * 1000));