diff options
author | Mandeep Singh Baines <msb@chromium.org> | 2012-09-06 12:49:23 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2012-09-12 23:38:09 -0400 |
commit | 525ee699f08c0d2516103e4ffd57c21041405d0c (patch) | |
tree | 8c0c8a0e140e04bcaf1aaab0c8165ba654679345 /drivers/gpu/drm | |
parent | b716d46e003fc12f64bbdd71e5b9fd733e59b8d4 (diff) |
drm/exynos: fix double call of drm_prime_(init/destroy)_file_private
The double invocations are incorrect but seem to be safe so I don't
think this will fix any bugs.
Before:
[ 7.639366] drm_prime_init_file ee3675d0
[ 7.639377] drm_prime_init_file ee3675d0
[ 7.639507] drm_prime_destroy_file ee3675d0
[ 7.639518] drm_prime_destroy_file ee3675d0
[ 7.639802] drm_prime_init_file ee372390
[ 7.639810] drm_prime_init_file ee372390
[ 8.473316] drm_prime_init_file ee356390
[ 8.473331] drm_prime_init_file ee356390
After:
[ 6.363842] drm_prime_init_file edc2e5d0
[ 6.363994] drm_prime_destroy_file edc2e5d0
[ 6.364260] drm_prime_init_file edc2e750
[ 8.004837] drm_prime_init_file ee36ded0
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 6345abe9fdee..d07071937453 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -160,7 +160,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) | |||
160 | if (!file_priv) | 160 | if (!file_priv) |
161 | return -ENOMEM; | 161 | return -ENOMEM; |
162 | 162 | ||
163 | drm_prime_init_file_private(&file->prime); | ||
164 | file->driver_priv = file_priv; | 163 | file->driver_priv = file_priv; |
165 | 164 | ||
166 | return exynos_drm_subdrv_open(dev, file); | 165 | return exynos_drm_subdrv_open(dev, file); |
@@ -184,7 +183,6 @@ static void exynos_drm_preclose(struct drm_device *dev, | |||
184 | e->base.destroy(&e->base); | 183 | e->base.destroy(&e->base); |
185 | } | 184 | } |
186 | } | 185 | } |
187 | drm_prime_destroy_file_private(&file->prime); | ||
188 | spin_unlock_irqrestore(&dev->event_lock, flags); | 186 | spin_unlock_irqrestore(&dev->event_lock, flags); |
189 | 187 | ||
190 | exynos_drm_subdrv_close(dev, file); | 188 | exynos_drm_subdrv_close(dev, file); |