openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "drm/hisilicon: Don't set drm_device->platformdev" 

This reverts commit d25bcfb8c2.

I somehow missed that it only compiles on arm64 and broke the driver
rather badly.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2016-08-17 13:59:40 +02:00
parent 68acb6afb6
commit 9cd2e854d6
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
View File

@ -989,9 +989,9 @@ static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx)
return 0;
}
static int ade_drm_init(struct platform_device *pdev)
static int ade_drm_init(struct drm_device *dev)
{
struct drm_device *drm_dev = platform_get_drvdata(dev);
struct platform_device *pdev = dev->platformdev;
struct ade_data *ade;
struct ade_hw_ctx *ctx;
struct ade_crtc *acrtc;
@ -1050,9 +1050,9 @@ static int ade_drm_init(struct platform_device *pdev)
return 0;
}
static void ade_drm_cleanup(struct platform_device *pdev)
static void ade_drm_cleanup(struct drm_device *dev)
{
struct drm_device *drm_dev = platform_get_drvdata(dev);
struct platform_device *pdev = dev->platformdev;
struct ade_data *ade = platform_get_drvdata(pdev);
struct drm_crtc *crtc = &ade->acrtc.base;
@ -1062,4 +1062,4 @@ static void ade_drm_cleanup(struct platform_device *pdev)
const struct kirin_dc_ops ade_dc_ops = {
.init = ade_drm_init,
.cleanup = ade_drm_cleanup
;
};

6
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
View File

@ -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;

4
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
View File

@ -15,8 +15,8 @@
/* display controller init/cleanup ops */
struct kirin_dc_ops {
int (*init)(struct platform_device *pdev);
void (*cleanup)(struct platform_device *pdev);
int (*init)(struct drm_device *dev);
void (*cleanup)(struct drm_device *dev);
};
struct kirin_drm_private {