[Intel-gfx] [v5 1/6] drm/i915: Check for Null for color lut callbacks

Matt Roper matthew.d.roper at intel.com
Thu Jan 10 22:27:26 UTC 2019


On Tue, Jan 08, 2019 at 01:07:28PM +0530, Uma Shankar wrote:
> Check if de-gamma/gamma lut callback is assigned before
> calling the same.
> 
> Signed-off-by: Uma Shankar <uma.shankar at intel.com>

Is it possible for this test to fail?  intel_color_init() seems to
always assign a value (even for platforms that don't actually support
color management).

It seem like if you're going to make this change, you'd also want to
update intel_color_init() to only set the load_luts for platforms where
we actually have color management?


Matt

> ---
>  drivers/gpu/drm/i915/intel_color.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
> index 37fd9dd..4ff4db6 100644
> --- a/drivers/gpu/drm/i915/intel_color.c
> +++ b/drivers/gpu/drm/i915/intel_color.c
> @@ -602,7 +602,8 @@ void intel_color_load_luts(struct intel_crtc_state *crtc_state)
>  	struct drm_device *dev = crtc_state->base.crtc->dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  
> -	dev_priv->display.load_luts(crtc_state);
> +	if (dev_priv->display.load_luts)
> +		dev_priv->display.load_luts(crtc_state);
>  }
>  
>  int intel_color_check(struct intel_crtc_state *crtc_state)
> -- 
> 1.9.1
> 

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795


More information about the Intel-gfx mailing list