Skip to content

Commit

Permalink
vmwgfx: Screen object cleanups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Hellstrom authored and Dave Airlie committed Nov 7, 2011
1 parent c9a1be9 commit d4528b8
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ struct vmw_screen_object_display {
struct list_head active;

unsigned num_active;
unsigned last_num_active;

struct vmw_framebuffer *fb;
};
Expand Down Expand Up @@ -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. */
list_del_init(&sou->active);
if (--(ld->num_active) == 0) {
BUG_ON(!ld->fb);
if (ld->fb->unpin)
ld->fb->unpin(ld->fb);
if (--(ld->num_active) == 0)
ld->fb = NULL;
}

return 0;
}
Expand All @@ -103,13 +98,7 @@ static int vmw_sou_add_active(struct vmw_private *vmw_priv,
struct list_head *at;

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))
return 0;
Expand Down Expand Up @@ -522,7 +511,6 @@ int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)

INIT_LIST_HEAD(&dev_priv->sou_priv->active);
dev_priv->sou_priv->num_active = 0;
dev_priv->sou_priv->last_num_active = 0;
dev_priv->sou_priv->fb = NULL;

ret = drm_vblank_init(dev, VMWGFX_NUM_DISPLAY_UNITS);
Expand Down

0 comments on commit d4528b8

Please sign in to comment.