During the DRRS state transitions we are modifying the clock and
hence the vrefresh rate.
So we need to update the drm_crtc->mode and the adjusted
mode in intel_crtc. So that watermark calculations will be as per the
new modified clock.
Signed-off-by: Ramalingam C <ramalinga...@intel.com>
---
drivers/gpu/drm/i915/intel_drrs.c | 14 ++++++++++++++
drivers/gpu/drm/i915/intel_dsi_drrs.c | 14 +++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_drrs.c
b/drivers/gpu/drm/i915/intel_drrs.c
index 42b420d..2901832 100644
--- a/drivers/gpu/drm/i915/intel_drrs.c
+++ b/drivers/gpu/drm/i915/intel_drrs.c
@@ -169,6 +169,20 @@ void intel_set_drrs_state(struct i915_drrs *drrs)
* If it is non-DSI encoders.
* As only DSI has SEAMLESS_DRRS_SUPPORT_SW.
*/
+ /*
+ * TODO: Protect the access to the crtc mode with corresponding
+ * mutex in case of Idleness DRRS. As media playback update
+ * will happen under crtc modeset lock protection
+ */
+ drm_modeset_lock(&intel_crtc->base.mutex, NULL);
+ intel_crtc->base.mode.clock = target_mode->clock;
+ intel_crtc->base.mode.vrefresh = target_mode->vrefresh;
+ intel_crtc->config->base.adjusted_mode.clock =
+ target_mode->clock;
+ intel_crtc->config->base.adjusted_mode.vrefresh =
+ target_mode->vrefresh;
+ drm_modeset_unlock(&intel_crtc->base.mutex);
+
drrs_state->current_rr_type = drrs_state->target_rr_type;
DRM_INFO("Refresh Rate set to : %dHz\n", refresh_rate);
}
diff --git a/drivers/gpu/drm/i915/intel_dsi_drrs.c
b/drivers/gpu/drm/i915/intel_dsi_drrs.c
index eb0758a..d4bb70a 100644
--- a/drivers/gpu/drm/i915/intel_dsi_drrs.c
+++ b/drivers/gpu/drm/i915/intel_dsi_drrs.c
@@ -46,6 +46,7 @@ static void intel_mipi_drrs_work_fn(struct work_struct
*__work)
struct i915_drrs *drrs = work->drrs;
struct intel_encoder *intel_encoder = drrs->connector->encoder;
struct intel_dsi *intel_dsi = enc_to_intel_dsi(&intel_encoder->base);
+ struct intel_crtc *intel_crtc = to_intel_crtc(intel_encoder->base.crtc);
struct dsi_drrs *dsi_drrs = &intel_dsi->dsi_drrs;
struct dsi_mnp *dsi_mnp;
struct drm_display_mode *prev_mode = NULL;
@@ -69,11 +70,22 @@ retry:
/* PLL Programming is successful */
mutex_lock(&drrs->drrs_mutex);
drrs->drrs_state.current_rr_type = work->target_rr_type;
+
+ drm_modeset_lock(&intel_crtc->base.mutex, NULL);
+ intel_crtc->base.mode.clock = work->target_mode->clock;
+ intel_crtc->base.mode.vrefresh = work->target_mode->vrefresh;
+ intel_crtc->config->base.adjusted_mode.clock =
+ work->target_mode->clock;
+ intel_crtc->config->base.adjusted_mode.vrefresh =
+ work->target_mode->vrefresh;
+ drm_modeset_unlock(&intel_crtc->base.mutex);
+
mutex_unlock(&drrs->drrs_mutex);
+
DRM_INFO("Refresh Rate set to : %dHz\n",
work->target_mode->vrefresh);
- /* TODO: Update crtc mode and drain ladency with watermark */
+ /* TODO: Update drain ladency with watermark */
} else if (ret == -ETIMEDOUT && retry_cnt) {
--
1.7.9.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
