diff options
| author |   Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-12-01 09:54:28 -0800 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2014-12-05 15:03:46 +0200 |
| commit | af15d2ce5d497ba6535dead782cfadbcc83d90fe (patch) | |
| tree | a2c29f4fadee3e1101864616935d23465b207f51 /drivers | |
| parent | drm/i915: Reject modeset when the same digital port is used more than once (diff) | |
| download | linux-dev-af15d2ce5d497ba6535dead782cfadbcc83d90fe.tar.xz linux-dev-af15d2ce5d497ba6535dead782cfadbcc83d90fe.zip | |
drm/i915: don't always do full mode sets when infoframes are enabled
Partial revert of
commit 206645910b9796bff13fcdb67bdca166b724ba62
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Nov 5 14:26:09 2014 -0800
drm/i915: check for audio and infoframe changes across mode sets v2
References: https://bugs.freedesktop.org/show_bug.cgi?id=86683
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-by: Li Xu <li.l.xu@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6289babd03b0..03d0b0cb8e05 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11583,10 +11583,12 @@ static int intel_crtc_set_config(struct drm_mode_set *set) to_intel_crtc(set->crtc)->config.has_audio) config->mode_changed = true; - /* Force mode sets for any infoframe stuff */ - if (pipe_config->has_infoframe || - to_intel_crtc(set->crtc)->config.has_infoframe) - config->mode_changed = true; + /* + * Note we have an issue here with infoframes: current code + * only updates them on the full mode set path per hw + * requirements. So here we should be checking for any + * required changes and forcing a mode set. + */ } /* set_mode will free it in the mode_changed case */ |