Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d25bcfb8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



It's deprecated and only should be used by drivers which still use
drm_platform_init, not by anyone else.

And indeed it's entirely unused and can be nuked.

This required a bit more fudging, but I guess kirin_dc_ops really
wants to operate on the platform_device, not something else. Also
bonus points for implementing abstraction, and then storing the vfunc
in a global variable.

Cc: Xinliang Liu <xinliang.liu@linaro.org>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Archit Taneja <architt@codeaurora.org>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471034937-651-7-git-send-email-daniel.vetter@ffwll.ch
parent f1d1326c

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -989,9 +989,9 @@ static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx) 
	return 0;

	return 0;

}

}





static int ade_drm_init(struct drm_device *dev)

static int ade_drm_init(struct platform_device *pdev)

{

{

	struct platform_device *pdev = dev->platformdev;

	struct drm_device *drm_dev = platform_get_drvdata(dev);

	struct ade_data *ade;

	struct ade_data *ade;

	struct ade_hw_ctx *ctx;

	struct ade_hw_ctx *ctx;

	struct ade_crtc *acrtc;

	struct ade_crtc *acrtc;
@@ -1050,9 +1050,9 @@ static int ade_drm_init(struct drm_device *dev) 
	return 0;

	return 0;

}

}





static void ade_drm_cleanup(struct drm_device *dev)

static void ade_drm_cleanup(struct platform_device *pdev)

{

{

	struct platform_device *pdev = dev->platformdev;

	struct drm_device *drm_dev = platform_get_drvdata(dev);

	struct ade_data *ade = platform_get_drvdata(pdev);

	struct ade_data *ade = platform_get_drvdata(pdev);

	struct drm_crtc *crtc = &ade->acrtc.base;

	struct drm_crtc *crtc = &ade->acrtc.base;
@@ -1062,4 +1062,4 @@ static void ade_drm_cleanup(struct drm_device *dev) 
const struct kirin_dc_ops ade_dc_ops = {

const struct kirin_dc_ops ade_dc_ops = {

	.init = ade_drm_init,

	.init = ade_drm_init,

	.cleanup = ade_drm_cleanup

	.cleanup = ade_drm_cleanup

};
 
;

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) 
#endif

#endif

	drm_kms_helper_poll_fini(dev);

	drm_kms_helper_poll_fini(dev);

	drm_vblank_cleanup(dev);

	drm_vblank_cleanup(dev);

	dc_ops->cleanup(dev);

	dc_ops->cleanup(to_platform_device(dev->dev));

	drm_mode_config_cleanup(dev);

	drm_mode_config_cleanup(dev);

	devm_kfree(dev->dev, priv);

	devm_kfree(dev->dev, priv);

	dev->dev_private = NULL;

	dev->dev_private = NULL;
@@ -103,7 +103,7 @@ static int kirin_drm_kms_init(struct drm_device *dev) 
	kirin_drm_mode_config_init(dev);

	kirin_drm_mode_config_init(dev);





	/* display controller init */

	/* display controller init */

	ret = dc_ops->init(dev);

	ret = dc_ops->init(to_platform_device(dev));

	if (ret)

	if (ret)

		goto err_mode_config_cleanup;

		goto err_mode_config_cleanup;
@@ -210,8 +210,6 @@ static int kirin_drm_bind(struct device *dev) 
	if (!drm_dev)

	if (!drm_dev)

		return -ENOMEM;

		return -ENOMEM;





	drm_dev->platformdev = to_platform_device(dev);



	ret = kirin_drm_kms_init(drm_dev);

	ret = kirin_drm_kms_init(drm_dev);

	if (ret)

	if (ret)

		goto err_drm_dev_unref;

		goto err_drm_dev_unref;

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 




/* display controller init/cleanup ops */

/* display controller init/cleanup ops */

struct kirin_dc_ops {

struct kirin_dc_ops {

	int (*init)(struct drm_device *dev);

	int (*init)(struct platform_device *pdev);

	void (*cleanup)(struct drm_device *dev);

	void (*cleanup)(struct platform_device *pdev);

};

};





struct kirin_drm_private {

struct kirin_drm_private {