diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2019-05-03 15:39:37 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-05-03 15:39:37 -0400 |
| commit | ae677a67108726214873c02806f02ec7b470a7cf (patch) | |
| tree | bd179c7d31499bed05ed18c798c7e9f05ed83ae4 /drivers/gpu/drm/rockchip | |
| parent | drm: prefix header search paths with $(srctree)/ (diff) | |
| parent | drm/panfrost: Prevent concurrent resets (diff) | |
| download | linux-dev-ae677a67108726214873c02806f02ec7b470a7cf.tar.xz linux-dev-ae677a67108726214873c02806f02ec7b470a7cf.zip | |
Merge panfrost-fixes into drm-misc-next-fixes
Merging some panfrost fixes as well as one rockchip fix that _just_
missed feature freeze.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 8d7a634c12c2..cb938d3cd3c2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -448,6 +448,14 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev) return 0; } +static void rockchip_drm_platform_shutdown(struct platform_device *pdev) +{ + struct drm_device *drm = platform_get_drvdata(pdev); + + if (drm) + drm_atomic_helper_shutdown(drm); +} + static const struct of_device_id rockchip_drm_dt_ids[] = { { .compatible = "rockchip,display-subsystem", }, { /* sentinel */ }, @@ -457,6 +465,7 @@ 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, |