openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vmwgfx: Screen object cleanups 

Remove unused member.
No need to pin / unpin fb.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Thomas Hellstrom 2011-11-02 09:43:08 +01:00 committed by Dave Airlie
parent c9a1be9627
commit d4528b846e
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
View File

@ -39,7 +39,6 @@ struct vmw_screen_object_display {
struct list_head active; struct list_head active;
unsigned num_active; unsigned num_active;
unsigned last_num_active;
struct vmw_framebuffer *fb; struct vmw_framebuffer *fb;
}; };
@ -84,12 +83,8 @@ static int vmw_sou_del_active(struct vmw_private *vmw_priv,
/* Must init otherwise list_empty(&sou->active) will not work. */ /* Must init otherwise list_empty(&sou->active) will not work. */
list_del_init(&sou->active); list_del_init(&sou->active);
if (--(ld->num_active) == 0) { if (--(ld->num_active) == 0)
BUG_ON(!ld->fb);
if (ld->fb->unpin)
ld->fb->unpin(ld->fb);
ld->fb = NULL; ld->fb = NULL;
}
return 0; return 0;
} }
@ -103,13 +98,7 @@ static int vmw_sou_add_active(struct vmw_private *vmw_priv,
struct list_head *at; struct list_head *at;
BUG_ON(!ld->num_active && ld->fb); BUG_ON(!ld->num_active && ld->fb);
if (vfb != ld->fb) {
if (ld->fb && ld->fb->unpin)
ld->fb->unpin(ld->fb);
if (vfb->pin)
vfb->pin(vfb);
ld->fb = vfb; ld->fb = vfb;
}
if (!list_empty(&sou->active)) if (!list_empty(&sou->active))
return 0; return 0;
@ -522,7 +511,6 @@ int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)
INIT_LIST_HEAD(&dev_priv->sou_priv->active); INIT_LIST_HEAD(&dev_priv->sou_priv->active);
dev_priv->sou_priv->num_active = 0; dev_priv->sou_priv->num_active = 0;
dev_priv->sou_priv->last_num_active = 0;
dev_priv->sou_priv->fb = NULL; dev_priv->sou_priv->fb = NULL;
ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS); ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS);