diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 18:25:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-26 17:18:42 -0700 |
| commit | ae043da9f41d0e020eec1c8888337e7e7012eae2 (patch) | |
| tree | 9f9dfd1e77c885632a4b99698c32fc88272b1d14 | |
| parent | 21a32e679ffa7491e89bfbefa0d36413ca9cb64c (diff) | |
| download | kernel-crypto-ae043da9f41d0e020eec1c8888337e7e7012eae2.tar.gz kernel-crypto-ae043da9f41d0e020eec1c8888337e7e7012eae2.tar.xz kernel-crypto-ae043da9f41d0e020eec1c8888337e7e7012eae2.zip | |
drm/i915: Ensure that the crtcinfo is populated during mode_fixup()
commit 897493504addc5609f04a2c4f73c37ab972c29b2 upstream.
This should fix the mysterious mode setting failures reported during
boot up and after resume, generally for i8xx class machines.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16478
Reported-and-tested-by: Xavier Chantry <chantry.xavier@gmail.com>
Buzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29413
Tested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ac38e4605ed..d1c12435af4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2376,11 +2376,19 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *adjusted_mode) { struct drm_device *dev = crtc->dev; + if (HAS_PCH_SPLIT(dev)) { /* FDI link clock is fixed at 2.7G */ if (mode->clock * 3 > 27000 * 4) return MODE_CLOCK_HIGH; } + + /* XXX some encoders set the crtcinfo, others don't. + * Obviously we need some form of conflict resolution here... + */ + if (adjusted_mode->crtc_htotal == 0) + drm_mode_set_crtcinfo(adjusted_mode, 0); + return true; } |