Vbt structures will be used during mode config cleanup. Move the vbt structures cleanup to later time to accommodate cleaner mode config removal. Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_display_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 9df9097a0255..002bf7caa7eb 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -466,6 +466,8 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915) destroy_workqueue(i915->display.wq.modeset); intel_fbc_cleanup(i915); + + intel_bios_driver_remove(i915); } /* part #3: call after gem init */ @@ -476,8 +478,6 @@ void intel_display_driver_remove_nogem(struct drm_i915_private *i915) intel_power_domains_driver_remove(i915); intel_vga_unregister(i915); - - intel_bios_driver_remove(i915); } void intel_display_driver_unregister(struct drm_i915_private *i915) -- 2.34.1
