* [Intel-gfx] [PATCH RFC 1/1] drm/i915/display: Communicate display configuration to pcode
2022-04-14 6:07 [Intel-gfx] [PATCH 0/1] drm/i915/display: Communicate display configuration to pcode Jigar Bhatt
@ 2022-04-14 6:07 ` Jigar Bhatt
2022-04-14 6:36 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jigar Bhatt @ 2022-04-14 6:07 UTC (permalink / raw)
To: intel-gfx; +Cc: nischal.varide, jigar.bhatt
Display to communicate "display configuration" to Pcode for more accurate
power accounting for DG2. Existing sequence is only sending the voltage
value to the Pcode. Adding new sequence with current cdclk associate
with voltage value masking. Adding pcode request when any power well
will disable or enable.
Signed-off-by: Jigar Bhatt <jigar.bhatt@intel.com>
---
drivers/gpu/drm/i915/display/intel_cdclk.c | 93 +++++++++++++++++++-
drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +
drivers/gpu/drm/i915/display/intel_display.c | 6 ++
drivers/gpu/drm/i915/i915_reg.h | 4 +
4 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index b2017d8161b4..ac134b1a28ff 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1701,12 +1701,12 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
int ret;
/* Inform power controller of upcoming frequency change. */
- if (DISPLAY_VER(dev_priv) >= 11)
+ if (DISPLAY_VER(dev_priv) == 11)
ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
SKL_CDCLK_PREPARE_FOR_CHANGE,
SKL_CDCLK_READY_FOR_CHANGE,
SKL_CDCLK_READY_FOR_CHANGE, 3);
- else
+ if (DISPLAY_VER(dev_priv) < 11) {
/*
* BSpec requires us to wait up to 150usec, but that leads to
* timeouts; the 2ms used here is based on experiment.
@@ -1714,6 +1714,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
ret = snb_pcode_write_timeout(dev_priv,
HSW_PCODE_DE_WRITE_FREQ_REQ,
0x80000000, 150, 2);
+ }
if (ret) {
drm_err(&dev_priv->drm,
"Failed to inform PCU about cdclk change (err %d, freq %d)\n",
@@ -1773,10 +1774,11 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
if (pipe != INVALID_PIPE)
intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv, pipe));
- if (DISPLAY_VER(dev_priv) >= 11) {
+ if (DISPLAY_VER(dev_priv) == 11) {
ret = snb_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL,
cdclk_config->voltage_level);
- } else {
+ }
+ if (DISPLAY_VER(dev_priv) < 11) {
/*
* The timeout isn't specified, the 2ms used here is based on
* experiment.
@@ -2062,6 +2064,34 @@ void intel_cdclk_dump_config(struct drm_i915_private *i915,
cdclk_config->voltage_level);
}
+/**
+ * intel_display_to_pcode- inform pcode for display config
+ * @cdclk: current cdclk as per new or old state
+ * @voltage_level: current voltage_level send to Pcode
+ * @active_pipes: active pipes for more accurate power accounting
+ */
+static void intel_display_to_pcode(struct drm_i915_private *dev_priv,
+ unsigned int cdclk, u8 voltage_level,
+ u8 active_pipes)
+{
+ int ret;
+
+ if (DISPLAY_VER(dev_priv) >= 12) {
+ ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
+ SKL_CDCLK_PREPARE_FOR_CHANGE |
+ DISPLAY_TO_PCODE_MASK
+ (cdclk, active_pipes, voltage_level),
+ SKL_CDCLK_READY_FOR_CHANGE,
+ SKL_CDCLK_READY_FOR_CHANGE, 3);
+ if (ret) {
+ drm_err(&dev_priv->drm,
+ "Failed to inform PCU about display config (err %d)\n",
+ ret);
+ return;
+ }
+ }
+}
+
/**
* intel_set_cdclk - Push the CDCLK configuration to the hardware
* @dev_priv: i915 device
@@ -2131,6 +2161,61 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,
}
}
+/**
+ * intel_display_to_pcode_pre_notification: display to pcode notification
+ * before the enabling power wells.
+ * send notification with cdclk, number of pipes, voltage_level.
+ * @state: intel atomic state
+ */
+void intel_display_to_pcode_pre_notification(struct intel_atomic_state *state)
+{
+ struct drm_i915_private *dev_priv = to_i915(state->base.dev);
+ const struct intel_cdclk_state *old_cdclk_state =
+ intel_atomic_get_old_cdclk_state(state);
+ const struct intel_cdclk_state *new_cdclk_state =
+ intel_atomic_get_new_cdclk_state(state);
+ if (!intel_cdclk_changed(&old_cdclk_state->actual,
+ &new_cdclk_state->actual) &&
+ (new_cdclk_state->active_pipes ==
+ old_cdclk_state->active_pipes))
+ return;
+ if (old_cdclk_state->actual.cdclk <= new_cdclk_state->actual.cdclk) {
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
+ new_cdclk_state->active_pipes);
+ return;
+ }
+ if (old_cdclk_state->actual.cdclk >= new_cdclk_state->actual.cdclk) {
+ intel_display_to_pcode(dev_priv, old_cdclk_state->actual.cdclk,
+ old_cdclk_state->actual.voltage_level,
+ old_cdclk_state->active_pipes);
+ return;
+ }
+ if (old_cdclk_state->active_pipes != new_cdclk_state->active_pipes) {
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
+ new_cdclk_state->active_pipes);
+ return;
+ }
+ intel_display_to_pcode(dev_priv, DISPLAY_TO_PCODE_CDCLK_MAX,
+ new_cdclk_state->actual.voltage_level,
+ new_cdclk_state->active_pipes);
+}
+
+/*intel_display_to_pcode_post_notification: after frequency change sending
+ * voltage_level, active pipes, current CDCLK frequency.
+ * @state: intel atomic state
+ */
+void intel_display_to_pcode_post_notification(struct intel_atomic_state *state)
+{
+ struct drm_i915_private *dev_priv = to_i915(state->base.dev);
+ const struct intel_cdclk_state *new_cdclk_state =
+ intel_atomic_get_new_cdclk_state(state);
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
+ new_cdclk_state->active_pipes);
+}
+
/**
* intel_set_cdclk_pre_plane_update - Push the CDCLK state to the hardware
* @state: intel atomic state
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
index b535cf6a7d9e..18ccb4f16dbc 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.h
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
@@ -64,6 +64,8 @@ bool intel_cdclk_needs_modeset(const struct intel_cdclk_config *a,
const struct intel_cdclk_config *b);
void intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state);
void intel_set_cdclk_post_plane_update(struct intel_atomic_state *state);
+void intel_display_to_pcode_pre_notification(struct intel_atomic_state *state);
+void intel_display_to_pcode_post_notification(struct intel_atomic_state *state);
void intel_cdclk_dump_config(struct drm_i915_private *i915,
const struct intel_cdclk_config *cdclk_config,
const char *context);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ca997a0a0517..436f04c69c65 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8518,6 +8518,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
intel_atomic_prepare_plane_clear_colors(state);
+ if (IS_DG2(dev_priv))
+ intel_display_to_pcode_pre_notification(state);
+
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
new_crtc_state, i) {
if (intel_crtc_needs_modeset(new_crtc_state) ||
@@ -8542,6 +8545,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
intel_modeset_verify_disabled(dev_priv, state);
}
+ if (IS_DG2(dev_priv))
+ intel_display_to_pcode_post_notification(state);
+
intel_sagv_pre_plane_update(state);
/* Complete the events for pipes that have now been disabled */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index fef71b242706..2ad8ef3d9010 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6717,6 +6717,10 @@
#define ICL_PCODE_MEM_SS_READ_GLOBAL_INFO (0x0 << 8)
#define ICL_PCODE_MEM_SS_READ_QGV_POINT_INFO(point) (((point) << 16) | (0x1 << 8))
#define ADL_PCODE_MEM_SS_READ_PSF_GV_INFO ((0) | (0x2 << 8))
+#define DISPLAY_TO_PCODE_CDCLK_MAX 0x28D
+#define DISPLAY_TO_PCODE_MASK(cdclk, num_pipes, voltage_level) \
+ ((1 << 31) | (num_pipes << 28) | \
+ (cdclk << 16) | (1 << 27) | voltage_level)
#define ICL_PCODE_SAGV_DE_MEM_SS_CONFIG 0xe
#define ICL_PCODE_REP_QGV_MASK REG_GENMASK(1, 0)
#define ICL_PCODE_REP_QGV_SAFE REG_FIELD_PREP(ICL_PCODE_REP_QGV_MASK, 0)
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Communicate display configuration to pcode
2022-04-14 6:07 [Intel-gfx] [PATCH 0/1] drm/i915/display: Communicate display configuration to pcode Jigar Bhatt
2022-04-14 6:07 ` [Intel-gfx] [PATCH RFC 1/1] " Jigar Bhatt
@ 2022-04-14 6:36 ` Patchwork
2022-04-14 6:36 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-04-14 7:01 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2022-04-14 6:36 UTC (permalink / raw)
To: Jigar Bhatt; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Communicate display configuration to pcode
URL : https://patchwork.freedesktop.org/series/102678/
State : warning
== Summary ==
Error: dim checkpatch failed
a4a6dfddbdd5 drm/i915/display: Communicate display configuration to pcode
-:66: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#66: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2074:
+static void intel_display_to_pcode(struct drm_i915_private *dev_priv,
+ unsigned int cdclk, u8 voltage_level,
-:80: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#80: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2088:
+ drm_err(&dev_priv->drm,
+ "Failed to inform PCU about display config (err %d)\n",
-:107: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'new_cdclk_state->active_pipes ==
old_cdclk_state->active_pipes'
#107: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2177:
+ if (!intel_cdclk_changed(&old_cdclk_state->actual,
+ &new_cdclk_state->actual) &&
+ (new_cdclk_state->active_pipes ==
+ old_cdclk_state->active_pipes))
-:108: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#108: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2178:
+ if (!intel_cdclk_changed(&old_cdclk_state->actual,
+ &new_cdclk_state->actual) &&
-:114: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#114: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2184:
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
-:120: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#120: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2190:
+ intel_display_to_pcode(dev_priv, old_cdclk_state->actual.cdclk,
+ old_cdclk_state->actual.voltage_level,
-:126: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#126: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2196:
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
-:131: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#131: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2201:
+ intel_display_to_pcode(dev_priv, DISPLAY_TO_PCODE_CDCLK_MAX,
+ new_cdclk_state->actual.voltage_level,
-:145: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#145: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2215:
+ intel_display_to_pcode(dev_priv, new_cdclk_state->actual.cdclk,
+ new_cdclk_state->actual.voltage_level,
-:198: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'cdclk' may be better as '(cdclk)' to avoid precedence issues
#198: FILE: drivers/gpu/drm/i915/i915_reg.h:6721:
+#define DISPLAY_TO_PCODE_MASK(cdclk, num_pipes, voltage_level) \
+ ((1 << 31) | (num_pipes << 28) | \
+ (cdclk << 16) | (1 << 27) | voltage_level)
-:198: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'num_pipes' may be better as '(num_pipes)' to avoid precedence issues
#198: FILE: drivers/gpu/drm/i915/i915_reg.h:6721:
+#define DISPLAY_TO_PCODE_MASK(cdclk, num_pipes, voltage_level) \
+ ((1 << 31) | (num_pipes << 28) | \
+ (cdclk << 16) | (1 << 27) | voltage_level)
-:198: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'voltage_level' may be better as '(voltage_level)' to avoid precedence issues
#198: FILE: drivers/gpu/drm/i915/i915_reg.h:6721:
+#define DISPLAY_TO_PCODE_MASK(cdclk, num_pipes, voltage_level) \
+ ((1 << 31) | (num_pipes << 28) | \
+ (cdclk << 16) | (1 << 27) | voltage_level)
total: 0 errors, 0 warnings, 12 checks, 165 lines checked
^ permalink raw reply [flat|nested] 5+ messages in thread