[PATCH 04/28] drm/i915/vrr: Simplify CMRR Enable Check in intel_vrr_get_config

[Ankit Nautiyal]

Combine the CMRR capability and enable check into a single condition.
Set crtc_state->cmrr.enable directly within the combined condition.
This will make way to absorb cmrr members in vrr struct.

Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_vrr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c 
b/drivers/gpu/drm/i915/display/intel_vrr.c
index f8ae3dc6a304..6f314e209e96 100644
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -503,10 +503,9 @@ void intel_vrr_get_config(struct intel_crtc_state 
*crtc_state)
                                      TRANS_VRR_CTL(display, cpu_transcoder));
 
        crtc_state->vrr.enable = trans_vrr_ctl & VRR_CTL_VRR_ENABLE;
-       if (HAS_CMRR(display))
-               crtc_state->cmrr.enable = (trans_vrr_ctl & VRR_CTL_CMRR_ENABLE);
 
-       if (crtc_state->cmrr.enable) {
+       if (HAS_CMRR(display) && trans_vrr_ctl & VRR_CTL_CMRR_ENABLE) {
+               crtc_state->cmrr.enable = true;
                crtc_state->cmrr.cmrr_n =
                        intel_de_read64_2x32(display, TRANS_CMRR_N_LO(display, 
cpu_transcoder),
                                             TRANS_CMRR_N_HI(display, 
cpu_transcoder));
-- 
2.45.2