diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-19 16:09:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-19 16:09:20 +1000 |
| commit | 84ade45e056f2e292f07c54446c176d0112d9574 (patch) | |
| tree | 17031e0393468b84de208b779033013769131765 /drivers | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| parent | ed2eebbd61af8d378ca39ad7aef7017f29eed6f3 (diff) | |
| download | linux-rpi3-84ade45e056f2e292f07c54446c176d0112d9574.tar.gz linux-rpi3-84ade45e056f2e292f07c54446c176d0112d9574.tar.bz2 linux-rpi3-84ade45e056f2e292f07c54446c176d0112d9574.zip | |
Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Two more regression fixes for 4.7.
* tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel:
drm/i915: add missing condition for committing planes on crtc
drm/i915: Treat eDP as always connected, again
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 04452cf3eae8..3074c56a643d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11997,6 +11997,12 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, ret = intel_color_check(crtc, crtc_state); if (ret) return ret; + + /* + * Changing color management on Intel hardware is + * handled as part of planes update. + */ + crtc_state->planes_changed = true; } ret = 0; diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 40745e38d438..891107f92d9f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4645,7 +4645,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_dp->detect_done = false; - if (intel_connector->detect_edid) + if (is_edp(intel_dp) || intel_connector->detect_edid) return connector_status_connected; else return connector_status_disconnected; |