Skip to contentSkip to conversation

drm/i915/display: Fix mode private_flags comparison at atomic_check

PATCH In review Uma Shankar 1 participant 2 messages Mar 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 drm/i915/display: Fix mode private_flags comparison at atomic_check

This patch fixes the private_flags of mode to be checked and compared against uapi.mode and not from hw.mode. This helps properly trigger modeset at boot if desired by driver.

It helps resolve audio_codec initialization issues if display is connected at boot. Initial discussion on this issue has happened on below thread:
https://patchwork.freedesktop.org/series/74828/

v2: No functional change. Fixed the Closes tag and added Maarten's RB.

v3: Added Fixes tag.

Cc Ville Syrjä <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Kai Vehmanen <[email protected]>
Cc Souza, Jose <[email protected]>
Fixes 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.")
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
index fe55c7c713f1..e630429af2c0 100644
@@ -14747,8 +14747,8 @@ static int intel_atomic_check(struct drm_device *dev,
 	/* Catch I915_MODE_FLAG_INHERITED */
 	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
 					    new_crtc_state, i) {
-		if (new_crtc_state->hw.mode.private_flags !=
-		    old_crtc_state->hw.mode.private_flags)
+		if (new_crtc_state->uapi.mode.private_flags !=
+		    old_crtc_state->uapi.mode.private_flags)
 			new_crtc_state->uapi.mode_changed = true;
 	}
 
Signature · 6 lines
2.22.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 17 lines

-----Original Message-----
From: Shankar, Uma <[email protected]>
Sent: Thursday, March 26, 2020 6:21 PM
To: [email protected]
Cc: Shankar, Uma <[email protected]>; Ville Syrjä <[email protected]>; Maarten Lankhorst <[email protected]>; Kai Vehmanen <[email protected]>; Souza; Souza, Jose <[email protected]>; Khor, Swee Aun <[email protected]>
Subject: [v3] drm/i915/display: Fix mode private_flags comparison at atomic_check

This patch fixes the private_flags of mode to be checked and compared against uapi.mode and not from hw.mode. This helps properly trigger modeset at boot if desired by driver.

Quoted 7 lines

It helps resolve audio_codec initialization issues if display is connected at boot. Initial discussion on this issue has happened on below thread:
https://patchwork.freedesktop.org/series/74828/

v2: No functional change. Fixed the Closes tag and added Maarten's RB.

v3: Added Fixes tag.

Pushed the change to dinq.

Thanks again Ville and Maarten for all your valuable feedback, suggestions and reviews.

Regards,
Uma Shankar

Quoted 31 lines
Cc Ville Syrjä <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Kai Vehmanen <[email protected]>
Cc Souza, Jose <[email protected]>
Fixes 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.")
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -3
index fe55c7c713f1..e630429af2c0 100644
@@ -14747,8 +14747,8 @@ static int intel_atomic_check(struct drm_device *dev,
 	/* Catch I915_MODE_FLAG_INHERITED */
 	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
 					    new_crtc_state, i) {
-		if (new_crtc_state->hw.mode.private_flags !=
-		    old_crtc_state->hw.mode.private_flags)
+		if (new_crtc_state->uapi.mode.private_flags !=
+		    old_crtc_state->uapi.mode.private_flags)
 			new_crtc_state->uapi.mode_changed = true;
 	}
 
--
Quoted 1 line

2.22.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx