Commit 71c8415d authored Nov 06, 2020 by Jani Nikula Committed by Lucas De Marchi Nov 11, 2020

drm/i915/display: return earlier from intel_modeset_init() without display



!HAS_DISPLAY() implies !HAS_OVERLAY(), skipping overlay setup anyway, so
return earlier from intel_modeset_init() for clarity.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201106225531.920641-4-lucas.demarchi@intel.com

parent 2c568805

drivers/gpu/drm/i915/display/intel_display.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -18286,11 +18286,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;

Admin message