evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/qxl: drop active_user_framebuffer as its unneeded

Browse source 
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>
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/qxl/qxl_display.c
View file

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

6
drivers/gpu/drm/qxl/qxl_drv.h
View file

@ -255,12 +255,6 @@ struct qxl_device {
struct qxl_gem gem; struct qxl_gem gem;
struct qxl_mode_info mode_info; 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 fb_info *fbdev_info;
struct qxl_framebuffer *fbdev_qfb; struct qxl_framebuffer *fbdev_qfb;
void *ram_physical; void *ram_physical;