Skip to content

Commit 37eade6

Browse files
jnikularodrigovivi
authored andcommitted
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 (cherry picked from commit 71c8415d0daa78ef1295743d0e11ba0214d0a9b9) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent aff76ab commit 37eade6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18039,11 +18039,11 @@ int intel_modeset_init(struct drm_i915_private *i915)
1803918039
{
1804018040
int ret;
1804118041

18042-
intel_overlay_setup(i915);
18043-
1804418042
if (!HAS_DISPLAY(i915))
1804518043
return 0;
1804618044

18045+
intel_overlay_setup(i915);
18046+
1804718047
ret = intel_fbdev_init(&i915->drm);
1804818048
if (ret)
1804918049
return ret;

0 commit comments

Comments
 (0)