summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/display/intel_dmc_wl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dmc_wl.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_dmc_wl.c72
1 files changed, 37 insertions, 35 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dmc_wl.c b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
index 30f8905fae41..d9864b9cc429 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc_wl.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
@@ -51,9 +51,10 @@ static struct intel_dmc_wl_range lnl_wl_range[] = {
{ .start = 0x60000, .end = 0x7ffff },
};
-static void __intel_dmc_wl_release(struct drm_i915_private *i915)
+static void __intel_dmc_wl_release(struct intel_display *display)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct drm_i915_private *i915 = to_i915(display->drm);
+ struct intel_dmc_wl *wl = &display->wl;
WARN_ON(refcount_read(&wl->refcount));
@@ -65,8 +66,8 @@ static void intel_dmc_wl_work(struct work_struct *work)
{
struct intel_dmc_wl *wl =
container_of(work, struct intel_dmc_wl, work.work);
- struct drm_i915_private *i915 =
- container_of(wl, struct drm_i915_private, display.wl);
+ struct intel_display *display =
+ container_of(wl, struct intel_display, wl);
unsigned long flags;
spin_lock_irqsave(&wl->lock, flags);
@@ -75,11 +76,11 @@ static void intel_dmc_wl_work(struct work_struct *work)
if (!refcount_read(&wl->refcount))
goto out_unlock;
- __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, DMC_WAKELOCK_CTL_REQ, 0);
+ __intel_de_rmw_nowl(display, DMC_WAKELOCK1_CTL, DMC_WAKELOCK_CTL_REQ, 0);
- if (__intel_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL,
- DMC_WAKELOCK_CTL_ACK, 0,
- DMC_WAKELOCK_CTL_TIMEOUT)) {
+ if (__intel_de_wait_for_register_nowl(display, DMC_WAKELOCK1_CTL,
+ DMC_WAKELOCK_CTL_ACK, 0,
+ DMC_WAKELOCK_CTL_TIMEOUT)) {
WARN_RATELIMIT(1, "DMC wakelock release timed out");
goto out_unlock;
}
@@ -106,23 +107,24 @@ static bool intel_dmc_wl_check_range(u32 address)
return wl_needed;
}
-static bool __intel_dmc_wl_supported(struct drm_i915_private *i915)
+static bool __intel_dmc_wl_supported(struct intel_display *display)
{
- if (DISPLAY_VER(i915) < 20 ||
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
+ if (DISPLAY_VER(display) < 20 ||
!intel_dmc_has_payload(i915) ||
- !i915->display.params.enable_dmc_wl)
+ !display->params.enable_dmc_wl)
return false;
return true;
}
-void intel_dmc_wl_init(struct drm_i915_private *i915)
+void intel_dmc_wl_init(struct intel_display *display)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct intel_dmc_wl *wl = &display->wl;
/* don't call __intel_dmc_wl_supported(), DMC is not loaded yet */
- if (DISPLAY_VER(i915) < 20 ||
- !i915->display.params.enable_dmc_wl)
+ if (DISPLAY_VER(display) < 20 || !display->params.enable_dmc_wl)
return;
INIT_DELAYED_WORK(&wl->work, intel_dmc_wl_work);
@@ -130,12 +132,12 @@ void intel_dmc_wl_init(struct drm_i915_private *i915)
refcount_set(&wl->refcount, 0);
}
-void intel_dmc_wl_enable(struct drm_i915_private *i915)
+void intel_dmc_wl_enable(struct intel_display *display)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct intel_dmc_wl *wl = &display->wl;
unsigned long flags;
- if (!__intel_dmc_wl_supported(i915))
+ if (!__intel_dmc_wl_supported(display))
return;
spin_lock_irqsave(&wl->lock, flags);
@@ -148,7 +150,7 @@ void intel_dmc_wl_enable(struct drm_i915_private *i915)
* wakelock, because we're just enabling it, so call the
* non-locking version directly here.
*/
- __intel_de_rmw_nowl(i915, DMC_WAKELOCK_CFG, 0, DMC_WAKELOCK_CFG_ENABLE);
+ __intel_de_rmw_nowl(display, DMC_WAKELOCK_CFG, 0, DMC_WAKELOCK_CFG_ENABLE);
wl->enabled = true;
wl->taken = false;
@@ -157,12 +159,12 @@ out_unlock:
spin_unlock_irqrestore(&wl->lock, flags);
}
-void intel_dmc_wl_disable(struct drm_i915_private *i915)
+void intel_dmc_wl_disable(struct intel_display *display)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct intel_dmc_wl *wl = &display->wl;
unsigned long flags;
- if (!__intel_dmc_wl_supported(i915))
+ if (!__intel_dmc_wl_supported(display))
return;
flush_delayed_work(&wl->work);
@@ -173,7 +175,7 @@ void intel_dmc_wl_disable(struct drm_i915_private *i915)
goto out_unlock;
/* Disable wakelock in DMC */
- __intel_de_rmw_nowl(i915, DMC_WAKELOCK_CFG, DMC_WAKELOCK_CFG_ENABLE, 0);
+ __intel_de_rmw_nowl(display, DMC_WAKELOCK_CFG, DMC_WAKELOCK_CFG_ENABLE, 0);
refcount_set(&wl->refcount, 0);
wl->enabled = false;
@@ -183,12 +185,12 @@ out_unlock:
spin_unlock_irqrestore(&wl->lock, flags);
}
-void intel_dmc_wl_get(struct drm_i915_private *i915, i915_reg_t reg)
+void intel_dmc_wl_get(struct intel_display *display, i915_reg_t reg)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct intel_dmc_wl *wl = &display->wl;
unsigned long flags;
- if (!__intel_dmc_wl_supported(i915))
+ if (!__intel_dmc_wl_supported(display))
return;
if (!intel_dmc_wl_check_range(reg.reg))
@@ -213,13 +215,13 @@ void intel_dmc_wl_get(struct drm_i915_private *i915, i915_reg_t reg)
* run yet.
*/
if (!wl->taken) {
- __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, 0,
+ __intel_de_rmw_nowl(display, DMC_WAKELOCK1_CTL, 0,
DMC_WAKELOCK_CTL_REQ);
- if (__intel_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL,
- DMC_WAKELOCK_CTL_ACK,
- DMC_WAKELOCK_CTL_ACK,
- DMC_WAKELOCK_CTL_TIMEOUT)) {
+ if (__intel_de_wait_for_register_nowl(display, DMC_WAKELOCK1_CTL,
+ DMC_WAKELOCK_CTL_ACK,
+ DMC_WAKELOCK_CTL_ACK,
+ DMC_WAKELOCK_CTL_TIMEOUT)) {
WARN_RATELIMIT(1, "DMC wakelock ack timed out");
goto out_unlock;
}
@@ -231,12 +233,12 @@ out_unlock:
spin_unlock_irqrestore(&wl->lock, flags);
}
-void intel_dmc_wl_put(struct drm_i915_private *i915, i915_reg_t reg)
+void intel_dmc_wl_put(struct intel_display *display, i915_reg_t reg)
{
- struct intel_dmc_wl *wl = &i915->display.wl;
+ struct intel_dmc_wl *wl = &display->wl;
unsigned long flags;
- if (!__intel_dmc_wl_supported(i915))
+ if (!__intel_dmc_wl_supported(display))
return;
if (!intel_dmc_wl_check_range(reg.reg))
@@ -252,7 +254,7 @@ void intel_dmc_wl_put(struct drm_i915_private *i915, i915_reg_t reg)
goto out_unlock;
if (refcount_dec_and_test(&wl->refcount)) {
- __intel_dmc_wl_release(i915);
+ __intel_dmc_wl_release(display);
goto out_unlock;
}
generated by cgit v1.2.3 (git 2.39.0) at 2024-08-09 11:47:50 +0300