diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-15 11:07:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-15 11:07:33 +1000 |
| commit | d5e5deddf67389eabc3d9b13004c108120d397e1 (patch) | |
| tree | 2aa2320579e512cc99cab6d8992f42d038dcf466 /drivers/gpu/drm/nouveau/nv04_crtc.c | |
| parent | 44fef22416886a04d432043f741a6faf2c6ffefd (diff) | |
| parent | f4053509669f904aec70c51e2ff75563ba7ae823 (diff) | |
| download | kernel_samsung_smdk4412-d5e5deddf67389eabc3d9b13004c108120d397e1.zip kernel_samsung_smdk4412-d5e5deddf67389eabc3d9b13004c108120d397e1.tar.gz kernel_samsung_smdk4412-d5e5deddf67389eabc3d9b13004c108120d397e1.tar.bz2 | |
Merge remote branch 'nouveau/for-airlied' into drm-linus
* nouveau/for-airlied:
drm/nouveau: add module option to disable TV detection
drm/nouveau: Never evict VRAM buffers to system.
drm/nv50: fix connector table parsing for some cards
drm/nv50: add a memory barrier to pushbuf submission
drm/nouveau: print a message very early during suspend
drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay.
drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI
drm/nouveau: add option to allow override of dcb connector table types
drm/nv50: Improve PGRAPH interrupt handling.
drm/nv50: Make ctxprog wait until interrupt handler is done.
drm/nouveau: Fix fbcon corruption with font width not divisible by 8
drm/nv50: Remove redundant/incorrect ctxvals initialisation.
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_crtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index a1d1ebb..eba687f1 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c @@ -230,9 +230,9 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode) struct drm_framebuffer *fb = crtc->fb; /* Calculate our timings */ - int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; - int horizStart = (mode->crtc_hsync_start >> 3) - 1; - int horizEnd = (mode->crtc_hsync_end >> 3) - 1; + int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; + int horizStart = (mode->crtc_hsync_start >> 3) + 1; + int horizEnd = (mode->crtc_hsync_end >> 3) + 1; int horizTotal = (mode->crtc_htotal >> 3) - 5; int horizBlankStart = (mode->crtc_hdisplay >> 3) - 1; int horizBlankEnd = (mode->crtc_htotal >> 3) - 1; |