aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-07-07 22:11:58 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:07:32 -0400
commitc6f2f71daed12f57d6f72769b49d29c7391f24ae (patch)
tree4bc8fa076d7b7aa17524a37bb7457f5f8e4ecd67
parentff8ff50342f377b04d576d723b79f1c98200e501 (diff)
drm/nvd0/disp: track down fb positioning method
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 60454889118d..45f8a31e9ac3 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -189,8 +189,6 @@ nvd0_crtc_set_scale(struct nouveau_crtc *nv_crtc, int type, bool update)
189 evo_data(push, (outY << 16) | outX); 189 evo_data(push, (outY << 16) | outX);
190 evo_mthd(push, 0x0494 + (nv_crtc->index * 0x300), 1); 190 evo_mthd(push, 0x0494 + (nv_crtc->index * 0x300), 1);
191 evo_data(push, 0x00000000); 191 evo_data(push, 0x00000000);
192 evo_mthd(push, 0x04b0 + (nv_crtc->index * 0x300), 1);
193 evo_data(push, 0x00000000);
194 evo_mthd(push, 0x04b8 + (nv_crtc->index * 0x300), 1); 192 evo_mthd(push, 0x04b8 + (nv_crtc->index * 0x300), 1);
195 evo_data(push, (mode->vdisplay << 16) | mode->hdisplay); 193 evo_data(push, (mode->vdisplay << 16) | mode->hdisplay);
196 if (update) { 194 if (update) {
@@ -219,6 +217,8 @@ nvd0_crtc_set_image(struct nouveau_crtc *nv_crtc, struct drm_framebuffer *fb,
219 evo_data(push, nvfb->r_pitch); 217 evo_data(push, nvfb->r_pitch);
220 evo_data(push, nvfb->r_format); 218 evo_data(push, nvfb->r_format);
221 evo_data(push, nvfb->r_dma); 219 evo_data(push, nvfb->r_dma);
220 evo_mthd(push, 0x04b0 + (nv_crtc->index * 0x300), 1);
221 evo_data(push, (y << 16) | x);
222 if (update) { 222 if (update) {
223 evo_mthd(push, 0x0080, 1); 223 evo_mthd(push, 0x0080, 1);
224 evo_data(push, 0x00000000); 224 evo_data(push, 0x00000000);