This patch computes the VRR parameters from VRR crtc states
and configures them in VRR registers during CRTC enable in
the modeset enable sequence.
v2:
* Remove initialization to 0 (Jani N)
* Use correct pipe %c (Jani N)
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.nav...@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++
drivers/gpu/drm/i915/display/intel_vrr.c | 33 ++++++++++++++++++++++++
drivers/gpu/drm/i915/display/intel_vrr.h | 3 +++
3 files changed, 39 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
b/drivers/gpu/drm/i915/display/intel_ddi.c
index 5193473c838c..48467c6abb37 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -50,6 +50,7 @@
#include "intel_sprite.h"
#include "intel_tc.h"
#include "intel_vdsc.h"
+#include "intel_vrr.h"
struct ddi_buf_trans {
u32 trans1; /* balance leg enable, de-emph level */
@@ -4245,6 +4246,8 @@ static void intel_enable_ddi(struct intel_atomic_state
*state,
if (!crtc_state->bigjoiner_slave)
intel_ddi_enable_transcoder_func(encoder, crtc_state);
+ intel_vrr_enable(encoder, crtc_state);
+
intel_enable_pipe(crtc_state);
intel_crtc_vblank_on(crtc_state);
diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c
b/drivers/gpu/drm/i915/display/intel_vrr.c
index 09dcf6f1c4d9..9dec01695773 100644
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -81,3 +81,36 @@ intel_vrr_compute_config(struct intel_dp *intel_dp,
crtc_state->vrr.vtotalmax);
}
+void intel_vrr_enable(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state)
+{
+ struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+ struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+ enum pipe pipe = crtc->pipe;
+ const struct drm_display_mode *adjusted_mode =
+ &crtc_state->hw.adjusted_mode;
+ u32 trans_vrr_ctl;
+ u16 framestart_to_pipelinefull_linecnt;
+
+ if (!crtc_state->vrr.enable)
+ return;
+
+ framestart_to_pipelinefull_linecnt =
+ min_t(u16, 255, (crtc_state->vrr.vtotalmin -
adjusted_mode->crtc_vdisplay - 4));
+
+ trans_vrr_ctl = VRR_CTL_VRR_ENABLE | VRR_CTL_IGN_MAX_SHIFT |
+ VRR_CTL_FLIP_LINE_EN |
VRR_CTL_LINE_COUNT(framestart_to_pipelinefull_linecnt) |
+ VRR_CTL_SW_FULLLINE_COUNT;
+
+ intel_de_write(dev_priv, TRANS_VRR_VMIN(pipe),
crtc_state->vrr.vtotalmin - 2);
+ intel_de_write(dev_priv, TRANS_VRR_VMAX(pipe),
crtc_state->vrr.vtotalmax - 1);
+ intel_de_write(dev_priv, TRANS_VRR_CTL(pipe), trans_vrr_ctl);
+ intel_de_write(dev_priv, TRANS_VRR_FLIPLINE(pipe),
crtc_state->vrr.vtotalmin - 1);
+ intel_de_write(dev_priv, TRANS_PUSH(pipe), TRANS_PUSH_EN);
+
+ drm_dbg_kms(&dev_priv->drm, "Enabling VRR on pipe %c\n",
pipe_name(pipe));
+ drm_dbg_kms(&dev_priv->drm, "VRR Parameters: Vtotal Min = %d, Max = %d
Flipline Count = %d, CTL Reg = 0x%08x, TRANS PUSH reg = 0x%08x",
+ crtc_state->vrr.vtotalmin - 1, crtc_state->vrr.vtotalmax,
+ crtc_state->vrr.vtotalmin, trans_vrr_ctl,
+ TRANS_PUSH_EN);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h
b/drivers/gpu/drm/i915/display/intel_vrr.h
index 3f08c32d1afe..97bbbfb4c33b 100644
--- a/drivers/gpu/drm/i915/display/intel_vrr.h
+++ b/drivers/gpu/drm/i915/display/intel_vrr.h
@@ -13,10 +13,13 @@ struct intel_atomic_state;
struct intel_crtc;
struct intel_crtc_state;
struct intel_dp;
+struct intel_encoder;
bool intel_vrr_is_capable(struct drm_connector *connector);
void intel_vrr_check_modeset(struct intel_atomic_state *state);
void intel_vrr_compute_config(struct intel_dp *intel_dp,
struct intel_crtc_state *crtc_state);
+void intel_vrr_enable(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state);
#endif /* __INTEL_VRR_H__ */
--
2.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
