[PATCH] drm: i915: Wait for fences on new fb, not old

[PATCH] drm: i915: Wait for fences on new fb, not old

[Daniel Stone]

The previous code would wait for fences on the framebuffer from the old
plane state to complete, rather than the new, so you would see tearing
everywhere. Fix this to wait on the new state before we make it active.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Fixes: 94f050246b42 ("drm/i915: nonblocking commit")
Cc: stable@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e5ad101..1bdef9e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14292,7 +14292,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
 
 	for_each_plane_in_state(state, plane, plane_state, i) {
 		struct intel_plane_state *intel_plane_state =
-			to_intel_plane_state(plane_state);
+			to_intel_plane_state(plane->state);
 
 		if (!intel_plane_state->wait_req)
 			continue;
-- 
2.9.3

Re: [Intel-gfx] [PATCH] drm: i915: Wait for fences on new fb, not old

[Daniel Vetter]

On Fri, Oct 21, 2016 at 03:44:54PM +0100, Daniel Stone wrote:
> The previous code would wait for fences on the framebuffer from the old
> plane state to complete, rather than the new, so you would see tearing
> everywhere. Fix this to wait on the new state before we make it active.
> 
> Signed-off-by: Daniel Stone <daniels@collabora.com>
> Fixes: 94f050246b42 ("drm/i915: nonblocking commit")
> Cc: stable@vger.kernel.org
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e5ad101..1bdef9e 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14292,7 +14292,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
>  
>  	for_each_plane_in_state(state, plane, plane_state, i) {
>  		struct intel_plane_state *intel_plane_state =
> -			to_intel_plane_state(plane_state);
> +			to_intel_plane_state(plane->state);
>  
>  		if (!intel_plane_state->wait_req)
>  			continue;
> -- 
> 2.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch