Commit 37eade64 authored by Jani Nikula's avatar Jani Nikula Committed by Rodrigo Vivi

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201106225531.920641-4-lucas.demarchi@intel.com
(cherry picked from commit 71c8415d)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent aff76ab7
...@@ -18039,11 +18039,11 @@ int intel_modeset_init(struct drm_i915_private *i915) ...@@ -18039,11 +18039,11 @@ int intel_modeset_init(struct drm_i915_private *i915)
{ {
int ret; int ret;
intel_overlay_setup(i915);
if (!HAS_DISPLAY(i915)) if (!HAS_DISPLAY(i915))
return 0; return 0;
intel_overlay_setup(i915);
ret = intel_fbdev_init(&i915->drm); ret = intel_fbdev_init(&i915->drm);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment