From: Gustavo Sousa <gustavo.sousa@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Luca Coelho <luciano.coelho@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH 07/13] drm/i915/dmc_wl: Check ranges specific to DC states
Date: Mon, 21 Oct 2024 19:27:26 -0300 [thread overview]
Message-ID: <20241021222744.294371-8-gustavo.sousa@intel.com> (raw)
In-Reply-To: <20241021222744.294371-1-gustavo.sousa@intel.com>
There are extra registers that require the DMC wakelock when specific
dynamic DC states are in place. Add the table ranges for them and use
the correct table depending on the allowed DC states.
Bspec: 71583
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
drivers/gpu/drm/i915/display/intel_dmc_wl.c | 112 +++++++++++++++++++-
1 file changed, 108 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dmc_wl.c b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
index d597cc825f64..8bf2f32be859 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc_wl.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
@@ -5,6 +5,7 @@
#include <linux/kernel.h>
+#include "i915_reg.h"
#include "intel_de.h"
#include "intel_dmc.h"
#include "intel_dmc_regs.h"
@@ -52,6 +53,87 @@ static struct intel_dmc_wl_range lnl_wl_range[] = {
{},
};
+static struct intel_dmc_wl_range xe3lpd_dc5_dc6_wl_ranges[] = {
+ { .start = 0x45500, .end = 0x45500 }, /* DC_STATE_SEL */
+ { .start = 0x457a0, .end = 0x457b0 }, /* DC*_RESIDENCY_COUNTER */
+ { .start = 0x45504, .end = 0x45504 }, /* DC_STATE_EN */
+ { .start = 0x45400, .end = 0x4540c }, /* PWR_WELL_CTL_* */
+ { .start = 0x454f0, .end = 0x454f0 }, /* RETENTION_CTRL */
+
+ /* DBUF_CTL_* */
+ { .start = 0x44300, .end = 0x44300 },
+ { .start = 0x44304, .end = 0x44304 },
+ { .start = 0x44f00, .end = 0x44f00 },
+ { .start = 0x44f04, .end = 0x44f04 },
+ { .start = 0x44fe8, .end = 0x44fe8 },
+ { .start = 0x45008, .end = 0x45008 },
+
+ { .start = 0x46070, .end = 0x46070 }, /* CDCLK_PLL_ENABLE */
+ { .start = 0x46000, .end = 0x46000 }, /* CDCLK_CTL */
+ { .start = 0x46008, .end = 0x46008 }, /* CDCLK_SQUASH_CTL */
+
+ /* TRANS_CMTG_CTL_* */
+ { .start = 0x6fa88, .end = 0x6fa88 },
+ { .start = 0x6fb88, .end = 0x6fb88 },
+
+ { .start = 0x46430, .end = 0x46430 }, /* CHICKEN_DCPR_1 */
+ { .start = 0x46434, .end = 0x46434 }, /* CHICKEN_DCPR_2 */
+ { .start = 0x454a0, .end = 0x454a0 }, /* CHICKEN_DCPR_4 */
+ { .start = 0x42084, .end = 0x42084 }, /* CHICKEN_MISC_2 */
+ { .start = 0x42088, .end = 0x42088 }, /* CHICKEN_MISC_3 */
+ { .start = 0x46160, .end = 0x46160 }, /* CMTG_CLK_SEL */
+ { .start = 0x8f000, .end = 0x8ffff }, /* Main DMC registers */
+
+ {},
+};
+
+static struct intel_dmc_wl_range xe3lpd_dc3co_wl_ranges[] = {
+ { .start = 0x454a0, .end = 0x454a0 }, /* CHICKEN_DCPR_4 */
+
+ { .start = 0x45504, .end = 0x45504 }, /* DC_STATE_EN */
+
+ /* DBUF_CTL_* */
+ { .start = 0x44300, .end = 0x44300 },
+ { .start = 0x44304, .end = 0x44304 },
+ { .start = 0x44f00, .end = 0x44f00 },
+ { .start = 0x44f04, .end = 0x44f04 },
+ { .start = 0x44fe8, .end = 0x44fe8 },
+ { .start = 0x45008, .end = 0x45008 },
+
+ { .start = 0x46070, .end = 0x46070 }, /* CDCLK_PLL_ENABLE */
+ { .start = 0x46000, .end = 0x46000 }, /* CDCLK_CTL */
+ { .start = 0x46008, .end = 0x46008 }, /* CDCLK_SQUASH_CTL */
+ { .start = 0x8f000, .end = 0x8ffff }, /* Main DMC registers */
+
+ /* Scanline registers */
+ { .start = 0x70000, .end = 0x70000 },
+ { .start = 0x70004, .end = 0x70004 },
+ { .start = 0x70014, .end = 0x70014 },
+ { .start = 0x70018, .end = 0x70018 },
+ { .start = 0x71000, .end = 0x71000 },
+ { .start = 0x71004, .end = 0x71004 },
+ { .start = 0x71014, .end = 0x71014 },
+ { .start = 0x71018, .end = 0x71018 },
+ { .start = 0x72000, .end = 0x72000 },
+ { .start = 0x72004, .end = 0x72004 },
+ { .start = 0x72014, .end = 0x72014 },
+ { .start = 0x72018, .end = 0x72018 },
+ { .start = 0x73000, .end = 0x73000 },
+ { .start = 0x73004, .end = 0x73004 },
+ { .start = 0x73014, .end = 0x73014 },
+ { .start = 0x73018, .end = 0x73018 },
+ { .start = 0x7b000, .end = 0x7b000 },
+ { .start = 0x7b004, .end = 0x7b004 },
+ { .start = 0x7b014, .end = 0x7b014 },
+ { .start = 0x7b018, .end = 0x7b018 },
+ { .start = 0x7c000, .end = 0x7c000 },
+ { .start = 0x7c004, .end = 0x7c004 },
+ { .start = 0x7c014, .end = 0x7c014 },
+ { .start = 0x7c018, .end = 0x7c018 },
+
+ {},
+};
+
static void __intel_dmc_wl_release(struct intel_display *display)
{
struct drm_i915_private *i915 = to_i915(display->drm);
@@ -106,9 +188,31 @@ static bool intel_dmc_wl_addr_in_range(u32 address,
return false;
}
-static bool intel_dmc_wl_check_range(u32 address)
+static bool intel_dmc_wl_check_range(struct intel_display *display, u32 address)
{
- return intel_dmc_wl_addr_in_range(address, lnl_wl_range);
+ const struct intel_dmc_wl_range *ranges;
+
+ ranges = lnl_wl_range;
+
+ if (intel_dmc_wl_addr_in_range(address, ranges))
+ return true;
+
+ switch (display->power.domains.dc_state) {
+ case DC_STATE_EN_DC3CO:
+ ranges = xe3lpd_dc3co_wl_ranges;
+ break;
+ case DC_STATE_EN_UPTO_DC5:
+ case DC_STATE_EN_UPTO_DC6:
+ ranges = xe3lpd_dc5_dc6_wl_ranges;
+ break;
+ default:
+ ranges = NULL;
+ }
+
+ if (ranges && intel_dmc_wl_addr_in_range(address, ranges))
+ return true;
+
+ return false;
}
static bool __intel_dmc_wl_supported(struct intel_display *display)
@@ -195,7 +299,7 @@ void intel_dmc_wl_get(struct intel_display *display, i915_reg_t reg)
if (!__intel_dmc_wl_supported(display))
return;
- if (i915_mmio_reg_valid(reg) && !intel_dmc_wl_check_range(reg.reg))
+ if (i915_mmio_reg_valid(reg) && !intel_dmc_wl_check_range(display, reg.reg))
return;
spin_lock_irqsave(&wl->lock, flags);
@@ -247,7 +351,7 @@ void intel_dmc_wl_put(struct intel_display *display, i915_reg_t reg)
if (!__intel_dmc_wl_supported(display))
return;
- if (i915_mmio_reg_valid(reg) && !intel_dmc_wl_check_range(reg.reg))
+ if (i915_mmio_reg_valid(reg) && !intel_dmc_wl_check_range(display, reg.reg))
return;
spin_lock_irqsave(&wl->lock, flags);
--
2.47.0
next prev parent reply other threads:[~2024-10-21 22:28 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 22:27 [PATCH 00/13] drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD Gustavo Sousa
2024-10-21 22:27 ` [PATCH 01/13] drm/xe: Mimic i915 behavior for non-sleeping MMIO wait Gustavo Sousa
2024-11-01 10:57 ` Luca Coelho
2024-11-05 12:17 ` Gustavo Sousa
2024-10-21 22:27 ` [PATCH 02/13] drm/i915/dmc_wl: Use non-sleeping variant of " Gustavo Sousa
2024-10-22 9:34 ` Jani Nikula
2024-10-22 10:55 ` Gustavo Sousa
2024-11-01 11:04 ` Luca Coelho
2024-11-01 11:18 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 03/13] drm/i915/dmc_wl: Check for non-zero refcount in release work Gustavo Sousa
2024-11-01 11:48 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 04/13] drm/i915/dmc_wl: Get wakelock when disabling dynamic DC states Gustavo Sousa
2024-11-01 12:24 ` Luca Coelho
2024-11-05 12:44 ` Gustavo Sousa
2024-11-06 11:37 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 05/13] drm/i915/dmc_wl: Use sentinel item for range tables Gustavo Sousa
2024-11-01 12:25 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 06/13] drm/i915/dmc_wl: Extract intel_dmc_wl_addr_in_range() Gustavo Sousa
2024-10-21 22:27 ` Gustavo Sousa [this message]
2024-10-22 8:03 ` [PATCH 07/13] drm/i915/dmc_wl: Check ranges specific to DC states Jani Nikula
2024-10-22 11:06 ` Gustavo Sousa
2024-11-05 19:54 ` Gustavo Sousa
2024-10-22 8:03 ` Jani Nikula
2024-10-22 11:10 ` Gustavo Sousa
2024-10-22 11:14 ` Gustavo Sousa
2024-11-01 12:51 ` Luca Coelho
2024-11-05 13:00 ` Gustavo Sousa
2024-11-06 11:47 ` Luca Coelho
2024-11-06 13:56 ` Gustavo Sousa
2024-10-21 22:27 ` [PATCH 08/13] drm/i915/dmc_wl: Allow simpler syntax for single reg in range tables Gustavo Sousa
2024-11-01 12:58 ` Luca Coelho
2024-11-05 13:42 ` Gustavo Sousa
2024-11-06 12:23 ` Luca Coelho
2024-11-06 12:29 ` Gustavo Sousa
2024-11-06 12:35 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 09/13] drm/i915/dmc_wl: Deal with existing references when disabling Gustavo Sousa
2024-11-01 14:17 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 10/13] drm/i915/dmc_wl: Couple enable/disable with dynamic DC states Gustavo Sousa
2024-11-01 14:19 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 11/13] drm/i915/dmc_wl: Add and use HAS_DMC_WAKELOCK() Gustavo Sousa
2024-10-22 9:37 ` Jani Nikula
2024-10-22 11:03 ` Gustavo Sousa
2024-11-05 13:56 ` Gustavo Sousa
2024-11-06 9:25 ` Jani Nikula
2024-11-06 13:24 ` Gustavo Sousa
2024-10-21 22:27 ` [PATCH 12/13] drm/i915/dmc_wl: Sanitize enable_dmc_wl according to hardware support Gustavo Sousa
2024-11-01 14:25 ` Luca Coelho
2024-10-21 22:27 ` [PATCH 13/13] drm/i915/xe3lpd: Use DMC wakelock by default Gustavo Sousa
2024-11-01 14:27 ` Luca Coelho
2024-11-05 13:46 ` Gustavo Sousa
2024-11-05 21:12 ` Gustavo Sousa
2024-11-06 12:27 ` Luca Coelho
2024-10-21 22:54 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD Patchwork
2024-10-21 22:54 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-10-21 23:44 ` ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241021222744.294371-8-gustavo.sousa@intel.com \
--to=gustavo.sousa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=luciano.coelho@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox