| Message ID | 20201106225531.920641-4-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Fri, 2020-11-06 at 14:55 -0800, Lucas De Marchi wrote: > From: Jani Nikula <jani.nikula@intel.com> > > !HAS_DISPLAY() implies !HAS_OVERLAY(), skipping overlay setup anyway, so > return earlier from intel_modeset_init() for clarity. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > 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> > --- > drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index b6a9d41a043e..b3e6c43f0cb2 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -18364,11 +18364,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;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index b6a9d41a043e..b3e6c43f0cb2 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -18364,11 +18364,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;