git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d451f62
)
drm/vmwgfx: Some modesetting cleanups and fixes.
author
Jakob Bornecrantz
<jakob@vmware.com>
Fri, 28 May 2010 09:22:03 +0000
(11:22 +0200)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 31 May 2010 23:37:36 +0000
(09:37 +1000)
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index
d98b1b1
..
f7094dd
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@
-113,16
+113,6
@@
static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
return 0;
}
return 0;
}
- for (i = 0; i < lds->last_num_active; i++) {
- vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, i);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_IS_PRIMARY, !i);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_X, 0);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_Y, 0);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_WIDTH, 0);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_HEIGHT, 0);
- vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
- }
-
if (!list_empty(&lds->active)) {
entry = list_entry(lds->active.next, typeof(*entry), active);
fb = entry->base.crtc.fb;
if (!list_empty(&lds->active)) {
entry = list_entry(lds->active.next, typeof(*entry), active);
fb = entry->base.crtc.fb;
@@
-131,6
+121,10
@@
static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
fb->bits_per_pixel, fb->depth);
}
fb->bits_per_pixel, fb->depth);
}
+ /* Make sure we always show something. */
+ vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS,
+ lds->num_active ? lds->num_active : 1);
+
i = 0;
list_for_each_entry(entry, &lds->active, active) {
crtc = &entry->base.crtc;
i = 0;
list_for_each_entry(entry, &lds->active, active) {
crtc = &entry->base.crtc;
@@
-146,9
+140,6
@@
static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
i++;
}
i++;
}
- /* Make sure we always show something. */
- vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, i ? i : 1);
-
BUG_ON(i != lds->num_active);
lds->last_num_active = lds->num_active;
BUG_ON(i != lds->num_active);
lds->last_num_active = lds->num_active;