Skip to content

Commit

Permalink
drm/i915/display: return earlier from intel_modeset_init() without di…
Browse files Browse the repository at this point in the history
…splay

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

Cc: Ville Syrjälä <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Signed-off-by: Lucas De Marchi <[email protected]>
Reviewed-by: José Roberto de Souza <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 71c8415)
Signed-off-by: Rodrigo Vivi <[email protected]>
  • Loading branch information
jnikula authored and rodrigovivi committed Dec 3, 2020
1 parent aff76ab commit 37eade6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -18039,11 +18039,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;
Expand Down

0 comments on commit 37eade6

Please sign in to comment.