diff options
author | Dave Airlie <airlied@redhat.com> | 2019-01-25 07:44:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-01-25 07:45:00 +1000 |
commit | f0e7ce1eef5854584dfb59b3824a67edee37580f (patch) | |
tree | 45d622c2588a7bd42430d7e7590617f13341670d /drivers/gpu/drm/msm/msm_gpu.c | |
parent | 7325e4bd06b02c3aa14fb1066164aefcdee73115 (diff) | |
parent | a840f690d3c6f2f27425ca7e7bd2d635cdec07d7 (diff) | |
download | linux-f0e7ce1eef5854584dfb59b3824a67edee37580f.tar.bz2 |
Merge tag 'drm-msm-fixes-2019-01-24' of git://people.freedesktop.org/~robclark/linux into drm-fixes
A few fixes for v5.0.. the opp-level fix and removal of hard-coded irq
name is partially to make things smoother in v5.1 merge window to
avoid dependency on drm vs dt trees, but are otherwise sane changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGsAEHd2tGRQxRTs+A-8y_tthPs2iUgCCCEwR5vDMXab4A@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 5f3eff304355..10babd18e286 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -900,7 +900,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, } /* Get Interrupt: */ - gpu->irq = platform_get_irq_byname(pdev, config->irqname); + gpu->irq = platform_get_irq(pdev, 0); if (gpu->irq < 0) { ret = gpu->irq; DRM_DEV_ERROR(drm->dev, "failed to get irq: %d\n", ret); |