Skip to contentSkip to conversation

drm/i915: Do not update pipe state when crtc is inactive.

PATCH In review Maarten Lankhorst 3 participants 6 messages Sep 22, 2015 – Oct 13, 2015

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

PATCH 1/1 drm/i915: Do not update pipe state when crtc is inactive.

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index a4c24e6f5d6f..5a68290bf8c6 100644
@@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 	/* Perform vblank evasion around commit operation */
 	intel_pipe_update_start(intel_crtc);
 
-	if (modeset)
+	if (modeset || !crtc->state->active)
 		return;
 
 	if (to_intel_crtc_state(crtc->state)->update_pipe)
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#1 lore raw
Quoted 3 lines · Maarten Lankhorst

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

-fixes maintainer grumble. How am I supposed to decipher from this
Subject: line and commit message whether this is a real fix to a real problem out there, and therefore to be queued for current -rc development kernels and possibly cc: stable, or not?

When in doubt, I usually shrug it off, and decide it's for drm-intel-next-queued, and therefore SEP.

BR,
Jani.

Quoted 27 lines
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index a4c24e6f5d6f..5a68290bf8c6 100644
@@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 	/* Perform vblank evasion around commit operation */
 	intel_pipe_update_start(intel_crtc);
 
-	if (modeset)
+	if (modeset || !crtc->state->active)
 		return;
 
 	if (to_intel_crtc_state(crtc->state)->update_pipe)
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Op 23-09-15 om 11:01 schreef Jani Nikula:

Quoted 12 lines · Maarten Lankhorst
Quoted 3 lines

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

-fixes maintainer grumble. How am I supposed to decipher from this
Subject: line and commit message whether this is a real fix to a real problem out there, and therefore to be queued for current -rc development kernels and possibly cc: stable, or not?

When in doubt, I usually shrug it off, and decide it's for drm-intel-next-queued, and therefore SEP.

It's for v4.3, so -fixes. Should I explicitly mention it in the commit message next time?

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

maintainer
#3 lore raw
Quoted 10 lines · Maarten Lankhorst

Op 23-09-15 om 11:01 schreef Jani Nikula:

Quoted 9 lines · Maarten Lankhorst
Quoted 3 lines

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

-fixes maintainer grumble. How am I supposed to decipher from this
Subject: line and commit message whether this is a real fix to a real problem out there, and therefore to be queued for current -rc development kernels and possibly cc: stable, or not?

Quoted 5 lines
Quoted 3 lines

When in doubt, I usually shrug it off, and decide it's for drm-intel-next-queued, and therefore SEP.

It's for v4.3, so -fixes. Should I explicitly mention it in the commit message next time?

If you have that information, please do. If not in the commit message, then either as a comment after the --- line or in the subject as [PATCH for v4.3] or something. Otherwise you'll be relying on my competence too much. ;)

BR,
Jani.

Quoted 2 lines

~Maarten

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 14 lines · Jani Nikula
Quoted 13 lines · Maarten Lankhorst

Op 23-09-15 om 11:01 schreef Jani Nikula:

Quoted 12 lines · Maarten Lankhorst
Quoted 3 lines

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

-fixes maintainer grumble. How am I supposed to decipher from this
Subject: line and commit message whether this is a real fix to a real problem out there, and therefore to be queued for current -rc development kernels and possibly cc: stable, or not?

When in doubt, I usually shrug it off, and decide it's for drm-intel-next-queued, and therefore SEP.

Quoted 7 lines
Quoted 2 lines

It's for v4.3, so -fixes. Should I explicitly mention it in the commit message next time?

If you have that information, please do. If not in the commit message, then either as a comment after the --- line or in the subject as [PATCH for v4.3] or something. Otherwise you'll be relying on my competence too much. ;)

What you really should do is mention which commit broke stuff and if applicable, add a Bugzilla: link. That's required information anyway for regression fixes, and we have maintainer scripts to tell us where to place the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#5 lore raw
In reply to Maarten Lankhorst
Quoted 6 lines · Maarten Lankhorst

Nothing good can come from detaching scalers or updating pipe config when the crtc is already disabled. Touching registers while the crtc and power wells are disabled causes unclaimed register access warnings.

Maarten, this patch has no reviews and it no longer applies to v4.3 cleanly. Please rebase and repost if it's still valid.

BR,
Jani.

Quoted 24 lines
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index a4c24e6f5d6f..5a68290bf8c6 100644
@@ -13527,7 +13527,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 	/* Perform vblank evasion around commit operation */
 	intel_pipe_update_start(intel_crtc);
 
-	if (modeset)
+	if (modeset || !crtc->state->active)
 		return;
 
 	if (to_intel_crtc_state(crtc->state)->update_pipe)
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx