diff options
| author | Maarten Lankhorst <[email protected]> | 2015-05-11 10:45:15 +0200 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2015-05-20 11:25:40 +0200 |
| commit | 49d6fa210e9a87bd83697692753604cbcaf103ae (patch) | |
| tree | e81590bc4bf123aec9083438a3b8a8c57dcfab59 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 2cd601c620ccf7be1e8e317e2e208d395d309237 (diff) | |
drm/i915: Always keep crtc_state->active in sync with enable
With the recent modeset internal rework, we wind up setting crtc_state->enable
to false, but leave crtc_state->active as true following a
drmModeSetCrtc(fb=0), which is incorrect. This mismatch gets caught by
drm_atomic_crtc_check() and causes subsequent atomic operations (such as plane
updates while the CRTC is disabled) to fail.
Bisect points to
commit dad9a7d6d96630182fb52aae7c3856e9e7285e13
Author: Ander Conselvan de Oliveira <[email protected]>
Date: Tue Apr 21 17:13:19 2015 +0300
drm/i915: Use atomic helpers for computing changed flags
as the commit that actually triggers the regression.
The difference compared to (which this patch reverts)
commit 90d469067d0808ddbd9be2c97a4a8e14037b5e46
Author: Matt Roper <[email protected]>
Date: Thu May 7 14:31:28 2015 -0700
drm/i915: Set crtc_state->active to false when CRTC is disabled (v2)
is that we know keep state->active/enable in sync for all legacy
modeset paths, as it should be.
Cc: Matt Roper <[email protected]>
Cc: Ander Conselvan de Oliveira <[email protected]>
Reported-and-Tested-by: Kenneth Graunke <[email protected]>
Signed-off-by: Maarten Lankhorst <[email protected]>
[danvet: Directly squash in the revert and augment the commit
message.]
Signed-off-by: Daniel Vetter <[email protected]>
Revert "drm/i915: Set crtc_state->active to false when CRTC is disabled (v2)"
This reverts commit 90d469067d0808ddbd9be2c97a4a8e14037b5e46.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
0 files changed, 0 insertions, 0 deletions