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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 3bf3088b0091a82878eb978051aab0a1a86b6459..9566a8d1f470566a03f796f4d0c0f0dfc6b287ec 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -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;