From patchwork Wed Jan 29 14:46:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13953830 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 43C18C02190 for ; Wed, 29 Jan 2025 14:47:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFD3910E811; Wed, 29 Jan 2025 14:47:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Y3/Dc5F2"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E7E310E80D; Wed, 29 Jan 2025 14:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738162033; x=1769698033; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tudEvmVQjjNxF+akQaMOL98RsQRRgUM+odbMFaBftmQ=; b=Y3/Dc5F2wvEOKoRTR92cpKNbLG7GlLH4WlQq4BndYklLBKIlqfRSRyTO +9A5pCbfYVyVD6jF32IRb1nDle+qwYTYuO9E8B2a7Z6rVzhqNABzofKFF Abs9LDwnEcHU3VxOlYWAyV8TcPNA8fUxmfwiIvCA9DNhNR69oYG+mTTe/ sW+U9uP+5EYMBzXB+4RbSMU2uqNjKXCEkyJqxg0Vx2ImkPEHZcMpgY6PL 91EoAK9DCJ47kPLYaWuPIsQnoA494Sf3Kd8gd89K4timuwYAqTiGCbbUE l3aDI7U51clTvXP2QJ/pNnlmuSr1vN8utUas0yf4bbcT/60KRAMdodn5E Q==; X-CSE-ConnectionGUID: s/RUqtOeSwGf4NGbAjWrXQ== X-CSE-MsgGUID: KQ9asNeIQ+SE1pQA+tijhQ== X-IronPort-AV: E=McAfee;i="6700,10204,11330"; a="64040672" X-IronPort-AV: E=Sophos;i="6.13,243,1732608000"; d="scan'208";a="64040672" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2025 06:47:11 -0800 X-CSE-ConnectionGUID: NoQCAeRgRT+2eOhRaOZKUA== X-CSE-MsgGUID: iEO1U+sSRKKIhbVI/ZM46g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="113057065" Received: from kniemiec-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.235]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2025 06:47:09 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, imre.deak@intel.com Subject: [PATCH 5/6] drm/i915/mst: remove unnecessary mst_stream_find_vcpi_slots_for_bpp() Date: Wed, 29 Jan 2025 16:46:37 +0200 Message-Id: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" mst_stream_find_vcpi_slots_for_bpp() has become a thin wrapper that merely juggles parameters around. Remove it. Signed-off-by: Jani Nikula Reviewed-by: Imre Deak --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 23 ++++++--------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 8786c8751c82..a4ed4f379d1e 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -366,16 +366,6 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, return 0; } -static int mst_stream_find_vcpi_slots_for_bpp(struct intel_dp *intel_dp, - struct intel_crtc_state *crtc_state, - int max_bpp, int min_bpp, - struct drm_connector_state *conn_state, - int step, bool dsc) -{ - return intel_dp_mtp_tu_compute_config(intel_dp, crtc_state, conn_state, - min_bpp, max_bpp, step, dsc); -} - static int mst_stream_compute_link_config(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state, @@ -388,10 +378,10 @@ static int mst_stream_compute_link_config(struct intel_dp *intel_dp, * FIXME: allocate the BW according to link_bpp, which in the case of * YUV420 is only half of the pipe bpp value. */ - return mst_stream_find_vcpi_slots_for_bpp(intel_dp, crtc_state, - fxp_q4_to_int(limits->link.max_bpp_x16), - fxp_q4_to_int(limits->link.min_bpp_x16), - conn_state, 2 * 3, false); + return intel_dp_mtp_tu_compute_config(intel_dp, crtc_state, conn_state, + fxp_q4_to_int(limits->link.min_bpp_x16), + fxp_q4_to_int(limits->link.max_bpp_x16), + 2 * 3, false); } static int mst_stream_dsc_compute_link_config(struct intel_dp *intel_dp, @@ -451,9 +441,8 @@ static int mst_stream_dsc_compute_link_config(struct intel_dp *intel_dp, crtc_state->lane_count = limits->max_lane_count; crtc_state->port_clock = limits->max_rate; - return mst_stream_find_vcpi_slots_for_bpp(intel_dp, crtc_state, max_compressed_bpp, - min_compressed_bpp, - conn_state, 1, true); + return intel_dp_mtp_tu_compute_config(intel_dp, crtc_state, conn_state, + min_compressed_bpp, max_compressed_bpp, 1, true); } static int mst_stream_update_slots(struct intel_dp *intel_dp,