Juha-Pekka Heikkila <[email protected]> writes: > Add intel_gvt_driver_remove() onto error cleanup path. > > Signed-off-by: Juha-Pekka Heikkila <[email protected]> > --- > drivers/gpu/drm/i915/i915_driver.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c > b/drivers/gpu/drm/i915/i915_driver.c > index 0128faf2e483..f8c01d52aba8 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -908,6 +908,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct > pci_device_id *ent) > i915_gem_drain_freed_objects(i915); > i915_ggtt_driver_late_release(i915); > out_cleanup_mmio: > + intel_gvt_driver_remove(i915); > i915_driver_mmio_release(i915); > out_runtime_pm_put: > enable_rpm_wakeref_asserts(&i915->runtime_pm); > --
It might be the simplest way to fix, or even better to clean up it by moving intel_gvt_driver_remove() into i915_driver_hw_remove(), so they're more paired with i915_driver_hw_probe() and move this fix into hw_probe() as well, anyway... Reviewed-by: Zhenyu Wang <[email protected]>
