drm: kirin: Fix dev->driver_data setting

As part of refactoring the kirin driver to better support
different hardware revisions, this patch changes the
dev->driver_data to point to a drm_device, not ade_data.

Thus we set the driver data to drm device after alloc.

Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820230626.23253-22-john.stultz@linaro.org

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index e390b1b657b8c52949be70600ed477585666cbdf..d8e40fcff386dc5ec6bf3983b5c534df4f9ed4af 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -999,7 +999,6 @@ static int ade_drm_init(struct platform_device *pdev)
                DRM_ERROR("failed to alloc ade_data\n");
                return -ENOMEM;
        }
-       platform_set_drvdata(pdev, ade);
 
        ctx = ade_hw_ctx_alloc(pdev, &ade->crtc.base);
        if (IS_ERR(ctx)) {

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
index 68de8838da3c0c17e4a72820824d6a8fac97a72f..7f8d4539b1a970c98c84d6c77df673eb0c330319 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
@@ -44,8 +44,6 @@ static int kirin_drm_kms_init(struct drm_device *dev)
 {
        int ret;
 
-       dev_set_drvdata(dev->dev, dev);
-
        /* dev->mode_config initialization */
        drm_mode_config_init(dev);
        dev->mode_config.min_width = 0;
@@ -140,6 +138,7 @@ static int kirin_drm_bind(struct device *dev)
        drm_dev = drm_dev_alloc(driver_data->driver, dev);
        if (IS_ERR(drm_dev))
                return PTR_ERR(drm_dev);
+       dev_set_drvdata(dev, drm_dev);
 
        ret = kirin_drm_kms_init(drm_dev);
        if (ret)