Skip to contentSkip to conversation

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

PATCH Superseded Uma Shankar 2 participants 3 messages Mar 26, 2020

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

---
 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

Op 26-03-2020 om 13:24 schreef Uma Shankar:

Quoted 30 lines

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.

---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -0
index fe55c7c713f1..e630429af2c0 100644

drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14754

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -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;
 	}
 

Still missing the fixes tags!

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

#2 lore raw
Quoted 47 lines

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

Op 26-03-2020 om 13:24 schreef Uma Shankar:

Quoted 34 lines

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.

---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
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 !=
Quoted 8 lines

drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14754

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +2 -1
-		    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;
 	}
 

Still missing the fixes tags!

My Bad, updated.

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