| Message ID | 00c8f6c57205a77d10b9482987c9d27f7b7ff395.1568901239.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: modeset probe/remove path refactoring | expand |
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 902b7fe5adf3..902c4cc033cd 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -16248,6 +16248,8 @@ int intel_modeset_init(struct drm_i915_private *i915) if (ret) DRM_DEBUG_KMS("Initial commit in probe failed.\n"); + intel_overlay_setup(i915); + return 0; } diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 27613f497a46..c14b468384ec 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -392,8 +392,6 @@ static int i915_driver_modeset_probe_irq(struct drm_i915_private *i915) if (ret) goto out; - intel_overlay_setup(i915); - if (!HAS_DISPLAY(i915) || !INTEL_DISPLAY_ENABLED(i915)) return 0;
Pair the overlay init and fini in the same layer. No functional changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)