geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeon/drm: fixup ref counting in on fb objs

main
Dave Airlie 2008-11-03 09:36:03 +10:00
parent fd9e05b3f4
commit 563e7e5930
9 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-core/atombios_crtc.c
View File

@ -276,7 +276,7 @@ void atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y)
radeon_fb = to_radeon_framebuffer(crtc->fb); radeon_fb = to_radeon_framebuffer(crtc->fb);
obj = radeon_fb->base.mm_private; obj = radeon_fb->obj;
obj_priv = obj->driver_private; obj_priv = obj->driver_private;
fb_location = obj_priv->bo->offset + dev_priv->fb_location; fb_location = obj_priv->bo->offset + dev_priv->fb_location;

1
linux-core/drm_crtc.h
View File

@ -240,7 +240,6 @@ struct drm_framebuffer {
void *fbdev; void *fbdev;
u32 pseudo_palette[17]; u32 pseudo_palette[17];
struct list_head filp_head; struct list_head filp_head;
void *mm_private;
}; };
struct drm_property_blob { struct drm_property_blob {

4
linux-core/drm_crtc_helper.c
View File

@ -771,15 +771,13 @@ int drm_helper_hotplug_stage_two(struct drm_device *dev)
EXPORT_SYMBOL(drm_helper_hotplug_stage_two); EXPORT_SYMBOL(drm_helper_hotplug_stage_two);
int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd *mode_cmd)
void *mm_private)
{ {
fb->width = mode_cmd->width; fb->width = mode_cmd->width;
fb->height = mode_cmd->height; fb->height = mode_cmd->height;
fb->pitch = mode_cmd->pitch; fb->pitch = mode_cmd->pitch;
fb->bits_per_pixel = mode_cmd->bpp; fb->bits_per_pixel = mode_cmd->bpp;
fb->depth = mode_cmd->depth; fb->depth = mode_cmd->depth;
fb->mm_private = mm_private;
return 0; return 0;
} }

3
linux-core/drm_crtc_helper.h
View File

@ -75,8 +75,7 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, struct drm_display_m
extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd *mode_cmd);
void *mm_private);
static inline void drm_crtc_helper_add(struct drm_crtc *crtc, const struct drm_crtc_helper_funcs *funcs) static inline void drm_crtc_helper_add(struct drm_crtc *crtc, const struct drm_crtc_helper_funcs *funcs)
{ {

19
linux-core/radeon_display.c
View File

@ -601,6 +601,7 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
if (fb->fbdev) if (fb->fbdev)
radeonfb_remove(dev, fb); radeonfb_remove(dev, fb);
drm_gem_object_unreference(radeon_fb->obj);
drm_framebuffer_cleanup(fb); drm_framebuffer_cleanup(fb);
kfree(radeon_fb); kfree(radeon_fb);
} }
@ -609,9 +610,9 @@ static int radeon_user_framebuffer_create_handle(struct drm_framebuffer *fb,
struct drm_file *file_priv, struct drm_file *file_priv,
unsigned int *handle) 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 = { 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 * struct drm_framebuffer *
radeon_framebuffer_create(struct drm_device *dev, radeon_framebuffer_create(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd *mode_cmd,
void *mm_private) struct drm_gem_object *obj)
{ {
struct radeon_framebuffer *radeon_fb; struct radeon_framebuffer *radeon_fb;
@ -631,7 +632,10 @@ radeon_framebuffer_create(struct drm_device *dev,
return NULL; return NULL;
drm_framebuffer_init(dev, &radeon_fb->base, &radeon_fb_funcs); 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; return &radeon_fb->base;
} }
@ -641,10 +645,11 @@ radeon_user_framebuffer_create(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd) struct drm_mode_fb_cmd *mode_cmd)
{ {
struct radeon_framebuffer *radeon_fb; struct radeon_framebuffer *radeon_fb;
void *mm_private; struct drm_gem_object *obj;
mm_private = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle); obj = 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 = { static const struct drm_mode_config_funcs radeon_mode_funcs = {

2
linux-core/radeon_fb.c
View File

@ -1148,7 +1148,7 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
unregister_framebuffer(info); unregister_framebuffer(info);
drm_bo_kunmap(&radeon_fb->kmap_obj); drm_bo_kunmap(&radeon_fb->kmap_obj);
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(fb->mm_private); drm_gem_object_unreference(radeon_fb->obj);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
framebuffer_release(info); framebuffer_release(info);
} }

4
linux-core/radeon_legacy_crtc.c
View File

@ -231,7 +231,7 @@ static bool radeon_set_crtc1_base(struct drm_crtc *crtc, int x, int y)
radeon_fb = to_radeon_framebuffer(crtc->fb); radeon_fb = to_radeon_framebuffer(crtc->fb);
obj = radeon_fb->base.mm_private; obj = radeon_fb->obj;
obj_priv = obj->driver_private; obj_priv = obj->driver_private;
crtc_offset = obj_priv->bo->offset; crtc_offset = obj_priv->bo->offset;
@ -654,7 +654,7 @@ static bool radeon_set_crtc2_base(struct drm_crtc *crtc, int x, int y)
radeon_fb = to_radeon_framebuffer(crtc->fb); radeon_fb = to_radeon_framebuffer(crtc->fb);
obj = radeon_fb->base.mm_private; obj = radeon_fb->obj;
obj_priv = obj->driver_private; obj_priv = obj->driver_private;
crtc2_offset = obj_priv->bo->offset; crtc2_offset = obj_priv->bo->offset;

3
linux-core/radeon_mode.h
View File

@ -255,6 +255,7 @@ struct radeon_connector {
struct radeon_framebuffer { struct radeon_framebuffer {
struct drm_framebuffer base; struct drm_framebuffer base;
struct drm_bo_kmap_obj kmap_obj; struct drm_bo_kmap_obj kmap_obj;
struct drm_gem_object *obj;
}; };
extern struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, extern struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
@ -323,7 +324,7 @@ extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
u16 blue, int regno); u16 blue, int regno);
struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev, struct drm_framebuffer *radeon_framebuffer_create(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd *mode_cmd,
void *mm_private); struct drm_gem_object *obj);
int radeonfb_probe(struct drm_device *dev); int radeonfb_probe(struct drm_device *dev);

8
linux-core/radeon_pm.c
View File

@ -54,10 +54,10 @@ int radeon_suspend(struct drm_device *dev, pm_message_t state)
if (!radeon_fb) if (!radeon_fb)
continue; continue;
if (!radeon_fb->base.mm_private) if (!radeon_fb->obj)
continue; continue;
radeon_gem_object_unpin(radeon_fb->base.mm_private); radeon_gem_object_unpin(radeon_fb->obj);
} }
if (!(dev_priv->flags & RADEON_IS_IGP)) if (!(dev_priv->flags & RADEON_IS_IGP))
@ -175,10 +175,10 @@ int radeon_resume(struct drm_device *dev)
if (!radeon_fb) if (!radeon_fb)
continue; continue;
if (!radeon_fb->base.mm_private) if (!radeon_fb->obj)
continue; continue;
radeon_gem_object_pin(radeon_fb->base.mm_private, radeon_gem_object_pin(radeon_fb->obj,
PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM); PAGE_SIZE, RADEON_GEM_DOMAIN_VRAM);
} }
/* blat the mode back in */ /* blat the mode back in */