[Intel-gfx] [PATCH] drm/i915: Clear crtc atomic flags at beginning of transaction

Daniel Vetter daniel at ffwll.ch
Fri Apr 10 00:37:14 PDT 2015


On Thu, Apr 09, 2015 at 10:48:38AM -0700, Matt Roper wrote:
> Once we have full atomic modeset, these kind of flags should be in a
> real intel_crtc_state that's tracked properly.  In the meantime, make
> sure we clear out any old flags at the beginning of a transaction so
> that we don't wind up seeing leftover flags from old transactions that
> were checked, but never went to the commit step.  At the moment, a
> failed check or prepare could leave stale flags behind that interfere
> with the next atomic transaction.
> 
> v2: Just do a memset; the series this patch was originally part of
>     placed additional fields into the structure that shouldn't be
>     cleared, but that's no longer the case.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>

Patch 3 and this one here merged, thanks.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_atomic.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
> index 3903b90..b4ea676 100644
> --- a/drivers/gpu/drm/i915/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/intel_atomic.c
> @@ -76,6 +76,8 @@ int intel_atomic_check(struct drm_device *dev,
>  	state->allow_modeset = false;
>  	for (i = 0; i < ncrtcs; i++) {
>  		struct intel_crtc *crtc = to_intel_crtc(state->crtcs[i]);
> +		if (crtc)
> +			memset(&crtc->atomic, 0, sizeof(crtc->atomic));
>  		if (crtc && crtc->pipe != nuclear_pipe)
>  			not_nuclear = true;
>  	}
> -- 
> 1.8.5.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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


More information about the Intel-gfx mailing list