From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA802C3ABBC for ; Tue, 6 May 2025 14:57:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 504AF10E6C0; Tue, 6 May 2025 14:57:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="NrONTnNt"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9F0F10E6C5; Tue, 6 May 2025 14:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1746543437; x=1778079437; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DsI3R4pnckNSZMGWSMMb76/Jq3kahLt7YtZyEaGyUPg=; b=NrONTnNt8WlUFV42M/GBY6G/zT7LzXNMkg4HyBsBmT16Xeld+WKRB/eB VSGdNonvX1x9s1C3rlz/qqXN0psDVZkBjGz54jxrs+ECiS8S5rbLfx3Rt rXktKpjb7CzhWabKb+ZMIQu8PWt3VG3lf2myrhuzc+vXyFp+GTz1wQpZ5 uuZromf2N52lmXlHBeFU+Vt8Xwx/oo1BsJV9pgsjFpjprvB5NT2nS4uqo e6bZoxRrN7/6WMvxKqsGfSDtcntVNrxBt4DJ1vFlxuizFK8xUIWfNbCja Mv0h5LkgICRvjOPcTLfvDOSfptrnBLNc8PeRAf17tkzup528SuPVgAUUc g==; X-CSE-ConnectionGUID: J2AiQsb0S6e2Bpc6CysKdg== X-CSE-MsgGUID: T5xWcs4nQBCFn4ATZ1AjMQ== X-IronPort-AV: E=McAfee;i="6700,10204,11425"; a="59205970" X-IronPort-AV: E=Sophos;i="6.15,266,1739865600"; d="scan'208";a="59205970" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2025 07:57:17 -0700 X-CSE-ConnectionGUID: Feh/YgvpTAO/Zv1tZuIFRw== X-CSE-MsgGUID: rkW+AUyoR7mH2SYoGAmS0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,266,1739865600"; d="scan'208";a="166572131" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa002.jf.intel.com with ESMTP; 06 May 2025 07:57:15 -0700 From: Mitul Golani To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, ville.syrjala@intel.com Subject: [PATCH v4 02/17] drm/i915/vrr: Refactor vmin/vmax stuff Date: Tue, 6 May 2025 20:25:02 +0530 Message-ID: <20250506145517.4129419-3-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250506145517.4129419-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250506145517.4129419-1-mitulkumar.ajitkumar.golani@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä Refactor vmin/vmax functions for better computation. Signed-off-by: Ville Syrjälä Signed-off-by: Mitul Golani --- drivers/gpu/drm/i915/display/intel_vrr.c | 41 +++++++++++------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c index 45445198129f..adfd231eb578 100644 --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -146,37 +146,41 @@ static int intel_vrr_vblank_exit_length(const struct intel_crtc_state *crtc_stat return crtc_state->vrr.pipeline_full + crtc_state->framestart_delay + 1; } -int intel_vrr_vmin_vtotal(const struct intel_crtc_state *crtc_state) +static int intel_vrr_vtotal(const struct intel_crtc_state *crtc_state, int vmin_vmax) { struct intel_display *display = to_intel_display(crtc_state); - /* Min vblank actually determined by flipline */ if (DISPLAY_VER(display) >= 13) - return intel_vrr_vmin_flipline(crtc_state); + return vmin_vmax; else - return intel_vrr_vmin_flipline(crtc_state) + - intel_vrr_real_vblank_delay(crtc_state); + return vmin_vmax + intel_vrr_real_vblank_delay(crtc_state); } -int intel_vrr_vmax_vtotal(const struct intel_crtc_state *crtc_state) +static int intel_vrr_vblank_start(const struct intel_crtc_state *crtc_state, + int vmin_vmax) { - struct intel_display *display = to_intel_display(crtc_state); + return intel_vrr_vtotal(crtc_state, vmin_vmax) - + intel_vrr_vblank_exit_length(crtc_state); +} - if (DISPLAY_VER(display) >= 13) - return crtc_state->vrr.vmax; - else - return crtc_state->vrr.vmax + - intel_vrr_real_vblank_delay(crtc_state); +int intel_vrr_vmin_vtotal(const struct intel_crtc_state *crtc_state) +{ + return intel_vrr_vtotal(crtc_state, intel_vrr_vmin_flipline(crtc_state)); +} + +int intel_vrr_vmax_vtotal(const struct intel_crtc_state *crtc_state) +{ + return intel_vrr_vtotal(crtc_state, crtc_state->vrr.vmax); } int intel_vrr_vmin_vblank_start(const struct intel_crtc_state *crtc_state) { - return intel_vrr_vmin_vtotal(crtc_state) - intel_vrr_vblank_exit_length(crtc_state); + return intel_vrr_vblank_start(crtc_state, intel_vrr_vmin_flipline(crtc_state)); } int intel_vrr_vmax_vblank_start(const struct intel_crtc_state *crtc_state) { - return intel_vrr_vmax_vtotal(crtc_state) - intel_vrr_vblank_exit_length(crtc_state); + return intel_vrr_vblank_start(crtc_state, crtc_state->vrr.vmax); } static bool @@ -257,14 +261,7 @@ void intel_vrr_compute_vrr_timings(struct intel_crtc_state *crtc_state) static int intel_vrr_fixed_rr_vtotal(const struct intel_crtc_state *crtc_state) { - struct intel_display *display = to_intel_display(crtc_state); - int crtc_vtotal = crtc_state->hw.adjusted_mode.crtc_vtotal; - - if (DISPLAY_VER(display) >= 13) - return crtc_vtotal; - else - return crtc_vtotal + - intel_vrr_real_vblank_delay(crtc_state); + return intel_vrr_vtotal(crtc_state, crtc_state->hw.adjusted_mode.crtc_vtotal); } static -- 2.48.1