diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-25 12:55:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-25 12:55:55 +1000 |
| commit | 3698a75f5a98d0a6599e2878ab25d30a82dd836a (patch) | |
| tree | 153cf6b942da7b01f7f3d3d35e1546893d407514 /drivers/gpu/drm/i915 | |
| parent | bc609f4867f6a14db0efda55a7adef4dca16762e (diff) | |
| parent | cfd48ad8c4a9137b0fde7f0ecf463d44b01875dc (diff) | |
| download | linux-stable-3698a75f5a98d0a6599e2878ab25d30a82dd836a.tar.gz linux-stable-3698a75f5a98d0a6599e2878ab25d30a82dd836a.tar.bz2 linux-stable-3698a75f5a98d0a6599e2878ab25d30a82dd836a.zip | |
Merge tag 'drm-intel-next-fixes-2023-08-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
- Fix TLB invalidation (Alan)
- Fix Display HPD polling (Imre)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZOdOP31OE/Cf1ojo@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hotplug.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c index 0ff5ed46ae1e..69a83dcc1996 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -211,7 +211,7 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv) /* Enable polling and queue hotplug re-enabling. */ if (hpd_disabled) { - drm_kms_helper_poll_enable(&dev_priv->drm); + drm_kms_helper_poll_reschedule(&dev_priv->drm); mod_delayed_work(dev_priv->unordered_wq, &dev_priv->display.hotplug.reenable_work, msecs_to_jiffies(HPD_STORM_REENABLE_DELAY)); @@ -661,7 +661,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work) drm_connector_list_iter_end(&conn_iter); if (enabled) - drm_kms_helper_poll_enable(&dev_priv->drm); + drm_kms_helper_poll_reschedule(&dev_priv->drm); mutex_unlock(&dev_priv->drm.mode_config.mutex); diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index e52089564d79..6f180ee13853 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -1356,7 +1356,7 @@ void vma_invalidate_tlb(struct i915_address_space *vm, u32 *tlb) */ for_each_gt(gt, vm->i915, id) WRITE_ONCE(tlb[id], - intel_gt_next_invalidate_tlb_full(vm->gt)); + intel_gt_next_invalidate_tlb_full(gt)); } static void __vma_put_pages(struct i915_vma *vma, unsigned int count) |