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_ade.c | |
| parent | 68acb6afb6f56d8ab92352993425b5472cf79a78 (diff) | |
| download | talos-obmc-linux-9cd2e854d61ccfa51686f3ed7b0c917708fc641f.tar.gz talos-obmc-linux-9cd2e854d61ccfa51686f3ed7b0c917708fc641f.zip | |
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_ade.c')
| -rw-r--r-- | drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 91188f33b1d9..eaa3df75fc5c 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -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 -; +}; |
