Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: correctly update crtc->x/y in set_base

Browse Source 
While reworking the modeset sequence, this got lost in

commit 25c5b2665f
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sun Jul 8 22:08:04 2012 +0200

    drm/i915: implement new set_mode code flow

I've noticed this because some Xorg versions seem to set up a new mode
with every crtc at (0,0) and then pan to the right multi-monitor
setup. And since some hacks of mine added more calls to mode_set using
the stored crtc->x/y my multi-screen setup blew up.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-09-10 21:58:30 +02:00
parent e04190e0ec
commit 6c4c86f51c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_display.c
View File

@ -2246,6 +2246,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
old_fb = crtc->fb; old_fb = crtc->fb;
crtc->fb = fb; crtc->fb = fb;
crtc->x = x;
crtc->y = y;
if (old_fb) { if (old_fb) {
intel_wait_for_vblank(dev, intel_crtc->pipe); intel_wait_for_vblank(dev, intel_crtc->pipe);
@ -7020,11 +7022,11 @@ bool intel_set_mode(struct drm_crtc *crtc,
dev_priv->display.crtc_disable(&intel_crtc->base); dev_priv->display.crtc_disable(&intel_crtc->base);
} }
if (modeset_pipes) { /* crtc->mode is already used by the ->mode_set callbacks, hence we need
* to set it here already despite that we pass it down the callchain.
*/
if (modeset_pipes)
crtc->mode = *mode; crtc->mode = *mode;
crtc->x = x;
crtc->y = y;
}
/* Only after disabling all output pipelines that will be changed can we /* Only after disabling all output pipelines that will be changed can we
* update the the output configuration. */ * update the the output configuration. */