diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-08 09:12:53 -0500 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2017-05-28 20:50:38 -0400 |
commit | 4013ef48798ae954530bdb8971d3794333e46526 (patch) | |
tree | 9264ab62051ede8fd442e3ef0f4d9bc18d32a696 | |
parent | bc1f0e04da20473d6fea4444b0cd9ac638a348d5 (diff) |
drm/exynos: Merge pre/postclose hooks
Again no apparent explanation for the split except hysterical raisins.
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 09d3c4c3c858..50294a7bd29d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -82,14 +82,9 @@ err_file_priv_free: | |||
82 | return ret; | 82 | return ret; |
83 | } | 83 | } |
84 | 84 | ||
85 | static void exynos_drm_preclose(struct drm_device *dev, | ||
86 | struct drm_file *file) | ||
87 | { | ||
88 | exynos_drm_subdrv_close(dev, file); | ||
89 | } | ||
90 | |||
91 | static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) | 85 | static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) |
92 | { | 86 | { |
87 | exynos_drm_subdrv_close(dev, file); | ||
93 | kfree(file->driver_priv); | 88 | kfree(file->driver_priv); |
94 | file->driver_priv = NULL; | 89 | file->driver_priv = NULL; |
95 | } | 90 | } |
@@ -145,7 +140,6 @@ static struct drm_driver exynos_drm_driver = { | |||
145 | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | 140 | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
146 | | DRIVER_ATOMIC | DRIVER_RENDER, | 141 | | DRIVER_ATOMIC | DRIVER_RENDER, |
147 | .open = exynos_drm_open, | 142 | .open = exynos_drm_open, |
148 | .preclose = exynos_drm_preclose, | ||
149 | .lastclose = exynos_drm_lastclose, | 143 | .lastclose = exynos_drm_lastclose, |
150 | .postclose = exynos_drm_postclose, | 144 | .postclose = exynos_drm_postclose, |
151 | .gem_free_object_unlocked = exynos_drm_gem_free_object, | 145 | .gem_free_object_unlocked = exynos_drm_gem_free_object, |