From: "José Roberto de Souza" <jose.souza@intel.com> To: intel-gfx@lists.freedesktop.org Cc: s.zharkoff@gmail.com Subject: [PATCH] drm/i915/display: Force the state compute phase once to enable PSR Date: Mon, 25 Nov 2019 15:38:26 -0800 [thread overview] Message-ID: <20191125233826.161899-1-jose.souza@intel.com> (raw) Recent improvements in the state tracking in i915 caused PSR to not be enabled when reusing firmware/BIOS modeset, this is due to all initial commits returning ealier in intel_atomic_check() as needs_modeset() is always false. To fix that here forcing the state compute phase in CRTC that is driving the eDP that supports PSR once. Enable or disable PSR do not require a fullmodeset, so user will still experience glitch free boot process plus the power savings that PSR brings. It was tried to set mode_changed in intel_initial_commit() but at this point the connectors are not registered causing a crash when computing encoder state. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112253 Reported-by: <s.zharkoff@gmail.com> Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_atomic.c | 6 ++++ drivers/gpu/drm/i915/display/intel_psr.c | 32 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_psr.h | 5 ++++ drivers/gpu/drm/i915/i915_drv.h | 1 + 4 files changed, 44 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index fd0026fc3618..6b57488d9238 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -37,6 +37,7 @@ #include "intel_atomic.h" #include "intel_display_types.h" #include "intel_hdcp.h" +#include "intel_psr.h" #include "intel_sprite.h" /** @@ -127,6 +128,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, struct intel_digital_connector_state *old_conn_state = to_intel_digital_connector_state(old_state); struct drm_crtc_state *crtc_state; + int ret; intel_hdcp_atomic_check(conn, old_state, new_state); @@ -149,6 +151,10 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, old_conn_state->base.hdr_output_metadata)) crtc_state->mode_changed = true; + ret = intel_psr_atomic_check(conn, state); + if (ret) + return ret; + return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index c1d133362b76..a1acae8d72f7 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1444,3 +1444,35 @@ bool intel_psr_enabled(struct intel_dp *intel_dp) return ret; } + +int +intel_psr_atomic_check(struct drm_connector *conn, + struct drm_atomic_state *state) +{ + struct drm_i915_private *dev_priv = to_i915(conn->dev); + struct drm_connector_state *conn_state; + struct intel_digital_port *dig_port; + struct intel_connector *intel_conn; + struct drm_crtc_state *crtc_state; + + if (!CAN_PSR(dev_priv)) + return 0; + + conn_state = drm_atomic_get_new_connector_state(state, conn); + if (!conn_state->crtc) + return 0; + + intel_conn = to_intel_connector(conn); + dig_port = enc_to_dig_port(&intel_conn->encoder->base); + if (dev_priv->psr.dp != &dig_port->dp) + return 0; + + if (dev_priv->psr.initially_probed) + return 0; + + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + crtc_state->mode_changed = true; + dev_priv->psr.initially_probed = true; + + return 0; +} diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 46e4de8b8cd5..b3535e5752a6 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -6,6 +6,9 @@ #ifndef __INTEL_PSR_H__ #define __INTEL_PSR_H__ +#include <drm/drm_atomic.h> +#include <drm/drm_connector.h> + #include "intel_frontbuffer.h" struct drm_i915_private; @@ -35,5 +38,7 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp); int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, u32 *out_value); bool intel_psr_enabled(struct intel_dp *intel_dp); +int intel_psr_atomic_check(struct drm_connector *conn, + struct drm_atomic_state *state); #endif /* __INTEL_PSR_H__ */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fdae5a919bc8..d834924ba7c3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -508,6 +508,7 @@ struct i915_psr { bool dc3co_enabled; u32 dc3co_exit_delay; struct delayed_work idle_work; + bool initially_probed; }; #define QUIRK_LVDS_SSC_DISABLE (1<<1) -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: "José Roberto de Souza" <jose.souza@intel.com> To: intel-gfx@lists.freedesktop.org Cc: s.zharkoff@gmail.com Subject: [Intel-gfx] [PATCH] drm/i915/display: Force the state compute phase once to enable PSR Date: Mon, 25 Nov 2019 15:38:26 -0800 [thread overview] Message-ID: <20191125233826.161899-1-jose.souza@intel.com> (raw) Message-ID: <20191125233826.-Naf5lwN1s8e_w2Mz7SgwQv8cV9VHl2RnSW215m15AI@z> (raw) Recent improvements in the state tracking in i915 caused PSR to not be enabled when reusing firmware/BIOS modeset, this is due to all initial commits returning ealier in intel_atomic_check() as needs_modeset() is always false. To fix that here forcing the state compute phase in CRTC that is driving the eDP that supports PSR once. Enable or disable PSR do not require a fullmodeset, so user will still experience glitch free boot process plus the power savings that PSR brings. It was tried to set mode_changed in intel_initial_commit() but at this point the connectors are not registered causing a crash when computing encoder state. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112253 Reported-by: <s.zharkoff@gmail.com> Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_atomic.c | 6 ++++ drivers/gpu/drm/i915/display/intel_psr.c | 32 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_psr.h | 5 ++++ drivers/gpu/drm/i915/i915_drv.h | 1 + 4 files changed, 44 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index fd0026fc3618..6b57488d9238 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -37,6 +37,7 @@ #include "intel_atomic.h" #include "intel_display_types.h" #include "intel_hdcp.h" +#include "intel_psr.h" #include "intel_sprite.h" /** @@ -127,6 +128,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, struct intel_digital_connector_state *old_conn_state = to_intel_digital_connector_state(old_state); struct drm_crtc_state *crtc_state; + int ret; intel_hdcp_atomic_check(conn, old_state, new_state); @@ -149,6 +151,10 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, old_conn_state->base.hdr_output_metadata)) crtc_state->mode_changed = true; + ret = intel_psr_atomic_check(conn, state); + if (ret) + return ret; + return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index c1d133362b76..a1acae8d72f7 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1444,3 +1444,35 @@ bool intel_psr_enabled(struct intel_dp *intel_dp) return ret; } + +int +intel_psr_atomic_check(struct drm_connector *conn, + struct drm_atomic_state *state) +{ + struct drm_i915_private *dev_priv = to_i915(conn->dev); + struct drm_connector_state *conn_state; + struct intel_digital_port *dig_port; + struct intel_connector *intel_conn; + struct drm_crtc_state *crtc_state; + + if (!CAN_PSR(dev_priv)) + return 0; + + conn_state = drm_atomic_get_new_connector_state(state, conn); + if (!conn_state->crtc) + return 0; + + intel_conn = to_intel_connector(conn); + dig_port = enc_to_dig_port(&intel_conn->encoder->base); + if (dev_priv->psr.dp != &dig_port->dp) + return 0; + + if (dev_priv->psr.initially_probed) + return 0; + + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + crtc_state->mode_changed = true; + dev_priv->psr.initially_probed = true; + + return 0; +} diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 46e4de8b8cd5..b3535e5752a6 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -6,6 +6,9 @@ #ifndef __INTEL_PSR_H__ #define __INTEL_PSR_H__ +#include <drm/drm_atomic.h> +#include <drm/drm_connector.h> + #include "intel_frontbuffer.h" struct drm_i915_private; @@ -35,5 +38,7 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp); int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, u32 *out_value); bool intel_psr_enabled(struct intel_dp *intel_dp); +int intel_psr_atomic_check(struct drm_connector *conn, + struct drm_atomic_state *state); #endif /* __INTEL_PSR_H__ */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fdae5a919bc8..d834924ba7c3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -508,6 +508,7 @@ struct i915_psr { bool dc3co_enabled; u32 dc3co_exit_delay; struct delayed_work idle_work; + bool initially_probed; }; #define QUIRK_LVDS_SSC_DISABLE (1<<1) -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-11-25 23:38 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-25 23:38 José Roberto de Souza [this message] 2019-11-25 23:38 ` [Intel-gfx] [PATCH] drm/i915/display: Force the state compute phase once to enable PSR José Roberto de Souza 2019-11-26 0:19 ` ✓ Fi.CI.BAT: success for " Patchwork 2019-11-26 0:19 ` [Intel-gfx] " Patchwork 2019-11-26 9:06 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-11-26 9:06 ` [Intel-gfx] " Patchwork 2019-11-26 21:32 ` ✓ Fi.CI.BAT: success for drm/i915/display: Force the state compute phase once to enable PSR (rev2) Patchwork 2019-11-26 21:32 ` [Intel-gfx] " Patchwork 2019-11-27 8:34 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-11-27 8:34 ` [Intel-gfx] " Patchwork 2019-12-05 9:17 ` [Intel-gfx] [PATCH] drm/i915/display: Force the state compute phase once to enable PSR Mun, Gwan-gyeong 2019-12-06 2:35 ` Souza, Jose
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191125233826.161899-1-jose.souza@intel.com \ --to=jose.souza@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=s.zharkoff@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.