[Intel-gfx] [PATCH 2/4] drm/i915: Check for id==PLANE_CURSOR instead of type==DRM_PLANE_TYPE_CURSOR

Chris Wilson chris at chris-wilson.co.uk
Fri Mar 17 19:56:09 UTC 2017


On Fri, Mar 03, 2017 at 05:19:26PM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> The VLV/CHV watermark calculation is really interested in the hardware
> plane type rather than the plane type (which is more of a software
> concept). Let's check plane->id rather plane->type.
> 
> No functional changes.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 54d211d0d29e..70eca32e4036 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1039,7 +1039,7 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,
>  	if (WARN_ON(htotal == 0))
>  		htotal = 1;
>  
> -	if (plane->base.type == DRM_PLANE_TYPE_CURSOR) {
> +	if (plane->id == PLANE_CURSOR) {

Ok, this is bring this piece of code into line with everyone else,
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre


More information about the Intel-gfx mailing list