1
0
Fork 0

drm/qxl: drop active_user_framebuffer as its unneeded

This was a bogus way to figure out what the active framebuffer was,
just check if the underlying bo is the primary bo.

Signed-off-by: Dave Airlie <airlied@redhat.com>
wifi-calibration
Dave Airlie 2013-05-13 12:48:40 +10:00 committed by Dave Airlie
parent d7292a07a1
commit b2b4465d8b
2 changed files with 4 additions and 18 deletions

View File

@ -428,10 +428,10 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,
int inc = 1;
qobj = gem_to_qxl_bo(qxl_fb->obj);
if (qxl_fb != qdev->active_user_framebuffer) {
DRM_INFO("%s: qxl_fb 0x%p != qdev->active_user_framebuffer 0x%p\n",
__func__, qxl_fb, qdev->active_user_framebuffer);
}
/* if we aren't primary surface ignore this */
if (!qobj->is_primary)
return 0;
if (!num_clips) {
num_clips = 1;
clips = &norect;
@ -892,7 +892,6 @@ qxl_user_framebuffer_create(struct drm_device *dev,
{
struct drm_gem_object *obj;
struct qxl_framebuffer *qxl_fb;
struct qxl_device *qdev = dev->dev_private;
int ret;
obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
@ -908,13 +907,6 @@ qxl_user_framebuffer_create(struct drm_device *dev,
return NULL;
}
if (qdev->active_user_framebuffer) {
DRM_INFO("%s: active_user_framebuffer %p -> %p\n",
__func__,
qdev->active_user_framebuffer, qxl_fb);
}
qdev->active_user_framebuffer = qxl_fb;
return &qxl_fb->base;
}

View File

@ -255,12 +255,6 @@ struct qxl_device {
struct qxl_gem gem;
struct qxl_mode_info mode_info;
/*
* last created framebuffer with fb_create
* only used by debugfs dumbppm
*/
struct qxl_framebuffer *active_user_framebuffer;
struct fb_info *fbdev_info;
struct qxl_framebuffer *fbdev_qfb;
void *ram_physical;