diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-17 13:59:40 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-17 13:59:40 +0200 |
commit | 9cd2e854d61ccfa51686f3ed7b0c917708fc641f (patch) | |
tree | edb756768fbeeb11bcb990d047efed9bc774d1d7 /drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | |
parent | 68acb6afb6f56d8ab92352993425b5472cf79a78 (diff) |
Revert "drm/hisilicon: Don't set drm_device->platformdev"
This reverts commit d25bcfb8c2e18b9b36f037f38be4d4792ebf8d57.
I somehow missed that it only compiles on arm64 and broke the driver
rather badly.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c')
-rw-r--r-- | drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 6b0f9f6c16e1..1fc2f502d20d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -41,7 +41,7 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) #endif drm_kms_helper_poll_fini(dev); drm_vblank_cleanup(dev); - dc_ops->cleanup(to_platform_device(dev->dev)); + dc_ops->cleanup(dev); drm_mode_config_cleanup(dev); devm_kfree(dev->dev, priv); dev->dev_private = NULL; @@ -103,7 +103,7 @@ static int kirin_drm_kms_init(struct drm_device *dev) kirin_drm_mode_config_init(dev); /* display controller init */ - ret = dc_ops->init(to_platform_device(dev)); + ret = dc_ops->init(dev); if (ret) goto err_mode_config_cleanup; @@ -210,6 +210,8 @@ static int kirin_drm_bind(struct device *dev) if (!drm_dev) return -ENOMEM; + drm_dev->platformdev = to_platform_device(dev); + ret = kirin_drm_kms_init(drm_dev); if (ret) goto err_drm_dev_unref; |