* [Intel-gfx] [PATCH v8 1/6] drm/panelreplay: dpcd register definition for panelreplay
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 2/6] drm/i915/psr: Move psr specific dpcd init into own function Animesh Manna
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
Add DPCD register definition for discovering, enabling and
checking status of panel replay of the sink.
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
include/drm/display/drm_dp.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/include/drm/display/drm_dp.h b/include/drm/display/drm_dp.h
index e69cece404b3..fc42b622ef32 100644
--- a/include/drm/display/drm_dp.h
+++ b/include/drm/display/drm_dp.h
@@ -543,6 +543,10 @@
/* DFP Capability Extension */
#define DP_DFP_CAPABILITY_EXTENSION_SUPPORT 0x0a3 /* 2.0 */
+#define DP_PANEL_REPLAY_CAP 0x0b0 /* DP 2.0 */
+# define DP_PANEL_REPLAY_SUPPORT (1 << 0)
+# define DP_PANEL_REPLAY_SU_SUPPORT (1 << 1)
+
/* Link Configuration */
#define DP_LINK_BW_SET 0x100
# define DP_LINK_RATE_TABLE 0x00 /* eDP 1.4 */
@@ -716,6 +720,13 @@
#define DP_BRANCH_DEVICE_CTRL 0x1a1
# define DP_BRANCH_DEVICE_IRQ_HPD (1 << 0)
+#define PANEL_REPLAY_CONFIG 0x1b0 /* DP 2.0 */
+# define DP_PANEL_REPLAY_ENABLE (1 << 0)
+# define DP_PANEL_REPLAY_UNRECOVERABLE_ERROR_EN (1 << 3)
+# define DP_PANEL_REPLAY_RFB_STORAGE_ERROR_EN (1 << 4)
+# define DP_PANEL_REPLAY_ACTIVE_FRAME_CRC_ERROR_EN (1 << 5)
+# define DP_PANEL_REPLAY_SU_ENABLE (1 << 6)
+
#define DP_PAYLOAD_ALLOCATE_SET 0x1c0
#define DP_PAYLOAD_ALLOCATE_START_TIME_SLOT 0x1c1
#define DP_PAYLOAD_ALLOCATE_TIME_SLOT_COUNT 0x1c2
@@ -1105,6 +1116,18 @@
#define DP_LANE_ALIGN_STATUS_UPDATED_ESI 0x200e /* status same as 0x204 */
#define DP_SINK_STATUS_ESI 0x200f /* status same as 0x205 */
+#define DP_PANEL_REPLAY_ERROR_STATUS 0x2020 /* DP 2.1*/
+# define DP_PANEL_REPLAY_LINK_CRC_ERROR (1 << 0)
+# define DP_PANEL_REPLAY_RFB_STORAGE_ERROR (1 << 1)
+# define DP_PANEL_REPLAY_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2)
+
+#define DP_SINK_DEVICE_PR_AND_FRAME_LOCK_STATUS 0x2022 /* DP 2.1 */
+# define DP_SINK_DEVICE_PANEL_REPLAY_STATUS_MASK (7 << 0)
+# define DP_SINK_FRAME_LOCKED_SHIFT 3
+# define DP_SINK_FRAME_LOCKED_MASK (3 << 3)
+# define DP_SINK_FRAME_LOCKED_STATUS_VALID_SHIFT 5
+# define DP_SINK_FRAME_LOCKED_STATUS_VALID_MASK (1 << 5)
+
/* Extended Receiver Capability: See DP_DPCD_REV for definitions */
#define DP_DP13_DPCD_REV 0x2200
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Intel-gfx] [PATCH v8 2/6] drm/i915/psr: Move psr specific dpcd init into own function
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 1/6] drm/panelreplay: dpcd register definition for panelreplay Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 3/6] drm/i915/panelreplay: Initializaton and compute config for panel replay Animesh Manna
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
From: Jouni Högander <jouni.hogander@intel.com>
This patch is preparing adding panel replay specific dpcd init.
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 41 +++++++++++++-----------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index ecd24a0b86cb..48da60005ceb 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -474,27 +474,22 @@ static void intel_dp_get_su_granularity(struct intel_dp *intel_dp)
intel_dp->psr.su_y_granularity = y;
}
-void intel_psr_init_dpcd(struct intel_dp *intel_dp)
+static void _psr_init_dpcd(struct intel_dp *intel_dp)
{
- struct drm_i915_private *dev_priv =
+ struct drm_i915_private *i915 =
to_i915(dp_to_dig_port(intel_dp)->base.base.dev);
- drm_dp_dpcd_read(&intel_dp->aux, DP_PSR_SUPPORT, intel_dp->psr_dpcd,
- sizeof(intel_dp->psr_dpcd));
-
- if (!intel_dp->psr_dpcd[0])
- return;
- drm_dbg_kms(&dev_priv->drm, "eDP panel supports PSR version %x\n",
+ drm_dbg_kms(&i915->drm, "eDP panel supports PSR version %x\n",
intel_dp->psr_dpcd[0]);
if (drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_NO_PSR)) {
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(&i915->drm,
"PSR support not currently available for this panel\n");
return;
}
if (!(intel_dp->edp_dpcd[1] & DP_EDP_SET_POWER_CAP)) {
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(&i915->drm,
"Panel lacks power state control, PSR cannot be enabled\n");
return;
}
@@ -503,8 +498,8 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp)
intel_dp->psr.sink_sync_latency =
intel_dp_get_sink_sync_latency(intel_dp);
- if (DISPLAY_VER(dev_priv) >= 9 &&
- (intel_dp->psr_dpcd[0] == DP_PSR2_WITH_Y_COORD_IS_SUPPORTED)) {
+ if (DISPLAY_VER(i915) >= 9 &&
+ intel_dp->psr_dpcd[0] == DP_PSR2_WITH_Y_COORD_IS_SUPPORTED) {
bool y_req = intel_dp->psr_dpcd[1] &
DP_PSR2_SU_Y_COORDINATE_REQUIRED;
bool alpm = intel_dp_get_alpm_status(intel_dp);
@@ -521,14 +516,24 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp)
* GTC first.
*/
intel_dp->psr.sink_psr2_support = y_req && alpm;
- drm_dbg_kms(&dev_priv->drm, "PSR2 %ssupported\n",
+ drm_dbg_kms(&i915->drm, "PSR2 %ssupported\n",
intel_dp->psr.sink_psr2_support ? "" : "not ");
+ }
+}
- if (intel_dp->psr.sink_psr2_support) {
- intel_dp->psr.colorimetry_support =
- intel_dp_get_colorimetry_status(intel_dp);
- intel_dp_get_su_granularity(intel_dp);
- }
+void intel_psr_init_dpcd(struct intel_dp *intel_dp)
+{
+ drm_dp_dpcd_read(&intel_dp->aux, DP_PSR_SUPPORT, intel_dp->psr_dpcd,
+ sizeof(intel_dp->psr_dpcd));
+
+ if (intel_dp->psr_dpcd[0])
+ _psr_init_dpcd(intel_dp);
+ /* TODO: Add PR case here */
+
+ if (intel_dp->psr.sink_psr2_support) {
+ intel_dp->psr.colorimetry_support =
+ intel_dp_get_colorimetry_status(intel_dp);
+ intel_dp_get_su_granularity(intel_dp);
}
}
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Intel-gfx] [PATCH v8 3/6] drm/i915/panelreplay: Initializaton and compute config for panel replay
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 1/6] drm/panelreplay: dpcd register definition for panelreplay Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 2/6] drm/i915/psr: Move psr specific dpcd init into own function Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 4/6] drm/i915/panelreplay: Enable panel replay dpcd initialization for DP Animesh Manna
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
Modify existing PSR implementation to enable panel replay feature of DP 2.0
which is similar to PSR feature of EDP panel. There is different DPCD
address to check panel capability compare to PSR and vsc sdp header
is different.
v1: Initial version.
v2:
- Set source_panel_replay_support flag under HAS_PANEL_REPLAY()
condition check. [Jouni]
- Code restructured around intel_panel_replay_init
and renamed to intel_panel_replay_init_dpcd. [Jouni]
- Remove the initial code modification around has_psr2 flag. [Jouni]
- Add CAN_PANEL_REPLAY() in intel_encoder_can_psr which is used to
enable in intel_psr_post_plane_update. [Jouni]
v3:
- Initialize both psr and panel-replay. [Jouni]
- Initialize both panel replay and psr if detected. [Jouni]
- Refactoring psr function by introducing _psr_compute_config(). [Jouni]
- Add check for !is_edp while deriving source_panel_replay_support. [Jouni]
- Enable panel replay dpcd initialization in a separate patch. [Jouni]
v4:
- HAS_PANEL_REPLAY() check not needed during sink capability check. [Jouni]
- Set either panel replay source support or psr. [Jouni]
v5:
- HAS_PANEL_REPLAY() removed and use HAS_DP20() instead. [Jouni]
- Move psr related code to intel_psr.c. [Jani]
- Reset sink_panel_replay_support flag during disconnection. [Jani]
v6: return statement restored which is removed by misatke. [Jouni]
v7: cosmetic changes. [Arun]
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
.../drm/i915/display/intel_display_types.h | 14 +--
drivers/gpu/drm/i915/display/intel_dp.c | 49 ++++++++--
drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +
drivers/gpu/drm/i915/display/intel_psr.c | 96 ++++++++++++++-----
drivers/gpu/drm/i915/display/intel_psr.h | 7 ++
5 files changed, 123 insertions(+), 46 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 047fe3f8905a..7d46bece7e06 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1208,6 +1208,7 @@ struct intel_crtc_state {
bool has_psr2;
bool enable_psr2_sel_fetch;
bool req_psr2_sdp_prior_scanline;
+ bool has_panel_replay;
bool wm_level_disabled;
u32 dc3co_exitline;
u16 su_y_granularity;
@@ -1705,6 +1706,8 @@ struct intel_psr {
bool irq_aux_error;
u16 su_w_granularity;
u16 su_y_granularity;
+ bool source_panel_replay_support;
+ bool sink_panel_replay_support;
u32 dc3co_exitline;
u32 dc3co_exit_delay;
struct delayed_work dc3co_work;
@@ -1990,17 +1993,6 @@ dp_to_lspcon(struct intel_dp *intel_dp)
#define dp_to_i915(__intel_dp) to_i915(dp_to_dig_port(__intel_dp)->base.base.dev)
-#define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \
- (intel_dp)->psr.source_support)
-
-static inline bool intel_encoder_can_psr(struct intel_encoder *encoder)
-{
- if (!intel_encoder_is_dp(encoder))
- return false;
-
- return CAN_PSR(enc_to_intel_dp(encoder));
-}
-
static inline struct intel_digital_port *
hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
{
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 5391b2a83405..8260fa638aa6 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2439,12 +2439,22 @@ static void intel_dp_compute_vsc_colorimetry(const struct intel_crtc_state *crtc
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
- /*
- * Prepare VSC Header for SU as per DP 1.4 spec, Table 2-118
- * VSC SDP supporting 3D stereo, PSR2, and Pixel Encoding/
- * Colorimetry Format indication.
- */
- vsc->revision = 0x5;
+ if (crtc_state->has_panel_replay) {
+ /*
+ * Prepare VSC Header for SU as per DP 2.0 spec, Table 2-223
+ * VSC SDP supporting 3D stereo, Panel Replay, and Pixel
+ * Encoding/Colorimetry Format indication.
+ */
+ vsc->revision = 0x7;
+ } else {
+ /*
+ * Prepare VSC Header for SU as per DP 1.4 spec, Table 2-118
+ * VSC SDP supporting 3D stereo, PSR2, and Pixel Encoding/
+ * Colorimetry Format indication.
+ */
+ vsc->revision = 0x5;
+ }
+
vsc->length = 0x13;
/* DP 1.4a spec, Table 2-120 */
@@ -2553,6 +2563,21 @@ void intel_dp_compute_psr_vsc_sdp(struct intel_dp *intel_dp,
vsc->revision = 0x4;
vsc->length = 0xe;
}
+ } else if (crtc_state->has_panel_replay) {
+ if (intel_dp->psr.colorimetry_support &&
+ intel_dp_needs_vsc_sdp(crtc_state, conn_state)) {
+ /* [Panel Replay with colorimetry info] */
+ intel_dp_compute_vsc_colorimetry(crtc_state, conn_state,
+ vsc);
+ } else {
+ /*
+ * [Panel Replay without colorimetry info]
+ * Prepare VSC Header for SU as per DP 2.0 spec, Table 2-223
+ * VSC SDP supporting 3D stereo + Panel Replay.
+ */
+ vsc->revision = 0x6;
+ vsc->length = 0x10;
+ }
} else {
/*
* [PSR1]
@@ -3865,11 +3890,16 @@ static ssize_t intel_dp_vsc_sdp_pack(const struct drm_dp_vsc_sdp *vsc,
sdp->sdp_header.HB2 = vsc->revision; /* Revision Number */
sdp->sdp_header.HB3 = vsc->length; /* Number of Valid Data Bytes */
+ if (vsc->revision == 0x6) {
+ sdp->db[0] = 1;
+ sdp->db[3] = 1;
+ }
+
/*
- * Only revision 0x5 supports Pixel Encoding/Colorimetry Format as
- * per DP 1.4a spec.
+ * Revision 0x5 and revision 0x7 supports Pixel Encoding/Colorimetry
+ * Format as per DP 1.4a spec and DP 2.0 respectively.
*/
- if (vsc->revision != 0x5)
+ if (!(vsc->revision == 0x5 || vsc->revision == 0x7))
goto out;
/* VSC SDP Payload for DB16 through DB18 */
@@ -5409,6 +5439,7 @@ intel_dp_detect(struct drm_connector *connector,
if (status == connector_status_disconnected) {
memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance));
memset(intel_connector->dp.dsc_dpcd, 0, sizeof(intel_connector->dp.dsc_dpcd));
+ intel_dp->psr.sink_panel_replay_support = false;
if (intel_dp->is_mst) {
drm_dbg_kms(&dev_priv->drm,
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 82f425ef1595..e660b4d33ed8 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -43,6 +43,7 @@
#include "intel_dpio_phy.h"
#include "intel_hdcp.h"
#include "intel_hotplug.h"
+#include "intel_psr.h"
#include "skl_scaler.h"
static int intel_dp_mst_check_constraints(struct drm_i915_private *i915, int bpp,
@@ -420,6 +421,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
+ intel_psr_compute_config(intel_dp, pipe_config, conn_state);
+
return 0;
}
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 48da60005ceb..3c66257b6bb2 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -172,6 +172,15 @@
* irrelevant for normal operation.
*/
+bool intel_encoder_can_psr(struct intel_encoder *encoder)
+{
+ if (intel_encoder_is_dp(encoder) || encoder->type == INTEL_OUTPUT_DP_MST)
+ return CAN_PSR(enc_to_intel_dp(encoder)) ||
+ CAN_PANEL_REPLAY(enc_to_intel_dp(encoder));
+ else
+ return false;
+}
+
static bool psr_global_enabled(struct intel_dp *intel_dp)
{
struct intel_connector *connector = intel_dp->attached_connector;
@@ -474,6 +483,25 @@ static void intel_dp_get_su_granularity(struct intel_dp *intel_dp)
intel_dp->psr.su_y_granularity = y;
}
+static void _panel_replay_init_dpcd(struct intel_dp *intel_dp)
+{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+ u8 pr_dpcd = 0;
+
+ intel_dp->psr.sink_panel_replay_support = false;
+ drm_dp_dpcd_readb(&intel_dp->aux, DP_PANEL_REPLAY_CAP, &pr_dpcd);
+
+ if (!(pr_dpcd & DP_PANEL_REPLAY_SUPPORT)) {
+ drm_dbg_kms(&i915->drm,
+ "Panel replay is not supported by panel\n");
+ return;
+ }
+
+ drm_dbg_kms(&i915->drm,
+ "Panel replay is supported by panel\n");
+ intel_dp->psr.sink_panel_replay_support = true;
+}
+
static void _psr_init_dpcd(struct intel_dp *intel_dp)
{
struct drm_i915_private *i915 =
@@ -523,12 +551,13 @@ static void _psr_init_dpcd(struct intel_dp *intel_dp)
void intel_psr_init_dpcd(struct intel_dp *intel_dp)
{
+ _panel_replay_init_dpcd(intel_dp);
+
drm_dp_dpcd_read(&intel_dp->aux, DP_PSR_SUPPORT, intel_dp->psr_dpcd,
sizeof(intel_dp->psr_dpcd));
if (intel_dp->psr_dpcd[0])
_psr_init_dpcd(intel_dp);
- /* TODO: Add PR case here */
if (intel_dp->psr.sink_psr2_support) {
intel_dp->psr.colorimetry_support =
@@ -1211,13 +1240,11 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
return false;
}
-void intel_psr_compute_config(struct intel_dp *intel_dp,
- struct intel_crtc_state *crtc_state,
- struct drm_connector_state *conn_state)
+static bool _psr_compute_config(struct intel_dp *intel_dp,
+ struct intel_crtc_state *crtc_state)
{
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
- const struct drm_display_mode *adjusted_mode =
- &crtc_state->hw.adjusted_mode;
+ const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
int psr_setup_time;
/*
@@ -1225,10 +1252,36 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
* So if VRR is enabled, do not enable PSR.
*/
if (crtc_state->vrr.enable)
- return;
+ return false;
if (!CAN_PSR(intel_dp))
- return;
+ return false;
+
+ psr_setup_time = drm_dp_psr_setup_time(intel_dp->psr_dpcd);
+ if (psr_setup_time < 0) {
+ drm_dbg_kms(&dev_priv->drm,
+ "PSR condition failed: Invalid PSR setup time (0x%02x)\n",
+ intel_dp->psr_dpcd[1]);
+ return false;
+ }
+
+ if (intel_usecs_to_scanlines(adjusted_mode, psr_setup_time) >
+ adjusted_mode->crtc_vtotal - adjusted_mode->crtc_vdisplay - 1) {
+ drm_dbg_kms(&dev_priv->drm,
+ "PSR condition failed: PSR setup time (%d us) too long\n",
+ psr_setup_time);
+ return false;
+ }
+
+ return true;
+}
+
+void intel_psr_compute_config(struct intel_dp *intel_dp,
+ struct intel_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state)
+{
+ struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+ const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
if (!psr_global_enabled(intel_dp)) {
drm_dbg_kms(&dev_priv->drm, "PSR disabled by flag\n");
@@ -1247,23 +1300,11 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,
return;
}
- psr_setup_time = drm_dp_psr_setup_time(intel_dp->psr_dpcd);
- if (psr_setup_time < 0) {
- drm_dbg_kms(&dev_priv->drm,
- "PSR condition failed: Invalid PSR setup time (0x%02x)\n",
- intel_dp->psr_dpcd[1]);
- return;
- }
-
- if (intel_usecs_to_scanlines(adjusted_mode, psr_setup_time) >
- adjusted_mode->crtc_vtotal - adjusted_mode->crtc_vdisplay - 1) {
- drm_dbg_kms(&dev_priv->drm,
- "PSR condition failed: PSR setup time (%d us) too long\n",
- psr_setup_time);
- return;
- }
+ if (CAN_PANEL_REPLAY(intel_dp))
+ crtc_state->has_panel_replay = true;
+ else
+ crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state);
- crtc_state->has_psr = true;
crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state);
crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
@@ -2698,7 +2739,7 @@ void intel_psr_init(struct intel_dp *intel_dp)
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
- if (!HAS_PSR(dev_priv))
+ if (!(HAS_PSR(dev_priv) || HAS_DP20(dev_priv)))
return;
/*
@@ -2716,7 +2757,10 @@ void intel_psr_init(struct intel_dp *intel_dp)
return;
}
- intel_dp->psr.source_support = true;
+ if (HAS_DP20(dev_priv) && !intel_dp_is_edp(intel_dp))
+ intel_dp->psr.source_panel_replay_support = true;
+ else
+ intel_dp->psr.source_support = true;
/* Set link_standby x link_off defaults */
if (DISPLAY_VER(dev_priv) < 12)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
index bf35f42df6bc..6a1f4573852b 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.h
+++ b/drivers/gpu/drm/i915/display/intel_psr.h
@@ -21,6 +21,13 @@ struct intel_encoder;
struct intel_plane;
struct intel_plane_state;
+#define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \
+ (intel_dp)->psr.source_support)
+
+#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \
+ (intel_dp)->psr.source_panel_replay_support)
+
+bool intel_encoder_can_psr(struct intel_encoder *encoder);
void intel_psr_init_dpcd(struct intel_dp *intel_dp);
void intel_psr_pre_plane_update(struct intel_atomic_state *state,
struct intel_crtc *crtc);
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Intel-gfx] [PATCH v8 4/6] drm/i915/panelreplay: Enable panel replay dpcd initialization for DP
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (2 preceding siblings ...)
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 3/6] drm/i915/panelreplay: Initializaton and compute config for panel replay Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 5/6] drm/i915/panelreplay: enable/disable panel replay Animesh Manna
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
Due to similarity panel replay dpcd initialization got added in psr
function which is specific for edp panel. This patch enables panel
replay initialization for dp connector.
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 3c66257b6bb2..e53a2217627a 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2742,6 +2742,9 @@ void intel_psr_init(struct intel_dp *intel_dp)
if (!(HAS_PSR(dev_priv) || HAS_DP20(dev_priv)))
return;
+ if (!intel_dp_is_edp(intel_dp))
+ intel_psr_init_dpcd(intel_dp);
+
/*
* HSW spec explicitly says PSR is tied to port A.
* BDW+ platforms have a instance of PSR registers per transcoder but
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Intel-gfx] [PATCH v8 5/6] drm/i915/panelreplay: enable/disable panel replay
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (3 preceding siblings ...)
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 4/6] drm/i915/panelreplay: Enable panel replay dpcd initialization for DP Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for " Animesh Manna
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
TRANS_DP2_CTL register is programmed to enable panel replay from source
and sink is enabled through panel replay dpcd configuration address.
Bspec: 1407940617
v1: Initial version.
v2:
- Use pr_* flags instead psr_* flags. [Jouni]
- Remove intel_dp_is_edp check as edp1.5 also has panel replay. [Jouni]
v3: Cover letter updated and selective fetch condition check is added
before updating its bit in PSR2_MAN_TRK_CTL register. [Jouni]
v4: Selective fetch related PSR2_MAN_TRK_CTL programmming dropped. [Jouni]
v5: Added PSR2_MAN_TRK_CTL programming as needed for Continuous Full
Frame (CFF) update.
v6: Rebased on latest.
Note: Initial plan is to enable panel replay in full-screen live active
frame update mode. In a incremental approach panel replay will be enabled
in selctive update mode if there is any gap in curent implementation.
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 7 ++-
.../drm/i915/display/intel_display_types.h | 1 +
drivers/gpu/drm/i915/display/intel_psr.c | 63 ++++++++++++++-----
3 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 2e37708fecdd..c446d8ef210f 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2717,10 +2717,15 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state,
const struct drm_connector_state *conn_state)
{
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+ struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
- if (HAS_DP20(dev_priv))
+ if (HAS_DP20(dev_priv)) {
intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder),
crtc_state);
+ if (crtc_state->has_panel_replay)
+ drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG,
+ DP_PANEL_REPLAY_ENABLE);
+ }
if (DISPLAY_VER(dev_priv) >= 14)
mtl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 7d46bece7e06..81a7c6efa4a8 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1708,6 +1708,7 @@ struct intel_psr {
u16 su_y_granularity;
bool source_panel_replay_support;
bool sink_panel_replay_support;
+ bool panel_replay_enabled;
u32 dc3co_exitline;
u32 dc3co_exit_delay;
struct delayed_work dc3co_work;
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index e53a2217627a..8ed4684b4528 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -608,8 +608,11 @@ static void intel_psr_enable_sink(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
u8 dpcd_val = DP_PSR_ENABLE;
- /* Enable ALPM at sink for psr2 */
+ if (intel_dp->psr.panel_replay_enabled)
+ return;
+
if (intel_dp->psr.psr2_enabled) {
+ /* Enable ALPM at sink for psr2 */
drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG,
DP_ALPM_ENABLE |
DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE);
@@ -761,6 +764,17 @@ static int psr2_block_count(struct intel_dp *intel_dp)
return psr2_block_count_lines(intel_dp) / 4;
}
+static void dg2_activate_panel_replay(struct intel_dp *intel_dp)
+{
+ struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+
+ intel_de_rmw(dev_priv, PSR2_MAN_TRK_CTL(intel_dp->psr.transcoder),
+ 0, ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME);
+
+ intel_de_rmw(dev_priv, TRANS_DP2_CTL(intel_dp->psr.transcoder), 0,
+ TRANS_DP2_PANEL_REPLAY_ENABLE);
+}
+
static void hsw_activate_psr2(struct intel_dp *intel_dp)
{
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -1325,18 +1339,23 @@ void intel_psr_get_config(struct intel_encoder *encoder,
return;
intel_dp = &dig_port->dp;
- if (!CAN_PSR(intel_dp))
+ if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp)))
return;
mutex_lock(&intel_dp->psr.lock);
if (!intel_dp->psr.enabled)
goto unlock;
- /*
- * Not possible to read EDP_PSR/PSR2_CTL registers as it is
- * enabled/disabled because of frontbuffer tracking and others.
- */
- pipe_config->has_psr = true;
+ if (intel_dp->psr.panel_replay_enabled) {
+ pipe_config->has_panel_replay = true;
+ } else {
+ /*
+ * Not possible to read EDP_PSR/PSR2_CTL registers as it is
+ * enabled/disabled because of frontbuffer tracking and others.
+ */
+ pipe_config->has_psr = true;
+ }
+
pipe_config->has_psr2 = intel_dp->psr.psr2_enabled;
pipe_config->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC);
@@ -1373,8 +1392,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)
lockdep_assert_held(&intel_dp->psr.lock);
- /* psr1 and psr2 are mutually exclusive.*/
- if (intel_dp->psr.psr2_enabled)
+ /* psr1, psr2 and panel-replay are mutually exclusive.*/
+ if (intel_dp->psr.panel_replay_enabled)
+ dg2_activate_panel_replay(intel_dp);
+ else if (intel_dp->psr.psr2_enabled)
hsw_activate_psr2(intel_dp);
else
hsw_activate_psr1(intel_dp);
@@ -1554,6 +1575,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,
drm_WARN_ON(&dev_priv->drm, intel_dp->psr.enabled);
intel_dp->psr.psr2_enabled = crtc_state->has_psr2;
+ intel_dp->psr.panel_replay_enabled = crtc_state->has_panel_replay;
intel_dp->psr.busy_frontbuffer_bits = 0;
intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
intel_dp->psr.transcoder = crtc_state->cpu_transcoder;
@@ -1569,8 +1591,12 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,
if (!psr_interrupt_error_check(intel_dp))
return;
- drm_dbg_kms(&dev_priv->drm, "Enabling PSR%s\n",
- intel_dp->psr.psr2_enabled ? "2" : "1");
+ if (intel_dp->psr.panel_replay_enabled)
+ drm_dbg_kms(&dev_priv->drm, "Enabling Panel Replay\n");
+ else
+ drm_dbg_kms(&dev_priv->drm, "Enabling PSR%s\n",
+ intel_dp->psr.psr2_enabled ? "2" : "1");
+
intel_write_dp_vsc_sdp(encoder, crtc_state, &crtc_state->psr_vsc);
intel_snps_phy_update_psr_power_state(dev_priv, phy, true);
intel_psr_enable_sink(intel_dp);
@@ -1599,7 +1625,10 @@ static void intel_psr_exit(struct intel_dp *intel_dp)
return;
}
- if (intel_dp->psr.psr2_enabled) {
+ if (intel_dp->psr.panel_replay_enabled) {
+ intel_de_rmw(dev_priv, TRANS_DP2_CTL(intel_dp->psr.transcoder),
+ TRANS_DP2_PANEL_REPLAY_ENABLE, 0);
+ } else if (intel_dp->psr.psr2_enabled) {
tgl_disallow_dc3co_on_psr2_exit(intel_dp);
val = intel_de_rmw(dev_priv, EDP_PSR2_CTL(cpu_transcoder),
@@ -1648,8 +1677,11 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
if (!intel_dp->psr.enabled)
return;
- drm_dbg_kms(&dev_priv->drm, "Disabling PSR%s\n",
- intel_dp->psr.psr2_enabled ? "2" : "1");
+ if (intel_dp->psr.panel_replay_enabled)
+ drm_dbg_kms(&dev_priv->drm, "Disabling Panel Replay\n");
+ else
+ drm_dbg_kms(&dev_priv->drm, "Disabling PSR%s\n",
+ intel_dp->psr.psr2_enabled ? "2" : "1");
intel_psr_exit(intel_dp);
intel_psr_wait_exit_locked(intel_dp);
@@ -1682,6 +1714,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
drm_dp_dpcd_writeb(&intel_dp->aux, DP_RECEIVER_ALPM_CONFIG, 0);
intel_dp->psr.enabled = false;
+ intel_dp->psr.panel_replay_enabled = false;
intel_dp->psr.psr2_enabled = false;
intel_dp->psr.psr2_sel_fetch_enabled = false;
intel_dp->psr.psr2_sel_fetch_cff_enabled = false;
@@ -2253,7 +2286,7 @@ void intel_psr_post_plane_update(struct intel_atomic_state *state,
intel_atomic_get_new_crtc_state(state, crtc);
struct intel_encoder *encoder;
- if (!crtc_state->has_psr)
+ if (!(crtc_state->has_psr || crtc_state->has_panel_replay))
return;
for_each_intel_encoder_mask_with_psr(state->base.dev, encoder,
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for panel replay
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (4 preceding siblings ...)
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 5/6] drm/i915/panelreplay: enable/disable panel replay Animesh Manna
@ 2023-11-03 21:00 ` Animesh Manna
2023-11-06 8:03 ` Hogander, Jouni
2023-11-03 22:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Panel replay phase1 implementation (rev10) Patchwork
` (2 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Animesh Manna @ 2023-11-03 21:00 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Jani Nikula
Add debugfs support which will print source and sink status
per connector basis. Existing i915_psr_status and
i915_psr_sink_status will be used to get the source and
sink status of panel replay.
v1: Initial version. [rb-ed by Arun]
v2: Added check for DP 2.0 and connector type in connector_debugfs_add().
v3: Optimization and cosmetic changes. [Jouni]
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 93 +++++++++++++++++-------
1 file changed, 66 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 8ed4684b4528..8b7c03cd4989 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2813,12 +2813,19 @@ static int psr_get_status_and_error_status(struct intel_dp *intel_dp,
{
struct drm_dp_aux *aux = &intel_dp->aux;
int ret;
+ unsigned int offset;
- ret = drm_dp_dpcd_readb(aux, DP_PSR_STATUS, status);
+ offset = intel_dp->psr.panel_replay_enabled ?
+ DP_SINK_DEVICE_PR_AND_FRAME_LOCK_STATUS : DP_PSR_STATUS;
+
+ ret = drm_dp_dpcd_readb(aux, offset, status);
if (ret != 1)
return ret;
- ret = drm_dp_dpcd_readb(aux, DP_PSR_ERROR_STATUS, error_status);
+ offset = intel_dp->psr.panel_replay_enabled ?
+ DP_PANEL_REPLAY_ERROR_STATUS : DP_PSR_ERROR_STATUS;
+
+ ret = drm_dp_dpcd_readb(aux, offset, error_status);
if (ret != 1)
return ret;
@@ -3039,7 +3046,7 @@ psr_source_status(struct intel_dp *intel_dp, struct seq_file *m)
status = live_status[status_val];
}
- seq_printf(m, "Source PSR status: %s [0x%08x]\n", status, val);
+ seq_printf(m, "Source PSR/PanelReplay status: %s [0x%08x]\n", status, val);
}
static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp)
@@ -3052,18 +3059,23 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp)
bool enabled;
u32 val;
- seq_printf(m, "Sink support: %s", str_yes_no(psr->sink_support));
- if (psr->sink_support)
+ seq_printf(m, "Sink support: PSR = %s, Panel Replay = %s",
+ str_yes_no(psr->sink_support),
+ str_yes_no(psr->sink_panel_replay_support));
+
+ if (psr->sink_support || psr->sink_panel_replay_support)
seq_printf(m, " [0x%02x]", intel_dp->psr_dpcd[0]);
seq_puts(m, "\n");
- if (!psr->sink_support)
+ if (!(psr->sink_support || psr->sink_panel_replay_support))
return 0;
wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
mutex_lock(&psr->lock);
- if (psr->enabled)
+ if (psr->panel_replay_enabled)
+ status = "Panel Replay Enabled";
+ else if (psr->enabled)
status = psr->psr2_enabled ? "PSR2 enabled" : "PSR1 enabled";
else
status = "disabled";
@@ -3076,14 +3088,17 @@ static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp)
goto unlock;
}
- if (psr->psr2_enabled) {
+ if (psr->panel_replay_enabled) {
+ val = intel_de_read(dev_priv, TRANS_DP2_CTL(cpu_transcoder));
+ enabled = val & TRANS_DP2_PANEL_REPLAY_ENABLE;
+ } else if (psr->psr2_enabled) {
val = intel_de_read(dev_priv, EDP_PSR2_CTL(cpu_transcoder));
enabled = val & EDP_PSR2_ENABLE;
} else {
val = intel_de_read(dev_priv, psr_ctl_reg(dev_priv, cpu_transcoder));
enabled = val & EDP_PSR_ENABLE;
}
- seq_printf(m, "Source PSR ctl: %s [0x%08x]\n",
+ seq_printf(m, "Source PSR/PanelReplay ctl: %s [0x%08x]\n",
str_enabled_disabled(enabled), val);
psr_source_status(intel_dp, m);
seq_printf(m, "Busy frontbuffer bits: 0x%08x\n",
@@ -3221,6 +3236,15 @@ void intel_psr_debugfs_register(struct drm_i915_private *i915)
i915, &i915_edp_psr_status_fops);
}
+static const char *psr_mode_str(struct intel_dp *intel_dp) {
+ if (intel_dp->psr.panel_replay_enabled)
+ return "PANEL-REPLAY";
+ else if(intel_dp->psr.enabled)
+ return "PSR";
+
+ return "unknown";
+}
+
static int i915_psr_sink_status_show(struct seq_file *m, void *data)
{
struct intel_connector *connector = m->private;
@@ -3235,12 +3259,19 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
"reserved",
"sink internal error",
};
+ static const char * const panel_replay_status[] = {
+ "Sink device frame is locked to the Source device",
+ "Sink device is coasting, using the VTotal target",
+ "Sink device is governing the frame rate (frame rate unlock is granted)",
+ "Sink device in the process of re-locking with the Source device",
+ };
const char *str;
int ret;
u8 status, error_status;
+ u32 idx;
- if (!CAN_PSR(intel_dp)) {
- seq_puts(m, "PSR Unsupported\n");
+ if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp))) {
+ seq_puts(m, "PSR/Panel-Replay Unsupported\n");
return -ENODEV;
}
@@ -3251,28 +3282,33 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
if (ret)
return ret;
- status &= DP_PSR_SINK_STATE_MASK;
- if (status < ARRAY_SIZE(sink_status))
- str = sink_status[status];
- else
- str = "unknown";
+ str = "unknown";
+ if (intel_dp->psr.panel_replay_enabled) {
+ idx = (status & DP_SINK_FRAME_LOCKED_MASK) >> DP_SINK_FRAME_LOCKED_SHIFT;
+ if (idx < ARRAY_SIZE(panel_replay_status))
+ str = panel_replay_status[idx];
+ } else if (intel_dp->psr.enabled) {
+ idx = status & DP_PSR_SINK_STATE_MASK;
+ if (idx < ARRAY_SIZE(sink_status))
+ str = sink_status[idx];
+ }
- seq_printf(m, "Sink PSR status: 0x%x [%s]\n", status, str);
+ seq_printf(m, "Sink %s status: 0x%x [%s]\n", psr_mode_str(intel_dp), status, str);
- seq_printf(m, "Sink PSR error status: 0x%x", error_status);
+ seq_printf(m, "Sink %s error status: 0x%x", psr_mode_str(intel_dp), error_status);
if (error_status & (DP_PSR_RFB_STORAGE_ERROR |
DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR |
DP_PSR_LINK_CRC_ERROR))
- seq_puts(m, ":\n");
- else
- seq_puts(m, "\n");
+ seq_puts(m, ":\n");
+ else
+ seq_puts(m, "\n");
if (error_status & DP_PSR_RFB_STORAGE_ERROR)
- seq_puts(m, "\tPSR RFB storage error\n");
+ seq_printf(m, "\t%s RFB storage error\n", psr_mode_str(intel_dp));
if (error_status & DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR)
- seq_puts(m, "\tPSR VSC SDP uncorrectable error\n");
+ seq_printf(m, "\t%s VSC SDP uncorrectable error\n", psr_mode_str(intel_dp));
if (error_status & DP_PSR_LINK_CRC_ERROR)
- seq_puts(m, "\tPSR Link CRC error\n");
+ seq_printf(m, "\t%s Link CRC error\n", psr_mode_str(intel_dp));
return ret;
}
@@ -3292,13 +3328,16 @@ void intel_psr_connector_debugfs_add(struct intel_connector *connector)
struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct dentry *root = connector->base.debugfs_entry;
- if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
- return;
+ if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP) {
+ if (!(HAS_DP20(i915) &&
+ connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort))
+ return;
+ }
debugfs_create_file("i915_psr_sink_status", 0444, root,
connector, &i915_psr_sink_status_fops);
- if (HAS_PSR(i915))
+ if (HAS_PSR(i915) || HAS_DP20(i915))
debugfs_create_file("i915_psr_status", 0444, root,
connector, &i915_psr_status_fops);
}
--
2.29.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for panel replay
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for " Animesh Manna
@ 2023-11-06 8:03 ` Hogander, Jouni
2023-11-07 5:01 ` Manna, Animesh
0 siblings, 1 reply; 13+ messages in thread
From: Hogander, Jouni @ 2023-11-06 8:03 UTC (permalink / raw)
To: dri-devel@lists.freedesktop.org, Manna, Animesh,
intel-gfx@lists.freedesktop.org
Cc: Nikula, Jani
Hello Animesh,
Thank you for the changes. Now the patch is much shorter, cleaner and
easier to review. See my inline comments below.
On Sat, 2023-11-04 at 02:30 +0530, Animesh Manna wrote:
> Add debugfs support which will print source and sink status
> per connector basis. Existing i915_psr_status and
> i915_psr_sink_status will be used to get the source and
> sink status of panel replay.
>
> v1: Initial version. [rb-ed by Arun]
> v2: Added check for DP 2.0 and connector type in
> connector_debugfs_add().
> v3: Optimization and cosmetic changes. [Jouni]
>
> Cc: Jouni Högander <jouni.hogander@intel.com>
> Cc: Arun R Murthy <arun.r.murthy@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
> Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_psr.c | 93 +++++++++++++++++-----
> --
> 1 file changed, 66 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 8ed4684b4528..8b7c03cd4989 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -2813,12 +2813,19 @@ static int
> psr_get_status_and_error_status(struct intel_dp *intel_dp,
> {
> struct drm_dp_aux *aux = &intel_dp->aux;
> int ret;
> + unsigned int offset;
>
> - ret = drm_dp_dpcd_readb(aux, DP_PSR_STATUS, status);
> + offset = intel_dp->psr.panel_replay_enabled ?
> + DP_SINK_DEVICE_PR_AND_FRAME_LOCK_STATUS :
> DP_PSR_STATUS;
> +
> + ret = drm_dp_dpcd_readb(aux, offset, status);
> if (ret != 1)
> return ret;
>
> - ret = drm_dp_dpcd_readb(aux, DP_PSR_ERROR_STATUS,
> error_status);
> + offset = intel_dp->psr.panel_replay_enabled ?
> + DP_PANEL_REPLAY_ERROR_STATUS : DP_PSR_ERROR_STATUS;
> +
> + ret = drm_dp_dpcd_readb(aux, offset, error_status);
> if (ret != 1)
> return ret;
>
> @@ -3039,7 +3046,7 @@ psr_source_status(struct intel_dp *intel_dp,
> struct seq_file *m)
> status = live_status[status_val];
> }
>
> - seq_printf(m, "Source PSR status: %s [0x%08x]\n", status,
> val);
> + seq_printf(m, "Source PSR/PanelReplay status: %s [0x%08x]\n",
> status, val);
> }
>
> static int intel_psr_status(struct seq_file *m, struct intel_dp
> *intel_dp)
> @@ -3052,18 +3059,23 @@ static int intel_psr_status(struct seq_file
> *m, struct intel_dp *intel_dp)
> bool enabled;
> u32 val;
>
> - seq_printf(m, "Sink support: %s", str_yes_no(psr-
> >sink_support));
> - if (psr->sink_support)
> + seq_printf(m, "Sink support: PSR = %s, Panel Replay = %s",
> + str_yes_no(psr->sink_support),
> + str_yes_no(psr->sink_panel_replay_support));
> +
> + if (psr->sink_support || psr->sink_panel_replay_support)
> seq_printf(m, " [0x%02x]", intel_dp->psr_dpcd[0]);
The output will look like this:
Sink support: PSR = yes, Panel Replay = yes, [0x01]
I think more logical would be:
Sink support: PSR = yes [0x01], Panel Replay = yes
> seq_puts(m, "\n");
>
> - if (!psr->sink_support)
> + if (!(psr->sink_support || psr->sink_panel_replay_support))
> return 0;
>
> wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
> mutex_lock(&psr->lock);
>
> - if (psr->enabled)
> + if (psr->panel_replay_enabled)
> + status = "Panel Replay Enabled";
> + else if (psr->enabled)
> status = psr->psr2_enabled ? "PSR2 enabled" : "PSR1
> enabled";
> else
> status = "disabled";
> @@ -3076,14 +3088,17 @@ static int intel_psr_status(struct seq_file
> *m, struct intel_dp *intel_dp)
> goto unlock;
> }
>
> - if (psr->psr2_enabled) {
> + if (psr->panel_replay_enabled) {
> + val = intel_de_read(dev_priv,
> TRANS_DP2_CTL(cpu_transcoder));
> + enabled = val & TRANS_DP2_PANEL_REPLAY_ENABLE;
> + } else if (psr->psr2_enabled) {
> val = intel_de_read(dev_priv,
> EDP_PSR2_CTL(cpu_transcoder));
> enabled = val & EDP_PSR2_ENABLE;
> } else {
> val = intel_de_read(dev_priv, psr_ctl_reg(dev_priv,
> cpu_transcoder));
> enabled = val & EDP_PSR_ENABLE;
> }
> - seq_printf(m, "Source PSR ctl: %s [0x%08x]\n",
> + seq_printf(m, "Source PSR/PanelReplay ctl: %s [0x%08x]\n",
Use correct name here. Which is DP2 ctl.
> str_enabled_disabled(enabled), val);
> psr_source_status(intel_dp, m);
> seq_printf(m, "Busy frontbuffer bits: 0x%08x\n",
> @@ -3221,6 +3236,15 @@ void intel_psr_debugfs_register(struct
> drm_i915_private *i915)
> i915, &i915_edp_psr_status_fops);
> }
>
> +static const char *psr_mode_str(struct intel_dp *intel_dp) {
> + if (intel_dp->psr.panel_replay_enabled)
> + return "PANEL-REPLAY";
> + else if(intel_dp->psr.enabled)
> + return "PSR";
> +
> + return "unknown";
> +}
> +
> static int i915_psr_sink_status_show(struct seq_file *m, void *data)
> {
> struct intel_connector *connector = m->private;
> @@ -3235,12 +3259,19 @@ static int i915_psr_sink_status_show(struct
> seq_file *m, void *data)
> "reserved",
> "sink internal error",
> };
> + static const char * const panel_replay_status[] = {
> + "Sink device frame is locked to the Source device",
> + "Sink device is coasting, using the VTotal target",
> + "Sink device is governing the frame rate (frame rate
> unlock is granted)",
> + "Sink device in the process of re-locking with the
> Source device",
> + };
> const char *str;
> int ret;
> u8 status, error_status;
> + u32 idx;
>
> - if (!CAN_PSR(intel_dp)) {
> - seq_puts(m, "PSR Unsupported\n");
> + if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp))) {
> + seq_puts(m, "PSR/Panel-Replay Unsupported\n");
> return -ENODEV;
> }
>
> @@ -3251,28 +3282,33 @@ static int i915_psr_sink_status_show(struct
> seq_file *m, void *data)
> if (ret)
> return ret;
>
> - status &= DP_PSR_SINK_STATE_MASK;
> - if (status < ARRAY_SIZE(sink_status))
> - str = sink_status[status];
> - else
> - str = "unknown";
> + str = "unknown";
> + if (intel_dp->psr.panel_replay_enabled) {
> + idx = (status & DP_SINK_FRAME_LOCKED_MASK) >>
> DP_SINK_FRAME_LOCKED_SHIFT;
> + if (idx < ARRAY_SIZE(panel_replay_status))
> + str = panel_replay_status[idx];
> + } else if (intel_dp->psr.enabled) {
> + idx = status & DP_PSR_SINK_STATE_MASK;
> + if (idx < ARRAY_SIZE(sink_status))
> + str = sink_status[idx];
> + }
>
> - seq_printf(m, "Sink PSR status: 0x%x [%s]\n", status, str);
> + seq_printf(m, "Sink %s status: 0x%x [%s]\n",
> psr_mode_str(intel_dp), status, str);
>
> - seq_printf(m, "Sink PSR error status: 0x%x", error_status);
> + seq_printf(m, "Sink %s error status: 0x%x",
> psr_mode_str(intel_dp), error_status);
>
> if (error_status & (DP_PSR_RFB_STORAGE_ERROR |
> DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR |
> DP_PSR_LINK_CRC_ERROR))
> - seq_puts(m, ":\n");
> - else
> - seq_puts(m, "\n");
> + seq_puts(m, ":\n");
> + else
> + seq_puts(m, "\n");
> if (error_status & DP_PSR_RFB_STORAGE_ERROR)
> - seq_puts(m, "\tPSR RFB storage error\n");
> + seq_printf(m, "\t%s RFB storage error\n",
> psr_mode_str(intel_dp));
> if (error_status & DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR)
> - seq_puts(m, "\tPSR VSC SDP uncorrectable error\n");
> + seq_printf(m, "\t%s VSC SDP uncorrectable error\n",
> psr_mode_str(intel_dp));
> if (error_status & DP_PSR_LINK_CRC_ERROR)
> - seq_puts(m, "\tPSR Link CRC error\n");
> + seq_printf(m, "\t%s Link CRC error\n",
> psr_mode_str(intel_dp));
>
> return ret;
> }
> @@ -3292,13 +3328,16 @@ void intel_psr_connector_debugfs_add(struct
> intel_connector *connector)
> struct drm_i915_private *i915 = to_i915(connector->base.dev);
> struct dentry *root = connector->base.debugfs_entry;
>
> - if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
> - return;
> + if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
> {
> + if (!(HAS_DP20(i915) &&
> + connector->base.connector_type ==
> DRM_MODE_CONNECTOR_DisplayPort))
> + return;
> + }
>
> debugfs_create_file("i915_psr_sink_status", 0444, root,
> connector, &i915_psr_sink_status_fops);
>
> - if (HAS_PSR(i915))
> + if (HAS_PSR(i915) || HAS_DP20(i915))
> debugfs_create_file("i915_psr_status", 0444, root,
> connector,
> &i915_psr_status_fops);
> }
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for panel replay
2023-11-06 8:03 ` Hogander, Jouni
@ 2023-11-07 5:01 ` Manna, Animesh
2023-11-07 7:32 ` Hogander, Jouni
0 siblings, 1 reply; 13+ messages in thread
From: Manna, Animesh @ 2023-11-07 5:01 UTC (permalink / raw)
To: Hogander, Jouni, intel-gfx@lists.freedesktop.org
Cc: Nikula, Jani, dri-devel@lists.freedesktop.org
> -----Original Message-----
> From: Hogander, Jouni <jouni.hogander@intel.com>
> Sent: Monday, November 6, 2023 1:33 PM
> To: dri-devel@lists.freedesktop.org; Manna, Animesh
> <animesh.manna@intel.com>; intel-gfx@lists.freedesktop.org
> Cc: Murthy, Arun R <arun.r.murthy@intel.com>; Nikula, Jani
> <jani.nikula@intel.com>
> Subject: Re: [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for
> panel replay
>
> Hello Animesh,
>
> Thank you for the changes. Now the patch is much shorter, cleaner and
> easier to review. See my inline comments below.
>
> On Sat, 2023-11-04 at 02:30 +0530, Animesh Manna wrote:
> > Add debugfs support which will print source and sink status per
> > connector basis. Existing i915_psr_status and i915_psr_sink_status
> > will be used to get the source and sink status of panel replay.
> >
> > v1: Initial version. [rb-ed by Arun]
> > v2: Added check for DP 2.0 and connector type in
> > connector_debugfs_add().
> > v3: Optimization and cosmetic changes. [Jouni]
> >
> > Cc: Jouni Högander <jouni.hogander@intel.com>
> > Cc: Arun R Murthy <arun.r.murthy@intel.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
> > Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_psr.c | 93 +++++++++++++++++-----
> > --
> > 1 file changed, 66 insertions(+), 27 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index 8ed4684b4528..8b7c03cd4989 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -2813,12 +2813,19 @@ static int
> > psr_get_status_and_error_status(struct intel_dp *intel_dp,
> > {
> > struct drm_dp_aux *aux = &intel_dp->aux;
> > int ret;
> > + unsigned int offset;
> >
> > - ret = drm_dp_dpcd_readb(aux, DP_PSR_STATUS, status);
> > + offset = intel_dp->psr.panel_replay_enabled ?
> > + DP_SINK_DEVICE_PR_AND_FRAME_LOCK_STATUS :
> > DP_PSR_STATUS;
> > +
> > + ret = drm_dp_dpcd_readb(aux, offset, status);
> > if (ret != 1)
> > return ret;
> >
> > - ret = drm_dp_dpcd_readb(aux, DP_PSR_ERROR_STATUS,
> > error_status);
> > + offset = intel_dp->psr.panel_replay_enabled ?
> > + DP_PANEL_REPLAY_ERROR_STATUS : DP_PSR_ERROR_STATUS;
> > +
> > + ret = drm_dp_dpcd_readb(aux, offset, error_status);
> > if (ret != 1)
> > return ret;
> >
> > @@ -3039,7 +3046,7 @@ psr_source_status(struct intel_dp *intel_dp,
> > struct seq_file *m)
> > status = live_status[status_val];
> > }
> >
> > - seq_printf(m, "Source PSR status: %s [0x%08x]\n", status,
> > val);
> > + seq_printf(m, "Source PSR/PanelReplay status: %s [0x%08x]\n",
> > status, val);
> > }
> >
> > static int intel_psr_status(struct seq_file *m, struct intel_dp
> > *intel_dp)
> > @@ -3052,18 +3059,23 @@ static int intel_psr_status(struct seq_file
> > *m, struct intel_dp *intel_dp)
> > bool enabled;
> > u32 val;
> >
> > - seq_printf(m, "Sink support: %s", str_yes_no(psr-
> > >sink_support));
> > - if (psr->sink_support)
> > + seq_printf(m, "Sink support: PSR = %s, Panel Replay = %s",
> > + str_yes_no(psr->sink_support),
> > + str_yes_no(psr->sink_panel_replay_support));
> > +
> > + if (psr->sink_support || psr->sink_panel_replay_support)
> > seq_printf(m, " [0x%02x]", intel_dp->psr_dpcd[0]);
>
> The output will look like this:
>
> Sink support: PSR = yes, Panel Replay = yes, [0x01]
>
> I think more logical would be:
>
> Sink support: PSR = yes [0x01], Panel Replay = yes
>
>
> > seq_puts(m, "\n");
> >
> > - if (!psr->sink_support)
> > + if (!(psr->sink_support || psr->sink_panel_replay_support))
> > return 0;
> >
> > wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
> > mutex_lock(&psr->lock);
> >
> > - if (psr->enabled)
> > + if (psr->panel_replay_enabled)
> > + status = "Panel Replay Enabled";
> > + else if (psr->enabled)
> > status = psr->psr2_enabled ? "PSR2 enabled" : "PSR1
> > enabled";
> > else
> > status = "disabled";
> > @@ -3076,14 +3088,17 @@ static int intel_psr_status(struct seq_file
> > *m, struct intel_dp *intel_dp)
> > goto unlock;
> > }
> >
> > - if (psr->psr2_enabled) {
> > + if (psr->panel_replay_enabled) {
> > + val = intel_de_read(dev_priv,
> > TRANS_DP2_CTL(cpu_transcoder));
> > + enabled = val & TRANS_DP2_PANEL_REPLAY_ENABLE;
> > + } else if (psr->psr2_enabled) {
> > val = intel_de_read(dev_priv,
> > EDP_PSR2_CTL(cpu_transcoder));
> > enabled = val & EDP_PSR2_ENABLE;
> > } else {
> > val = intel_de_read(dev_priv, psr_ctl_reg(dev_priv,
> > cpu_transcoder));
> > enabled = val & EDP_PSR_ENABLE;
> > }
> > - seq_printf(m, "Source PSR ctl: %s [0x%08x]\n",
> > + seq_printf(m, "Source PSR/PanelReplay ctl: %s [0x%08x]\n",
>
> Use correct name here. Which is DP2 ctl.
The clt registers are different for panel-replay/psr2/psr, so kept as PSR/PanelReplay ctl and cannot put DP2 ctl.
Otherwise, will keep like below:
seq_printf(m, "Source ctl: %s [0x%08x]\n", str_enabled_disabled(enabled), val);
Please ley me know if it looks ok to you.
Regards,
Animesh
>
> > str_enabled_disabled(enabled), val);
> > psr_source_status(intel_dp, m);
> > seq_printf(m, "Busy frontbuffer bits: 0x%08x\n", @@ -3221,6
> > +3236,15 @@ void intel_psr_debugfs_register(struct drm_i915_private
> > *i915)
> > i915, &i915_edp_psr_status_fops);
> > }
> >
> > +static const char *psr_mode_str(struct intel_dp *intel_dp) {
> > + if (intel_dp->psr.panel_replay_enabled)
> > + return "PANEL-REPLAY";
> > + else if(intel_dp->psr.enabled)
> > + return "PSR";
> > +
> > + return "unknown";
> > +}
> > +
> > static int i915_psr_sink_status_show(struct seq_file *m, void *data)
> > {
> > struct intel_connector *connector = m->private; @@ -3235,12
> > +3259,19 @@ static int i915_psr_sink_status_show(struct seq_file *m,
> > void *data)
> > "reserved",
> > "sink internal error",
> > };
> > + static const char * const panel_replay_status[] = {
> > + "Sink device frame is locked to the Source device",
> > + "Sink device is coasting, using the VTotal target",
> > + "Sink device is governing the frame rate (frame rate
> > unlock is granted)",
> > + "Sink device in the process of re-locking with the
> > Source device",
> > + };
> > const char *str;
> > int ret;
> > u8 status, error_status;
> > + u32 idx;
> >
> > - if (!CAN_PSR(intel_dp)) {
> > - seq_puts(m, "PSR Unsupported\n");
> > + if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp))) {
> > + seq_puts(m, "PSR/Panel-Replay Unsupported\n");
> > return -ENODEV;
> > }
> >
> > @@ -3251,28 +3282,33 @@ static int i915_psr_sink_status_show(struct
> > seq_file *m, void *data)
> > if (ret)
> > return ret;
> >
> > - status &= DP_PSR_SINK_STATE_MASK;
> > - if (status < ARRAY_SIZE(sink_status))
> > - str = sink_status[status];
> > - else
> > - str = "unknown";
> > + str = "unknown";
> > + if (intel_dp->psr.panel_replay_enabled) {
> > + idx = (status & DP_SINK_FRAME_LOCKED_MASK) >>
> > DP_SINK_FRAME_LOCKED_SHIFT;
> > + if (idx < ARRAY_SIZE(panel_replay_status))
> > + str = panel_replay_status[idx];
> > + } else if (intel_dp->psr.enabled) {
> > + idx = status & DP_PSR_SINK_STATE_MASK;
> > + if (idx < ARRAY_SIZE(sink_status))
> > + str = sink_status[idx];
> > + }
> >
> > - seq_printf(m, "Sink PSR status: 0x%x [%s]\n", status, str);
> > + seq_printf(m, "Sink %s status: 0x%x [%s]\n",
> > psr_mode_str(intel_dp), status, str);
> >
> > - seq_printf(m, "Sink PSR error status: 0x%x", error_status);
> > + seq_printf(m, "Sink %s error status: 0x%x",
> > psr_mode_str(intel_dp), error_status);
> >
> > if (error_status & (DP_PSR_RFB_STORAGE_ERROR |
> > DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR |
> > DP_PSR_LINK_CRC_ERROR))
> > - seq_puts(m, ":\n");
> > - else
> > - seq_puts(m, "\n");
> > + seq_puts(m, ":\n");
> > + else
> > + seq_puts(m, "\n");
> > if (error_status & DP_PSR_RFB_STORAGE_ERROR)
> > - seq_puts(m, "\tPSR RFB storage error\n");
> > + seq_printf(m, "\t%s RFB storage error\n",
> > psr_mode_str(intel_dp));
> > if (error_status & DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR)
> > - seq_puts(m, "\tPSR VSC SDP uncorrectable error\n");
> > + seq_printf(m, "\t%s VSC SDP uncorrectable error\n",
> > psr_mode_str(intel_dp));
> > if (error_status & DP_PSR_LINK_CRC_ERROR)
> > - seq_puts(m, "\tPSR Link CRC error\n");
> > + seq_printf(m, "\t%s Link CRC error\n",
> > psr_mode_str(intel_dp));
> >
> > return ret;
> > }
> > @@ -3292,13 +3328,16 @@ void intel_psr_connector_debugfs_add(struct
> > intel_connector *connector)
> > struct drm_i915_private *i915 = to_i915(connector->base.dev);
> > struct dentry *root = connector->base.debugfs_entry;
> >
> > - if (connector->base.connector_type !=
> DRM_MODE_CONNECTOR_eDP)
> > - return;
> > + if (connector->base.connector_type !=
> DRM_MODE_CONNECTOR_eDP)
> > {
> > + if (!(HAS_DP20(i915) &&
> > + connector->base.connector_type ==
> > DRM_MODE_CONNECTOR_DisplayPort))
> > + return;
> > + }
> >
> > debugfs_create_file("i915_psr_sink_status", 0444, root,
> > connector, &i915_psr_sink_status_fops);
> >
> > - if (HAS_PSR(i915))
> > + if (HAS_PSR(i915) || HAS_DP20(i915))
> > debugfs_create_file("i915_psr_status", 0444, root,
> > connector, &i915_psr_status_fops);
> > }
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for panel replay
2023-11-07 5:01 ` Manna, Animesh
@ 2023-11-07 7:32 ` Hogander, Jouni
0 siblings, 0 replies; 13+ messages in thread
From: Hogander, Jouni @ 2023-11-07 7:32 UTC (permalink / raw)
To: Manna, Animesh, intel-gfx@lists.freedesktop.org
Cc: Nikula, Jani, dri-devel@lists.freedesktop.org
On Tue, 2023-11-07 at 05:01 +0000, Manna, Animesh wrote:
>
>
> > -----Original Message-----
> > From: Hogander, Jouni <jouni.hogander@intel.com>
> > Sent: Monday, November 6, 2023 1:33 PM
> > To: dri-devel@lists.freedesktop.org; Manna, Animesh
> > <animesh.manna@intel.com>; intel-gfx@lists.freedesktop.org
> > Cc: Murthy, Arun R <arun.r.murthy@intel.com>; Nikula, Jani
> > <jani.nikula@intel.com>
> > Subject: Re: [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support
> > for
> > panel replay
> >
> > Hello Animesh,
> >
> > Thank you for the changes. Now the patch is much shorter, cleaner
> > and
> > easier to review. See my inline comments below.
> >
> > On Sat, 2023-11-04 at 02:30 +0530, Animesh Manna wrote:
> > > Add debugfs support which will print source and sink status per
> > > connector basis. Existing i915_psr_status and
> > > i915_psr_sink_status
> > > will be used to get the source and sink status of panel replay.
> > >
> > > v1: Initial version. [rb-ed by Arun]
> > > v2: Added check for DP 2.0 and connector type in
> > > connector_debugfs_add().
> > > v3: Optimization and cosmetic changes. [Jouni]
> > >
> > > Cc: Jouni Högander <jouni.hogander@intel.com>
> > > Cc: Arun R Murthy <arun.r.murthy@intel.com>
> > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
> > > Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> > > ---
> > > drivers/gpu/drm/i915/display/intel_psr.c | 93 +++++++++++++++++-
> > > ----
> > > --
> > > 1 file changed, 66 insertions(+), 27 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > > b/drivers/gpu/drm/i915/display/intel_psr.c
> > > index 8ed4684b4528..8b7c03cd4989 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > > @@ -2813,12 +2813,19 @@ static int
> > > psr_get_status_and_error_status(struct intel_dp *intel_dp,
> > > {
> > > struct drm_dp_aux *aux = &intel_dp->aux;
> > > int ret;
> > > + unsigned int offset;
> > >
> > > - ret = drm_dp_dpcd_readb(aux, DP_PSR_STATUS, status);
> > > + offset = intel_dp->psr.panel_replay_enabled ?
> > > + DP_SINK_DEVICE_PR_AND_FRAME_LOCK_STATUS :
> > > DP_PSR_STATUS;
> > > +
> > > + ret = drm_dp_dpcd_readb(aux, offset, status);
> > > if (ret != 1)
> > > return ret;
> > >
> > > - ret = drm_dp_dpcd_readb(aux, DP_PSR_ERROR_STATUS,
> > > error_status);
> > > + offset = intel_dp->psr.panel_replay_enabled ?
> > > + DP_PANEL_REPLAY_ERROR_STATUS :
> > > DP_PSR_ERROR_STATUS;
> > > +
> > > + ret = drm_dp_dpcd_readb(aux, offset, error_status);
> > > if (ret != 1)
> > > return ret;
> > >
> > > @@ -3039,7 +3046,7 @@ psr_source_status(struct intel_dp
> > > *intel_dp,
> > > struct seq_file *m)
> > > status = live_status[status_val];
> > > }
> > >
> > > - seq_printf(m, "Source PSR status: %s [0x%08x]\n", status,
> > > val);
> > > + seq_printf(m, "Source PSR/PanelReplay status: %s
> > > [0x%08x]\n",
> > > status, val);
> > > }
> > >
> > > static int intel_psr_status(struct seq_file *m, struct intel_dp
> > > *intel_dp)
> > > @@ -3052,18 +3059,23 @@ static int intel_psr_status(struct
> > > seq_file
> > > *m, struct intel_dp *intel_dp)
> > > bool enabled;
> > > u32 val;
> > >
> > > - seq_printf(m, "Sink support: %s", str_yes_no(psr-
> > > > sink_support));
> > > - if (psr->sink_support)
> > > + seq_printf(m, "Sink support: PSR = %s, Panel Replay =
> > > %s",
> > > + str_yes_no(psr->sink_support),
> > > + str_yes_no(psr->sink_panel_replay_support));
> > > +
> > > + if (psr->sink_support || psr->sink_panel_replay_support)
> > > seq_printf(m, " [0x%02x]", intel_dp-
> > > >psr_dpcd[0]);
> >
> > The output will look like this:
> >
> > Sink support: PSR = yes, Panel Replay = yes, [0x01]
> >
> > I think more logical would be:
> >
> > Sink support: PSR = yes [0x01], Panel Replay = yes
> >
> >
> > > seq_puts(m, "\n");
> > >
> > > - if (!psr->sink_support)
> > > + if (!(psr->sink_support || psr-
> > > >sink_panel_replay_support))
> > > return 0;
> > >
> > > wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
> > > mutex_lock(&psr->lock);
> > >
> > > - if (psr->enabled)
> > > + if (psr->panel_replay_enabled)
> > > + status = "Panel Replay Enabled";
> > > + else if (psr->enabled)
> > > status = psr->psr2_enabled ? "PSR2 enabled" :
> > > "PSR1
> > > enabled";
> > > else
> > > status = "disabled";
> > > @@ -3076,14 +3088,17 @@ static int intel_psr_status(struct
> > > seq_file
> > > *m, struct intel_dp *intel_dp)
> > > goto unlock;
> > > }
> > >
> > > - if (psr->psr2_enabled) {
> > > + if (psr->panel_replay_enabled) {
> > > + val = intel_de_read(dev_priv,
> > > TRANS_DP2_CTL(cpu_transcoder));
> > > + enabled = val & TRANS_DP2_PANEL_REPLAY_ENABLE;
> > > + } else if (psr->psr2_enabled) {
> > > val = intel_de_read(dev_priv,
> > > EDP_PSR2_CTL(cpu_transcoder));
> > > enabled = val & EDP_PSR2_ENABLE;
> > > } else {
> > > val = intel_de_read(dev_priv,
> > > psr_ctl_reg(dev_priv,
> > > cpu_transcoder));
> > > enabled = val & EDP_PSR_ENABLE;
> > > }
> > > - seq_printf(m, "Source PSR ctl: %s [0x%08x]\n",
> > > + seq_printf(m, "Source PSR/PanelReplay ctl: %s
> > > [0x%08x]\n",
> >
> > Use correct name here. Which is DP2 ctl.
>
> The clt registers are different for panel-replay/psr2/psr, so kept as
> PSR/PanelReplay ctl and cannot put DP2 ctl.
> Otherwise, will keep like below:
> seq_printf(m, "Source ctl: %s [0x%08x]\n",
> str_enabled_disabled(enabled), val);
>
> Please ley me know if it looks ok to you.
Ok. fair argument. Let's keep it as it is in this version.
BR,
Jouni Högander
>
> Regards,
> Animesh
> >
> > > str_enabled_disabled(enabled), val);
> > > psr_source_status(intel_dp, m);
> > > seq_printf(m, "Busy frontbuffer bits: 0x%08x\n", @@ -
> > > 3221,6
> > > +3236,15 @@ void intel_psr_debugfs_register(struct
> > > drm_i915_private
> > > *i915)
> > > i915, &i915_edp_psr_status_fops);
> > > }
> > >
> > > +static const char *psr_mode_str(struct intel_dp *intel_dp) {
> > > + if (intel_dp->psr.panel_replay_enabled)
> > > + return "PANEL-REPLAY";
> > > + else if(intel_dp->psr.enabled)
> > > + return "PSR";
> > > +
> > > + return "unknown";
> > > +}
> > > +
> > > static int i915_psr_sink_status_show(struct seq_file *m, void
> > > *data)
> > > {
> > > struct intel_connector *connector = m->private; @@ -
> > > 3235,12
> > > +3259,19 @@ static int i915_psr_sink_status_show(struct seq_file
> > > *m,
> > > void *data)
> > > "reserved",
> > > "sink internal error",
> > > };
> > > + static const char * const panel_replay_status[] = {
> > > + "Sink device frame is locked to the Source
> > > device",
> > > + "Sink device is coasting, using the VTotal
> > > target",
> > > + "Sink device is governing the frame rate (frame
> > > rate
> > > unlock is granted)",
> > > + "Sink device in the process of re-locking with
> > > the
> > > Source device",
> > > + };
> > > const char *str;
> > > int ret;
> > > u8 status, error_status;
> > > + u32 idx;
> > >
> > > - if (!CAN_PSR(intel_dp)) {
> > > - seq_puts(m, "PSR Unsupported\n");
> > > + if (!(CAN_PSR(intel_dp) || CAN_PANEL_REPLAY(intel_dp))) {
> > > + seq_puts(m, "PSR/Panel-Replay Unsupported\n");
> > > return -ENODEV;
> > > }
> > >
> > > @@ -3251,28 +3282,33 @@ static int
> > > i915_psr_sink_status_show(struct
> > > seq_file *m, void *data)
> > > if (ret)
> > > return ret;
> > >
> > > - status &= DP_PSR_SINK_STATE_MASK;
> > > - if (status < ARRAY_SIZE(sink_status))
> > > - str = sink_status[status];
> > > - else
> > > - str = "unknown";
> > > + str = "unknown";
> > > + if (intel_dp->psr.panel_replay_enabled) {
> > > + idx = (status & DP_SINK_FRAME_LOCKED_MASK) >>
> > > DP_SINK_FRAME_LOCKED_SHIFT;
> > > + if (idx < ARRAY_SIZE(panel_replay_status))
> > > + str = panel_replay_status[idx];
> > > + } else if (intel_dp->psr.enabled) {
> > > + idx = status & DP_PSR_SINK_STATE_MASK;
> > > + if (idx < ARRAY_SIZE(sink_status))
> > > + str = sink_status[idx];
> > > + }
> > >
> > > - seq_printf(m, "Sink PSR status: 0x%x [%s]\n", status,
> > > str);
> > > + seq_printf(m, "Sink %s status: 0x%x [%s]\n",
> > > psr_mode_str(intel_dp), status, str);
> > >
> > > - seq_printf(m, "Sink PSR error status: 0x%x",
> > > error_status);
> > > + seq_printf(m, "Sink %s error status: 0x%x",
> > > psr_mode_str(intel_dp), error_status);
> > >
> > > if (error_status & (DP_PSR_RFB_STORAGE_ERROR |
> > > DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR |
> > > DP_PSR_LINK_CRC_ERROR))
> > > - seq_puts(m, ":\n");
> > > - else
> > > - seq_puts(m, "\n");
> > > + seq_puts(m, ":\n");
> > > + else
> > > + seq_puts(m, "\n");
> > > if (error_status & DP_PSR_RFB_STORAGE_ERROR)
> > > - seq_puts(m, "\tPSR RFB storage error\n");
> > > + seq_printf(m, "\t%s RFB storage error\n",
> > > psr_mode_str(intel_dp));
> > > if (error_status & DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR)
> > > - seq_puts(m, "\tPSR VSC SDP uncorrectable
> > > error\n");
> > > + seq_printf(m, "\t%s VSC SDP uncorrectable
> > > error\n",
> > > psr_mode_str(intel_dp));
> > > if (error_status & DP_PSR_LINK_CRC_ERROR)
> > > - seq_puts(m, "\tPSR Link CRC error\n");
> > > + seq_printf(m, "\t%s Link CRC error\n",
> > > psr_mode_str(intel_dp));
> > >
> > > return ret;
> > > }
> > > @@ -3292,13 +3328,16 @@ void
> > > intel_psr_connector_debugfs_add(struct
> > > intel_connector *connector)
> > > struct drm_i915_private *i915 = to_i915(connector-
> > > >base.dev);
> > > struct dentry *root = connector->base.debugfs_entry;
> > >
> > > - if (connector->base.connector_type !=
> > DRM_MODE_CONNECTOR_eDP)
> > > - return;
> > > + if (connector->base.connector_type !=
> > DRM_MODE_CONNECTOR_eDP)
> > > {
> > > + if (!(HAS_DP20(i915) &&
> > > + connector->base.connector_type ==
> > > DRM_MODE_CONNECTOR_DisplayPort))
> > > + return;
> > > + }
> > >
> > > debugfs_create_file("i915_psr_sink_status", 0444, root,
> > > connector,
> > > &i915_psr_sink_status_fops);
> > >
> > > - if (HAS_PSR(i915))
> > > + if (HAS_PSR(i915) || HAS_DP20(i915))
> > > debugfs_create_file("i915_psr_status", 0444,
> > > root,
> > > connector,
> > > &i915_psr_status_fops);
> > > }
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Panel replay phase1 implementation (rev10)
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (5 preceding siblings ...)
2023-11-03 21:00 ` [Intel-gfx] [PATCH v8 6/6] drm/i915/panelreplay: Debugfs support for " Animesh Manna
@ 2023-11-03 22:58 ` Patchwork
2023-11-03 22:58 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-11-03 23:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-11-03 22:58 UTC (permalink / raw)
To: Manna, Animesh; +Cc: intel-gfx
== Series Details ==
Series: Panel replay phase1 implementation (rev10)
URL : https://patchwork.freedesktop.org/series/94470/
State : warning
== Summary ==
Error: dim checkpatch failed
f025bc5ed357 drm/panelreplay: dpcd register definition for panelreplay
a6ba947cd35c drm/i915/psr: Move psr specific dpcd init into own function
d0b4de45d90a drm/i915/panelreplay: Initializaton and compute config for panel replay
-:366: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'intel_dp' - possible side-effects?
#366: FILE: drivers/gpu/drm/i915/display/intel_psr.h:24:
+#define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \
+ (intel_dp)->psr.source_support)
-:369: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'intel_dp' - possible side-effects?
#369: FILE: drivers/gpu/drm/i915/display/intel_psr.h:27:
+#define CAN_PANEL_REPLAY(intel_dp) ((intel_dp)->psr.sink_panel_replay_support && \
+ (intel_dp)->psr.source_panel_replay_support)
total: 0 errors, 0 warnings, 2 checks, 289 lines checked
5225e39b90ad drm/i915/panelreplay: Enable panel replay dpcd initialization for DP
bf1255857ce0 drm/i915/panelreplay: enable/disable panel replay
96064a75ad28 drm/i915/panelreplay: Debugfs support for panel replay
-:111: ERROR:OPEN_BRACE: open brace '{' following function definitions go on the next line
#111: FILE: drivers/gpu/drm/i915/display/intel_psr.c:3239:
+static const char *psr_mode_str(struct intel_dp *intel_dp) {
-:114: ERROR:SPACING: space required before the open parenthesis '('
#114: FILE: drivers/gpu/drm/i915/display/intel_psr.c:3242:
+ else if(intel_dp->psr.enabled)
-:171: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 24)
#171: FILE: drivers/gpu/drm/i915/display/intel_psr.c:3300:
if (error_status & (DP_PSR_RFB_STORAGE_ERROR |
[...]
+ seq_puts(m, ":\n");
total: 2 errors, 1 warnings, 0 checks, 176 lines checked
^ permalink raw reply [flat|nested] 13+ messages in thread* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Panel replay phase1 implementation (rev10)
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (6 preceding siblings ...)
2023-11-03 22:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Panel replay phase1 implementation (rev10) Patchwork
@ 2023-11-03 22:58 ` Patchwork
2023-11-03 23:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-11-03 22:58 UTC (permalink / raw)
To: Manna, Animesh; +Cc: intel-gfx
== Series Details ==
Series: Panel replay phase1 implementation (rev10)
URL : https://patchwork.freedesktop.org/series/94470/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 13+ messages in thread* [Intel-gfx] ✗ Fi.CI.BAT: failure for Panel replay phase1 implementation (rev10)
2023-11-03 21:00 [Intel-gfx] [PATCH v8 0/6] Panel replay phase1 implementation Animesh Manna
` (7 preceding siblings ...)
2023-11-03 22:58 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2023-11-03 23:17 ` Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-11-03 23:17 UTC (permalink / raw)
To: Manna, Animesh; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 12415 bytes --]
== Series Details ==
Series: Panel replay phase1 implementation (rev10)
URL : https://patchwork.freedesktop.org/series/94470/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13835 -> Patchwork_94470v10
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_94470v10 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_94470v10, please notify your bug team (lgci.bug.filing@intel.com) to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/index.html
Participating hosts (36 -> 36)
------------------------------
Additional (2): bat-dg2-9 fi-pnv-d510
Missing (2): fi-hsw-4770 fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_94470v10:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_store@basic:
- fi-rkl-11600: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/fi-rkl-11600/igt@gem_exec_store@basic.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/fi-rkl-11600/igt@gem_exec_store@basic.html
* igt@i915_selftest@live@gt_mocs:
- bat-rpls-1: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-rpls-1/igt@i915_selftest@live@gt_mocs.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-rpls-1/igt@i915_selftest@live@gt_mocs.html
Known issues
------------
Here are the changes found in Patchwork_94470v10 that come from known issues:
### CI changes ###
#### Issues hit ####
* boot:
- bat-jsl-1: [PASS][5] -> [FAIL][6] ([i915#8293])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-jsl-1/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-jsl-1/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap@basic:
- bat-dg2-9: NOTRUN -> [SKIP][7] ([i915#4083])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@gem_mmap@basic.html
* igt@gem_mmap_gtt@basic:
- bat-dg2-9: NOTRUN -> [SKIP][8] ([i915#4077]) +2 other tests skip
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@gem_mmap_gtt@basic.html
* igt@gem_render_tiled_blits@basic:
- bat-dg2-9: NOTRUN -> [SKIP][9] ([i915#4079]) +1 other test skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@gem_render_tiled_blits@basic.html
* igt@i915_pm_rps@basic-api:
- bat-dg2-9: NOTRUN -> [SKIP][10] ([i915#6621])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@migrate:
- bat-mtlp-6: [PASS][11] -> [DMESG-FAIL][12] ([i915#7699])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-mtlp-6/igt@i915_selftest@live@migrate.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-mtlp-6/igt@i915_selftest@live@migrate.html
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][13] ([i915#5190])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][14] ([i915#4215] / [i915#5190])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_addfb_basic@framebuffer-vs-set-tiling:
- bat-dg2-9: NOTRUN -> [SKIP][15] ([i915#4212]) +6 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_addfb_basic@framebuffer-vs-set-tiling.html
* igt@kms_addfb_basic@tile-pitch-mismatch:
- bat-dg2-9: NOTRUN -> [SKIP][16] ([i915#4212] / [i915#5608])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_addfb_basic@tile-pitch-mismatch.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][17] ([i915#4103] / [i915#4213] / [i915#5608]) +1 other test skip
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg2-9: NOTRUN -> [SKIP][18] ([fdo#109285])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-dg2-9: NOTRUN -> [SKIP][19] ([i915#5274])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_force_connector_basic@prune-stale-modes.html
* igt@kms_psr@cursor_plane_move:
- fi-skl-6600u: [PASS][20] -> [SKIP][21] ([fdo#109271]) +3 other tests skip
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/fi-skl-6600u/igt@kms_psr@cursor_plane_move.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/fi-skl-6600u/igt@kms_psr@cursor_plane_move.html
* igt@kms_psr@primary_page_flip:
- fi-pnv-d510: NOTRUN -> [SKIP][22] ([fdo#109271]) +29 other tests skip
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/fi-pnv-d510/igt@kms_psr@primary_page_flip.html
* igt@kms_psr@sprite_plane_onoff:
- bat-mtlp-8: [PASS][23] -> [SKIP][24] ([i915#1072]) +2 other tests skip
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-mtlp-8/igt@kms_psr@sprite_plane_onoff.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-mtlp-8/igt@kms_psr@sprite_plane_onoff.html
- bat-jsl-3: [PASS][25] -> [SKIP][26] ([i915#1072]) +3 other tests skip
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-jsl-3/igt@kms_psr@sprite_plane_onoff.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-jsl-3/igt@kms_psr@sprite_plane_onoff.html
- bat-dg2-9: NOTRUN -> [SKIP][27] ([i915#1072]) +3 other tests skip
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg2-9: NOTRUN -> [SKIP][28] ([i915#3555] / [i915#4098])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-dg2-9: NOTRUN -> [SKIP][29] ([i915#3708])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-fence-mmap:
- bat-dg2-9: NOTRUN -> [SKIP][30] ([i915#3708] / [i915#4077]) +1 other test skip
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@prime_vgem@basic-fence-mmap.html
* igt@prime_vgem@basic-write:
- bat-dg2-9: NOTRUN -> [SKIP][31] ([i915#3291] / [i915#3708]) +2 other tests skip
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-dg2-9/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][32] ([i915#5334]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-b-dp-5:
- bat-adlp-11: [DMESG-FAIL][34] ([i915#6868]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-b-dp-5.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-b-dp-5.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-c-dp-5:
- bat-adlp-11: [FAIL][36] ([i915#9047]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-c-dp-5.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-c-dp-5.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-dp-5:
- bat-adlp-11: [ABORT][38] ([i915#8668]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-dp-5.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-adlp-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-dp-5.html
#### Warnings ####
* igt@kms_psr@primary_mmap_gtt:
- bat-mtlp-8: [SKIP][40] ([i915#4077]) -> [SKIP][41] ([i915#1072])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13835/bat-mtlp-8/igt@kms_psr@primary_mmap_gtt.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/bat-mtlp-8/igt@kms_psr@primary_mmap_gtt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#9047]: https://gitlab.freedesktop.org/drm/intel/issues/9047
Build changes
-------------
* Linux: CI_DRM_13835 -> Patchwork_94470v10
CI-20190529: 20190529
CI_DRM_13835: ca1fcd4faf444fc6d8b3cf88a17e2eb7765c1299 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7573: 69485d223b256208614e9949a4a7e84bde52d5f5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_94470v10: ca1fcd4faf444fc6d8b3cf88a17e2eb7765c1299 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
ccdfe9ce63ca drm/i915/panelreplay: Debugfs support for panel replay
2bf7c7fc238c drm/i915/panelreplay: enable/disable panel replay
624791f93441 drm/i915/panelreplay: Enable panel replay dpcd initialization for DP
b660ebdb90ab drm/i915/panelreplay: Initializaton and compute config for panel replay
9f90aa81c9ee drm/i915/psr: Move psr specific dpcd init into own function
112b7a4e177b drm/panelreplay: dpcd register definition for panelreplay
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_94470v10/index.html
[-- Attachment #2: Type: text/html, Size: 14382 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread