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

drm: fix up fb resize again

main
Dave Airlie 2008-06-06 16:24:27 +10:00
parent 00bb548c61
commit 6d4ffd12cd
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linux-core/drm_crtc.c
View File

@ -2055,25 +2055,10 @@ int drm_mode_replacefb(struct drm_device *dev,
goto out; goto out;
} }
fb->width = r->width;
fb->height = r->height;
fb->pitch = r->pitch;
fb->bits_per_pixel = r->bpp;
fb->depth = r->depth;
fb->mm_handle = r->handle;
if (dev->mode_config.funcs->resize_fb) if (dev->mode_config.funcs->resize_fb)
dev->mode_config.funcs->resize_fb(dev, fb); ret = dev->mode_config.funcs->resize_fb(dev, file_priv, fb, r);
else else
ret = -EINVAL; ret = -EINVAL;
#if 0
/* find all crtcs connected to this fb */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
if (crtc->fb->base.id == r->buffer_id) {
crtc->funcs->mode_set_base(crtc, crtc->x, crtc->y);
}
}
#endif
out: out:
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);
return ret; return ret;

4
linux-core/drm_crtc.h
View File

@ -522,9 +522,9 @@ struct drm_mode_set {
* the CRTC<->connector mappings as needed and update its view of the screen. * the CRTC<->connector mappings as needed and update its view of the screen.
*/ */
struct drm_mode_config_funcs { struct drm_mode_config_funcs {
bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb); int (*resize_fb)(struct drm_device *dev, struct drm_file *file_priv, struct drm_framebuffer *fb, struct drm_mode_fb_cmd *mode_cmd);
struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd); struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
void (*fb_changed)(struct drm_device *dev); int (*fb_changed)(struct drm_device *dev);
}; };
struct drm_mode_group { struct drm_mode_group {

1
linux-core/drm_crtc_helper.c
View File

@ -758,3 +758,4 @@ out_err:
return ret; return ret;
} }
EXPORT_SYMBOL(drm_get_buffer_object); EXPORT_SYMBOL(drm_get_buffer_object);

32
linux-core/intel_display.c
View File

@ -1517,8 +1517,38 @@ struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev,
return &intel_fb->base; return &intel_fb->base;
} }
static int intel_insert_new_fb(struct drm_device *dev, struct drm_file *file_priv,
struct drm_framebuffer *fb, struct drm_mode_fb_cmd *mode_cmd)
{
struct intel_framebuffer *intel_fb;
struct drm_buffer_object *bo;
struct drm_crtc *crtc;
intel_fb = to_intel_framebuffer(fb);
mutex_lock(&dev->struct_mutex);
bo = drm_lookup_buffer_object(file_priv, mode_cmd->handle, 0);
mutex_unlock(&dev->struct_mutex);
if (!bo)
return -EINVAL;
drm_helper_mode_fill_fb_struct(fb, mode_cmd);
drm_bo_usage_deref_unlocked(&intel_fb->bo);
intel_fb->bo = bo;
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
if (crtc->fb == fb) {
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y);
}
}
return 0;
}
static const struct drm_mode_config_funcs intel_mode_funcs = { static const struct drm_mode_config_funcs intel_mode_funcs = {
.resize_fb = NULL, .resize_fb = intel_insert_new_fb,
.fb_create = intel_user_framebuffer_create, .fb_create = intel_user_framebuffer_create,
.fb_changed = intelfb_probe, .fb_changed = intelfb_probe,
}; };