Skip to content

Commit dec4f79

Browse files
committed
drm/i915: Use crtc_state->active in primary check_plane func
Since commit 8c7b5cc 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 we compute the plane state for a modeset before actually committing any changes, which means crtc->active won't be correct yet. Looking at future work in the modeset conversion targetting 4.3 the only places where crtc_state->active isn't accurate is when disabling other CRTCs than the one the modeset is for (when stealing connectors). Which isn't the case here. And that's also confirmed by an audit, we do unconditionally update crtc_state->active for the current pipe. We also don't need to update any other plane check functions since we only ever add the primary state to the modeset update right now. Cc: Ander Conselvan de Oliveira <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Jani Nikula <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Reviewed-by: Maarten Lankhorst <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent 63fef06 commit dec4f79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13276,7 +13276,7 @@ intel_check_primary_plane(struct drm_plane *plane,
1327613276
if (ret)
1327713277
return ret;
1327813278

13279-
if (intel_crtc->active) {
13279+
if (crtc_state->base.active) {
1328013280
struct intel_plane_state *old_state =
1328113281
to_intel_plane_state(plane->state);
1328213282

0 commit comments

Comments
 (0)