[Intel-gfx] [PATCH 4/8] drm/i915/display: return earlier from intel_modeset_init() without display

Souza, Jose jose.souza at intel.com
Mon Nov 9 20:46:06 UTC 2020


On Fri, 2020-11-06 at 14:55 -0800, Lucas De Marchi wrote:
> From: Jani Nikula <jani.nikula at intel.com>
> 
> !HAS_DISPLAY() implies !HAS_OVERLAY(), skipping overlay setup anyway, so
> return earlier from intel_modeset_init() for clarity.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index b6a9d41a043e..b3e6c43f0cb2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -18364,11 +18364,11 @@ int intel_modeset_init(struct drm_i915_private *i915)
>  {
>  	int ret;
>  
> 
> 
> 
> -	intel_overlay_setup(i915);
> -
>  	if (!HAS_DISPLAY(i915))
>  		return 0;
>  
> 
> 
> 
> +	intel_overlay_setup(i915);
> +
>  	ret = intel_fbdev_init(&i915->drm);
>  	if (ret)
>  		return ret;



More information about the Intel-gfx mailing list