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ä <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
  • Loading branch information
Jani Nikula authored and Lucas De Marchi committed Nov 11, 2020
1 parent 2c56880 commit 71c8415
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 @@ -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;
Expand Down

0 comments on commit 71c8415

Please sign in to comment.