drm/i915: Add psr_ready on pipe_config
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915: Add psr_ready on pipe_config
Let's know beforehand if PSR is ready and will be enabled so we can prevent DRRS to get enabled.
v2: Removing is_edp_psr func that is not used after this patch.
Rename match_conditions and document it since it is now external. Moving to a propper place as pointed out by Sivakumar. Use a better name as pointed out by Ram.
v3: Don't dereferrence drm_encoder->crtc and intel_crtc->config on psr_ready check.
Fix a opps caused with previous versions.
--- drivers/gpu/drm/i915/intel_display.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 2 ++ drivers/gpu/drm/i915/intel_drv.h | 3 ++ drivers/gpu/drm/i915/intel_psr.c | 57 ++++++++++++++++++++---------------- 4 files changed, 38 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -10895,6 +10895,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.pos, pipe_config->pch_pfit.size, pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); +DRM_DEBUG_KMS ("psr ready: %i\n" , pipe_config->psr_ready);DRM_DEBUG_KMS ("ips: %i\n" , pipe_config->ips_enabled);DRM_DEBUG_KMS ("double wide: %i\n" , pipe_config->double_wide);
drivers/gpu/drm/i915/intel_dp.c +2 -0
@@ -1394,6 +1394,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,*/ min_lane_count = max_lane_count; min_clock = max_clock; + + pipe_config->psr_ready =intel_psr_ready (intel_dp, pipe_config); }for (; bpp >=6 *3 ; bpp -=2 *3 ) {
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -448,6 +448,7 @@ struct intel_crtc_state {int fdi_lanes;struct intel_link_m_n fdi_m_n; +bool psr_ready;bool ips_enabled;bool double_wide;
@@ -1287,6 +1288,8 @@ void intel_backlight_unregister(struct drm_device *dev);/* intel_psr.c */ +bool intel_psr_ready (struct intel_dp *intel_dp, +struct intel_crtc_state *pipe_config);void intel_psr_enable (struct intel_dp *intel_dp);void intel_psr_disable (struct intel_dp *intel_dp); void intel_psr_invalidate(struct drm_device *dev,
drivers/gpu/drm/i915/intel_psr.c +32 -25
110 lines not on this page · raw message
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915: Only enabled DRRS if PRS won't be enabled on this pipe.
With PSR enabled being pre computed on pipe_config we can now prevent DRRS to be enabled along with PSR.
v2: Rebase after changing previous patch
--- drivers/gpu/drm/i915/intel_dp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +5 -5
@@ -5011,11 +5011,6 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)return ; } -/* -* FIXME: This needs proper synchronization with psr state for some -* platforms that cannot have PSR and DRRS enabled at the same time. -*/ - dig_port =dp_to_dig_port (intel_dp); encoder = &dig_port->base; intel_crtc =to_intel_crtc (encoder->base.crtc);
@@ -5101,6 +5096,11 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp)return ; } +if (intel_crtc->config->psr_ready) { +DRM_DEBUG_KMS ("DRRS: PSR will be enabled on this crtc\n" ); +return ; + } +mutex_lock (&dev_priv->drrs.mutex);if (WARN_ON (dev_priv->drrs.dp)) {DRM_ERROR ("DRRS already enabled\n" );
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Only enabled DRRS if PRS won't be enabled on this pipe.
Task id: 6206 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 318/318 318/318 IVB 341/341 341/341 BYT 287/287 287/287
HSW -2 395/395 393/395
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
HSW igt@gem_pwrite_pread@snooped-copy-performance DMESG_WARN(1)PASS(4) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
*HSW igt@gem_pwrite_pread@snooped-pwrite-blt-cpu_mmap-performance PASS(6) DMESG_WARN(2)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Add psr_ready on pipe_config
In reply to Rodrigo ViviLet's know beforehand if PSR is ready and will be enabled so we can prevent DRRS to get enabled.
WARN_ON(!drm_modeset_is_locked(&crtc->mutex)) on intel_psr_ready() has been removed on v3. We don't dereferrence crtc here anymore so we don't need this check. All configs are now checked from received pipe config.
v2: Removing is_edp_psr func that is not used after this patch.
Rename match_conditions and document it since it is now external. Moving to a propper place as pointed out by Sivakumar. Use a better name as pointed out by Ram.
v3: Don't dereferrence drm_encoder->crtc and intel_crtc->config on psr_ready
check. Fix a opps caused with previous versions.
v4: Mention and explain on commit message the crtc->mutex check removal that
happened on v3.
--- drivers/gpu/drm/i915/intel_display.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 2 ++ drivers/gpu/drm/i915/intel_drv.h | 3 ++ drivers/gpu/drm/i915/intel_psr.c | 57 ++++++++++++++++++++---------------- 4 files changed, 38 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -10895,6 +10895,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.pos, pipe_config->pch_pfit.size, pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); +DRM_DEBUG_KMS ("psr ready: %i\n" , pipe_config->psr_ready);DRM_DEBUG_KMS ("ips: %i\n" , pipe_config->ips_enabled);DRM_DEBUG_KMS ("double wide: %i\n" , pipe_config->double_wide);
drivers/gpu/drm/i915/intel_dp.c +2 -0
@@ -1394,6 +1394,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,*/ min_lane_count = max_lane_count; min_clock = max_clock; + + pipe_config->psr_ready =intel_psr_ready (intel_dp, pipe_config); }for (; bpp >=6 *3 ; bpp -=2 *3 ) {
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -448,6 +448,7 @@ struct intel_crtc_state {int fdi_lanes;struct intel_link_m_n fdi_m_n; +bool psr_ready;bool ips_enabled;bool double_wide;
@@ -1287,6 +1288,8 @@ void intel_backlight_unregister(struct drm_device *dev);/* intel_psr.c */ +bool intel_psr_ready (struct intel_dp *intel_dp, +struct intel_crtc_state *pipe_config);void intel_psr_enable (struct intel_dp *intel_dp);void intel_psr_disable (struct intel_dp *intel_dp); void intel_psr_invalidate(struct drm_device *dev,
drivers/gpu/drm/i915/intel_psr.c +32 -25
110 lines not on this page · raw message
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6208 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 318/318 318/318 IVB 341/341 341/341 BYT 287/287 287/287 HSW 395/395 395/395 BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx