From patchwork Wed Apr 16 06:27:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Golani, Mitulkumar Ajitkumar" X-Patchwork-Id: 14053230 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 87AF0C369C5 for ; Wed, 16 Apr 2025 06:29:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 16C8510E839; Wed, 16 Apr 2025 06:29:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Fagoa0OP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 099E910E835 for ; Wed, 16 Apr 2025 06:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744784990; x=1776320990; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=eLJ4hMzDV6NEEtXFgmkxMHB14LcepMTlVMckV085N5k=; b=Fagoa0OPq8Mx2uurt/ZwsZ4ueHyCPSVHAxYi2pXXE91xYN1r9GrgjTNb NmM18kHwdhUvMnRuDqg9NfHYFbgGDDU+b4H/dsSjiTBrM/PFsDhgr244W z6KRoX/Yo0UJIrg+ZzlJosOeoh9aA1cnTrmbpF6DqRj/cDSHXHwOGue2V i6S5l5o5Ng6FZguckRvGuG9GSHW+jPObOCpWMh6XOnQms0rmHNfFsiZLi 14F35R7++Nm2Mal2yBXM+Ft/uicjERQljhqT6tekhAXuni90GG7F07qrg pfjRBH9AW/QKcDVrx09wkoY39PO9MmdCi9RZzyrudVu8M8sgD2z4pa5yd Q==; X-CSE-ConnectionGUID: eYyC8EkYR7OEyS5qZEbg2A== X-CSE-MsgGUID: q5nIKCCzRV+/hmWS3BnM0g== X-IronPort-AV: E=McAfee;i="6700,10204,11404"; a="71710243" X-IronPort-AV: E=Sophos;i="6.15,215,1739865600"; d="scan'208";a="71710243" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2025 23:29:50 -0700 X-CSE-ConnectionGUID: UQxjqYEoSTqXOrSriJ8e1w== X-CSE-MsgGUID: vCs03yDZQD6bmCW7WK+Xug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,215,1739865600"; d="scan'208";a="130880178" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa007.jf.intel.com with ESMTP; 15 Apr 2025 23:29:49 -0700 From: Mitul Golani To: intel-gfx@lists.freedesktop.org Subject: [PATCH v1 3/8] drm/i915/vrr: Refactor vmin/vmax stuff Date: Wed, 16 Apr 2025 11:57:32 +0530 Message-ID: <20250416062737.1766703-4-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250416062737.1766703-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250416062737.1766703-1-mitulkumar.ajitkumar.golani@intel.com> MIME-Version: 1.0 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" Refactor vmin/vmax functions for better computation. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_vrr.c | 42 +++++++++++------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c index c6565baf815a..afa1728837d2 100644 --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -146,37 +146,42 @@ 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 +262,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