diff options
| author |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-04-13 12:00:33 +0200 |
|---|---|---|
| committer |  Jani Nikula <jani.nikula@intel.com>
| 2014-04-23 10:41:01 +0300 |
| commit | 9953599bc02dbc1d3330e6a0bfc6c50e9dffcac6 (patch) | |
| tree | bb6b1a2c9002cba532be34fba7605b19d5f10bad /drivers/gpu/drm/i915/intel_drv.h | |
| parent | drm/i915: Allow user modes to exceed DVI 165MHz limit (diff) | |
| download | linux-9953599bc02dbc1d3330e6a0bfc6c50e9dffcac6.tar.gz linux-9953599bc02dbc1d3330e6a0bfc6c50e9dffcac6.tar.bz2 linux-9953599bc02dbc1d3330e6a0bfc6c50e9dffcac6.zip | |
drm/i915: Don't check gmch state on inherited configs
... our current modeset code isn't good enough yet to handle this. The
scenario is:
1. BIOS sets up a cloned config with lvds+external screen on the same
pipe, e.g. pipe B.
2. We read out that state for pipe B and assign the gmch_pfit state to
it.
3. The initial modeset switches the lvds to pipe A but due to lack of
atomic modeset we don't recompute the config of pipe B.
-> both pipes now claim (in the sw pipe config structure) to use the
gmch_pfit, which just won't work.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74081
Tested-by: max <manikulin@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 0542de982260..328b1a70264b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -236,7 +236,8 @@ struct intel_crtc_config { * tracked with quirk flags so that fastboot and state checker can act * accordingly. */ -#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS (1<<0) /* unreliable sync mode.flags */ +#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS (1<<0) /* unreliable sync mode.flags */ +#define PIPE_CONFIG_QUIRK_INHERITED_MODE (1<<1) /* mode inherited from firmware */ unsigned long quirks; /* User requested mode, only valid as a starting point to |