1 files changed, 14 insertions, 9 deletions

diff --git a/linux-core/radeon_display.c b/linux-core/radeon_display.c
index ddc933cc..679244a9 100644
--- a/linux-core/radeon_display.c
+++ b/linux-core/radeon_display.c
@@ -601,17 +601,18 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
 	if (fb->fbdev)
 		radeonfb_remove(dev, fb);
 
+	drm_gem_object_unreference(radeon_fb->obj);
 	drm_framebuffer_cleanup(fb);
 	kfree(radeon_fb);
 }
 
 static int radeon_user_framebuffer_create_handle(struct drm_framebuffer *fb,
-						  struct drm_file *file_priv,
-						  unsigned int *handle)
+						 struct drm_file *file_priv,
+						 unsigned int *handle)
 {
-	struct drm_gem_object *object = fb->mm_private;
+	struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
 
-	return drm_gem_handle_create(file_priv, object, handle);
+	return drm_gem_handle_create(file_priv, radeon_fb->obj, handle);
 }
 
 static const struct drm_framebuffer_funcs radeon_fb_funcs = {
@@ -622,7 +623,7 @@ static const struct drm_framebuffer_funcs radeon_fb_funcs = {
 struct drm_framebuffer *
 radeon_framebuffer_create(struct drm_device *dev,
 			  struct drm_mode_fb_cmd *mode_cmd,
-			  void *mm_private)
+			  struct drm_gem_object *obj)
 {
 	struct radeon_framebuffer *radeon_fb;
 
@@ -631,7 +632,10 @@ radeon_framebuffer_create(struct drm_device *dev,
 		return NULL;
 
 	drm_framebuffer_init(dev, &radeon_fb->base, &radeon_fb_funcs);
-	drm_helper_mode_fill_fb_struct(&radeon_fb->base, mode_cmd, mm_private);
+ 	drm_helper_mode_fill_fb_struct(&radeon_fb->base, mode_cmd);
+
+ 	radeon_fb->obj = obj;
+
 	return &radeon_fb->base;
 }
 
@@ -641,10 +645,11 @@ radeon_user_framebuffer_create(struct drm_device *dev,
 			       struct drm_mode_fb_cmd *mode_cmd)
 {
 	struct radeon_framebuffer *radeon_fb;
-	void *mm_private;
+ 	struct drm_gem_object *obj;
+
+ 	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
 
-	mm_private = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
-	return radeon_framebuffer_create(dev, mode_cmd, mm_private);
+	return radeon_framebuffer_create(dev, mode_cmd, obj);
 }
 
 static const struct drm_mode_config_funcs radeon_mode_funcs = {