summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-10 17:58:30 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-10 17:58:30 -0700
commitf50eec752c8754595ba99f0ec7a7c8138316a819 (patch)
tree366c8eda523b0423b57da9a9adec10a077c18a7a
parent44a8761302888080f1cb6596d4573d88c1746da4 (diff)
parentb62ffb8e91dafbe46b4daa5be13a867b149b0170 (diff)
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
-rw-r--r--linux-core/drm_modes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_modes.c b/linux-core/drm_modes.c
index 0f2a612a..14c7acd5 100644
--- a/linux-core/drm_modes.c
+++ b/linux-core/drm_modes.c
@@ -129,9 +129,9 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags)
}
p->crtc_vblank_start = min(p->crtc_vsync_start, p->crtc_vdisplay);
- p->crtc_vblank_end = min(p->crtc_vsync_end, p->crtc_vtotal);
+ p->crtc_vblank_end = max(p->crtc_vsync_end, p->crtc_vtotal);
p->crtc_hblank_start = min(p->crtc_hsync_start, p->crtc_hdisplay);
- p->crtc_hblank_end = min(p->crtc_hsync_end, p->crtc_htotal);
+ p->crtc_hblank_end = max(p->crtc_hsync_end, p->crtc_htotal);
p->crtc_hadjusted = false;
p->crtc_vadjusted = false;