diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 0e47a898f415..8b78b9cfa383 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -474,15 +474,15 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, | |||
474 | } | 474 | } |
475 | 475 | ||
476 | if (dev_priv->chipset < 0xc0) { | 476 | if (dev_priv->chipset < 0xc0) { |
477 | BEGIN_RING(chan, NvSubSw, 0x0060, 2); | 477 | BEGIN_RING(chan, 0, 0x0060, 2); |
478 | OUT_RING (chan, NvEvoSema0 + nv_crtc->index); | 478 | OUT_RING (chan, NvEvoSema0 + nv_crtc->index); |
479 | OUT_RING (chan, dispc->sem.offset); | 479 | OUT_RING (chan, dispc->sem.offset); |
480 | BEGIN_RING(chan, NvSubSw, 0x006c, 1); | 480 | BEGIN_RING(chan, 0, 0x006c, 1); |
481 | OUT_RING (chan, 0xf00d0000 | dispc->sem.value); | 481 | OUT_RING (chan, 0xf00d0000 | dispc->sem.value); |
482 | BEGIN_RING(chan, NvSubSw, 0x0064, 2); | 482 | BEGIN_RING(chan, 0, 0x0064, 2); |
483 | OUT_RING (chan, dispc->sem.offset ^ 0x10); | 483 | OUT_RING (chan, dispc->sem.offset ^ 0x10); |
484 | OUT_RING (chan, 0x74b1e000); | 484 | OUT_RING (chan, 0x74b1e000); |
485 | BEGIN_RING(chan, NvSubSw, 0x0060, 1); | 485 | BEGIN_RING(chan, 0, 0x0060, 1); |
486 | if (dev_priv->chipset < 0x84) | 486 | if (dev_priv->chipset < 0x84) |
487 | OUT_RING (chan, NvSema); | 487 | OUT_RING (chan, NvSema); |
488 | else | 488 | else |
@@ -490,12 +490,12 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, | |||
490 | } else { | 490 | } else { |
491 | u64 offset = chan->dispc_vma[nv_crtc->index].offset; | 491 | u64 offset = chan->dispc_vma[nv_crtc->index].offset; |
492 | offset += dispc->sem.offset; | 492 | offset += dispc->sem.offset; |
493 | BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0010, 4); | 493 | BEGIN_NVC0(chan, 2, 0, 0x0010, 4); |
494 | OUT_RING (chan, upper_32_bits(offset)); | 494 | OUT_RING (chan, upper_32_bits(offset)); |
495 | OUT_RING (chan, lower_32_bits(offset)); | 495 | OUT_RING (chan, lower_32_bits(offset)); |
496 | OUT_RING (chan, 0xf00d0000 | dispc->sem.value); | 496 | OUT_RING (chan, 0xf00d0000 | dispc->sem.value); |
497 | OUT_RING (chan, 0x1002); | 497 | OUT_RING (chan, 0x1002); |
498 | BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0010, 4); | 498 | BEGIN_NVC0(chan, 2, 0, 0x0010, 4); |
499 | OUT_RING (chan, upper_32_bits(offset)); | 499 | OUT_RING (chan, upper_32_bits(offset)); |
500 | OUT_RING (chan, lower_32_bits(offset ^ 0x10)); | 500 | OUT_RING (chan, lower_32_bits(offset ^ 0x10)); |
501 | OUT_RING (chan, 0x74b1e000); | 501 | OUT_RING (chan, 0x74b1e000); |