diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-11-24 04:18:28 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-11-24 04:18:29 +0300 |
| commit | b3ca8a08d8ed0dc8a9e236d9294efd58554a7b05 (patch) | |
| tree | b8f650642a412e236ce7cf788c1c1afefebe1e92 /drivers/gpu/drm/i915/i915_driver.c | |
| parent | 8692160904c9b8653b36e508c26be3cd9b79402a (diff) | |
| parent | 0561794b6b642b84b879bf97061c4b4fa692839e (diff) | |
| download | linux-b3ca8a08d8ed0dc8a9e236d9294efd58554a7b05.tar.xz | |
Merge tag 'drm-intel-fixes-2023-11-23' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
drm/i915 fixes for v6.7-rc3:
- Fix race between DP MST connectore registration and setup
- Fix GT memory leak on probe error path
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87y1eol98h.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_driver.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_driver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 8a0e2c745e1f..802de2c6decb 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -782,7 +782,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ret = i915_driver_mmio_probe(i915); if (ret < 0) - goto out_tiles_cleanup; + goto out_runtime_pm_put; ret = i915_driver_hw_probe(i915); if (ret < 0) @@ -842,8 +842,6 @@ out_cleanup_hw: i915_ggtt_driver_late_release(i915); out_cleanup_mmio: i915_driver_mmio_release(i915); -out_tiles_cleanup: - intel_gt_release_all(i915); out_runtime_pm_put: enable_rpm_wakeref_asserts(&i915->runtime_pm); i915_driver_late_release(i915); |