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

Commit e59166b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-12-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



- rockchip: Revert change causing WARN on shutdown (Brian)

Cc: Brian Norris <briannorris@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212204309.GA150523@art_vandelay
parents ce07fe9e 63238173

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -448,11 +448,6 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev) 
	return 0;

}



static void rockchip_drm_platform_shutdown(struct platform_device *pdev)

{

	rockchip_drm_platform_remove(pdev);

}



static const struct of_device_id rockchip_drm_dt_ids[] = {

	{ .compatible = "rockchip,display-subsystem", },

	{ /* sentinel */ },
@@ -462,7 +457,6 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); 
static struct platform_driver rockchip_drm_platform_driver = {

	.probe = rockchip_drm_platform_probe,

	.remove = rockchip_drm_platform_remove,

	.shutdown = rockchip_drm_platform_shutdown,

	.driver = {

		.name = "rockchip-drm",

		.of_match_table = rockchip_drm_dt_ids,