Skip to contentSkip to conversation

drm/i915: Drop a spurious intel_pre_plane_update() call

PATCH Applied [email protected] 3 participants 3 messages Jul 3, 2015 – Jul 6, 2015

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

PATCH 1/1 drm/i915: Drop a spurious intel_pre_plane_update() call

From: Ville Syrjälä <[email protected]>

Kill the extra intel_pre_plane_update() I accidentally added in

commit 852eb00dc44ea2b8896e2fa27c6a36a1f697ba5a
Author: Ville Syrjälä <[email protected]>
Date: Wed Jun 24 22:00:07 2015 +0300

drm/i915: Try to make sure cxsr is disabled around plane enable/disable

This fixes a load of warnings from the frontbuffer tracking.

Testcase: igt/kms_frontbuffer_tracking/fbc-1p-rte

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 724b0e3..5de1ded 100644
@@ -13141,8 +13141,6 @@ static int __intel_set_mode(struct drm_atomic_state *state)
 		if (!needs_modeset(crtc->state))
 			continue;
 
-		intel_pre_plane_update(intel_crtc);
-
 		any_ms = true;
 		intel_pre_plane_update(intel_crtc);
 
Signature · 6 lines
2.3.6

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw

2015-07-03 5:22 GMT-03:00 <[email protected]>:

Quoted 26 lines

From: Ville Syrjälä <[email protected]>

Kill the extra intel_pre_plane_update() I accidentally added in

commit 852eb00dc44ea2b8896e2fa27c6a36a1f697ba5a
Author: Ville Syrjälä <[email protected]>
Date: Wed Jun 24 22:00:07 2015 +0300

drm/i915: Try to make sure cxsr is disabled around plane enable/disable

This fixes a load of warnings from the frontbuffer tracking.

Testcase: igt/kms_frontbuffer_tracking/fbc-1p-rte

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 724b0e3..5de1ded 100644

drivers/gpu/drm/i915/intel_display.c static int __intel_set_mode(struct drm_atomic_state *state) · line 13145

Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +0 -2
@@ -13141,8 +13141,6 @@ static int __intel_set_mode(struct drm_atomic_state *state)
                if (!needs_modeset(crtc->state))
                        continue;
 
-               intel_pre_plane_update(intel_crtc);
-
                any_ms = true;
                intel_pre_plane_update(intel_crtc);

Despite the lack of documentation, I don't think this function was designed to be called twice like that, so:

Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +0 -1
--

2.3.6

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

Signature · 5 lines
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 30 lines · Paulo Zanoni

2015-07-03 5:22 GMT-03:00 <[email protected]>:

Quoted 29 lines

From: Ville Syrjälä <[email protected]>

Kill the extra intel_pre_plane_update() I accidentally added in

commit 852eb00dc44ea2b8896e2fa27c6a36a1f697ba5a
Author: Ville Syrjälä <[email protected]>
Date: Wed Jun 24 22:00:07 2015 +0300

drm/i915: Try to make sure cxsr is disabled around plane enable/disable

This fixes a load of warnings from the frontbuffer tracking.

Testcase: igt/kms_frontbuffer_tracking/fbc-1p-rte

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 724b0e3..5de1ded 100644
@@ -13141,8 +13141,6 @@ static int __intel_set_mode(struct drm_atomic_state *state)
                if (!needs_modeset(crtc->state))
                        continue;
 
Quoted 8 lines

drivers/gpu/drm/i915/intel_display.c static int __intel_set_mode(struct drm_atomic_state *state) · line 13145

Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +0 -2
-               intel_pre_plane_update(intel_crtc);
-
                any_ms = true;
                intel_pre_plane_update(intel_crtc);

Despite the lack of documentation, I don't think this function was designed to be called twice like that, so:

Queued for -next, thanks for 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