Skip to contentSkip to conversation

drm/i915: Add primary plane to mask if it's visible

PATCH In review Maarten Lankhorst 3 participants 5 messages Sep 15, 2015 – Sep 23, 2015

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

PATCH 1/1 drm/i915: Add primary plane to mask if it's visible

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429

---

drivers/gpu/drm/i915/intel_display.c +5 -2
index ca9278be49f7..05c57e6a0e43 100644
@@ -15087,9 +15087,12 @@ static void readout_plane_state(struct intel_crtc *crtc,
 
 		plane_state = to_intel_plane_state(p->base.state);
 
-		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
+		if (p->base.type == DRM_PLANE_TYPE_PRIMARY) {
 			plane_state->visible = primary_get_hw_state(crtc);
-		else {
+			if (plane_state->visible)
+				crtc->base.state->plane_mask |=
+					1 << drm_plane_index(&p->base);
+		} else {
 			if (active)
 				p->disable_plane(&p->base, &crtc->base);
 

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

Tested-by Andreas Reis Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Maarten Lankhorst

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429

Most likely caused by

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d

Author: Maarten Lankhorst <[email protected]>
Date:   Mon Jun 1 12:49:54 2015 +0200

drm/i915: update plane state during init

which is in 4.3, so this of for Jani.
-Daniel

Quoted 25 lines

---

drivers/gpu/drm/i915/intel_display.c +5 -2
index ca9278be49f7..05c57e6a0e43 100644
@@ -15087,9 +15087,12 @@ static void readout_plane_state(struct intel_crtc *crtc,
 
 		plane_state = to_intel_plane_state(p->base.state);
 
-		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
+		if (p->base.type == DRM_PLANE_TYPE_PRIMARY) {
 			plane_state->visible = primary_get_hw_state(crtc);
-		else {
+			if (plane_state->visible)
+				crtc->base.state->plane_mask |=
+					1 << drm_plane_index(&p->base);
+		} else {
 			if (active)
 				p->disable_plane(&p->base, &crtc->base);
 

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

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
#2 lore raw
Quoted 18 lines · Daniel Vetter
Quoted 11 lines · Maarten Lankhorst

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429

Most likely caused by

Quoted 7 lines

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d

Author: Maarten Lankhorst <[email protected]>
Date:   Mon Jun 1 12:49:54 2015 +0200

drm/i915: update plane state during init

which is in 4.3, so this of for Jani.

What's the deal with this patch wrt

commit f9cd7b881a042dcc8f1b1236ecea6deb3eb4d5bd

Author: Ville Syrjälä <[email protected]>
Date:   Thu Sep 10 18:59:08 2015 +0300

drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()

i.e. do we need a different patch for drm-intel-next-queued?

BR,
Jani.

Quoted 32 lines

-Daniel

Quoted 25 lines

---

drivers/gpu/drm/i915/intel_display.c +5 -2
index ca9278be49f7..05c57e6a0e43 100644
@@ -15087,9 +15087,12 @@ static void readout_plane_state(struct intel_crtc *crtc,
 
 		plane_state = to_intel_plane_state(p->base.state);
 
-		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
+		if (p->base.type == DRM_PLANE_TYPE_PRIMARY) {
 			plane_state->visible = primary_get_hw_state(crtc);
-		else {
+			if (plane_state->visible)
+				crtc->base.state->plane_mask |=
+					1 << drm_plane_index(&p->base);
+		} else {
 			if (active)
 				p->disable_plane(&p->base, &crtc->base);
 

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

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Hey,

Op 23-09-15 om 12:29 schreef Jani Nikula:

Quoted 27 lines · Daniel Vetter
Quoted 17 lines · Maarten Lankhorst
Quoted 11 lines

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429

Most likely caused by

Quoted 7 lines

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d

Author: Maarten Lankhorst <[email protected]>
Date:   Mon Jun 1 12:49:54 2015 +0200

drm/i915: update plane state during init

which is in 4.3, so this of for Jani.

What's the deal with this patch wrt

Quoted 8 lines

commit f9cd7b881a042dcc8f1b1236ecea6deb3eb4d5bd

Author: Ville Syrjälä <[email protected]>
Date:   Thu Sep 10 18:59:08 2015 +0300

drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()

i.e. do we need a different patch for drm-intel-next-queued?

Indeed, and a different patch for v4.2 which you commented on. :-) crtc_mask needs to be updated here if plane_state->visible is true.

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

maintainer
#4 lore raw
Quoted 34 lines · Maarten Lankhorst

Hey,

Op 23-09-15 om 12:29 schreef Jani Nikula:

Quoted 31 lines · Daniel Vetter
Quoted 17 lines · Maarten Lankhorst
Quoted 11 lines

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429

Most likely caused by

Quoted 7 lines

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d

Author: Maarten Lankhorst <[email protected]>
Date:   Mon Jun 1 12:49:54 2015 +0200

drm/i915: update plane state during init

which is in 4.3, so this of for Jani.

What's the deal with this patch wrt

commit f9cd7b881a042dcc8f1b1236ecea6deb3eb4d5bd

Author: Ville Syrjälä <[email protected]>
Date:   Thu Sep 10 18:59:08 2015 +0300
Quoted 6 lines
Quoted 4 lines

drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()

i.e. do we need a different patch for drm-intel-next-queued?

Indeed, and a different patch for v4.2 which you commented on. :-) crtc_mask needs to be updated here if plane_state->visible is true.

Okay, I pushed the patch do drm-intel-fixes, thanks for the patch and review. I resolving the conflict on nightly rebuild with what's in drm-intel-next-queued. Please send another patch against dinq.

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