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 DC1ACC02193 for ; Thu, 30 Jan 2025 21:33:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8330810E9D7; Thu, 30 Jan 2025 21:33:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="evsKtZzP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB5DA10E9DD; Thu, 30 Jan 2025 21:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738272793; x=1769808793; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=plis1QLamZ5pL49QcIykFQyZJ3GSomWKkBj7oe7LcqY=; b=evsKtZzPsCajrB7Ki4AdcPsVA34dhXY4yg1XGyJg5vJyhECwfWj0iyOM 57t8mRg0S6VfsXfiOvbdToXSmSnJhv9NgZ0w2uaZfTK3nUIANXRcCpA/w SJnA7UkfuNx/6jAC7U0t1Of1+67gBGGeoE+08U1XyEv8kHP6aI9/lIm7G MCBxdzyLFp0RcGaqp8eKxi/0pzE+iJIhBNGRIaQdvvOKYi50yLbJSCQhO F7Fy50Iic47A+wvICyJ7+yaqgIIDKKUnj24gGo8OdnNvI350M5QY1nuEF 611i5CbseBGVE9U+ybcOqyKALTIKHOVMHSY9BAUJifoErB0I0d1FzXRsN A==; X-CSE-ConnectionGUID: H95siE43QqqjYsCvkMT2YQ== X-CSE-MsgGUID: hFn6vFR8S32mTWL7DLtAOw== X-IronPort-AV: E=McAfee;i="6700,10204,11331"; a="49829613" X-IronPort-AV: E=Sophos;i="6.13,246,1732608000"; d="scan'208";a="49829613" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 13:33:13 -0800 X-CSE-ConnectionGUID: 93mJFEg6R02vHWAezDgGXw== X-CSE-MsgGUID: /dX268xxSdKHzAYwf9eXCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="109904680" Received: from ideak-desk.fi.intel.com ([10.237.72.78]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 13:33:12 -0800 Date: Thu, 30 Jan 2025 23:34:04 +0200 From: Imre Deak To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 4/6] drm/i915/mst: handle mst pbn_div in intel_dp_mtp_tu_compute_config() Message-ID: References: <0cc1b507601c9964ebae7d50b1f90b1ce00acb11.1738161945.git.jani.nikula@intel.com> <8734h080na.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8734h080na.fsf@intel.com> X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: imre.deak@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, Jan 30, 2025 at 11:14:33PM +0200, Jani Nikula wrote: > On Thu, 30 Jan 2025, Imre Deak wrote: > > On Wed, Jan 29, 2025 at 04:46:36PM +0200, Jani Nikula wrote: > >> Move mst_state->pbn_div calculation to intel_dp_mtp_tu_compute_config() > >> to allow further refactoring. > >> > >> Signed-off-by: Jani Nikula > >> --- > >> drivers/gpu/drm/i915/display/intel_dp_mst.c | 31 ++++++++++----------- > >> 1 file changed, 14 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 ea1b05224c06..8786c8751c82 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > >> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > >> @@ -216,15 +216,25 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, > >> { > >> struct intel_display *display = to_intel_display(intel_dp); > >> struct drm_atomic_state *state = crtc_state->uapi.state; > >> + struct drm_dp_mst_topology_state *mst_state = NULL; > >> struct intel_connector *connector = > >> to_intel_connector(conn_state->connector); > >> const struct drm_display_mode *adjusted_mode = > >> &crtc_state->hw.adjusted_mode; > >> - fixed20_12 pbn_div; > >> + bool is_mst = intel_dp->is_mst; > >> int bpp, slots = -EINVAL; > >> int dsc_slice_count = 0; > >> int max_dpt_bpp; > >> > >> + if (is_mst) {^ > >> + mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr); > >> + if (IS_ERR(mst_state)) > >> + return PTR_ERR(mst_state); > >> + > >> + mst_state->pbn_div = drm_dp_get_vc_payload_bw(crtc_state->port_clock, > >> + crtc_state->lane_count); > >> + } > >> + > > > > This could've been in the if (intel_dp->is_mst) block, since SST doesn't > > use pbn_div. In any case the patch is correct: > > Uh, there's the if (is_mst)? I meant the MST block below, but missed that it's within the loop through bpps:/ So nvm my comment above. > > Reviewed-by: Imre Deak > > > >> if (dsc) { > >> if (!intel_dp_supports_fec(intel_dp, connector, crtc_state)) > >> return -EINVAL; > >> @@ -232,9 +242,6 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, > >> crtc_state->fec_enable = !intel_dp_is_uhbr(crtc_state); > >> } > >> > >> - pbn_div = drm_dp_get_vc_payload_bw(crtc_state->port_clock, > >> - crtc_state->lane_count); > >> - > >> max_dpt_bpp = intel_dp_mst_max_dpt_bpp(crtc_state, dsc); > >> if (max_bpp > max_dpt_bpp) { > >> drm_dbg_kms(display->drm, "Limiting bpp to max DPT bpp (%d -> %d)\n", > >> @@ -270,7 +277,7 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, > >> link_bpp_x16, > >> &crtc_state->dp_m_n); > >> > >> - if (intel_dp->is_mst) { > >> + if (is_mst) { > >> int remote_bw_overhead; > >> int remote_tu; > >> fixed20_12 pbn; > >> @@ -295,7 +302,7 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, > >> pbn.full = dfixed_const(intel_dp_mst_calc_pbn(adjusted_mode->crtc_clock, > >> link_bpp_x16, > >> remote_bw_overhead)); > >> - remote_tu = DIV_ROUND_UP(pbn.full, pbn_div.full); > >> + remote_tu = DIV_ROUND_UP(pbn.full, mst_state->pbn_div.full); > >> > >> /* > >> * Aligning the TUs ensures that symbols consisting of multiple > >> @@ -313,7 +320,7 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, > >> * allocated for the whole path and the TUs allocated for the > >> * first branch device's link also applies here. > >> */ > >> - pbn.full = remote_tu * pbn_div.full; > >> + pbn.full = remote_tu * mst_state->pbn_div.full; > >> > >> drm_WARN_ON(display->drm, remote_tu < crtc_state->dp_m_n.tu); > >> crtc_state->dp_m_n.tu = remote_tu; > >> @@ -365,16 +372,6 @@ static int mst_stream_find_vcpi_slots_for_bpp(struct intel_dp *intel_dp, > >> struct drm_connector_state *conn_state, > >> int step, bool dsc) > >> { > >> - struct drm_atomic_state *state = crtc_state->uapi.state; > >> - struct drm_dp_mst_topology_state *mst_state; > >> - > >> - mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr); > >> - if (IS_ERR(mst_state)) > >> - return PTR_ERR(mst_state); > >> - > >> - mst_state->pbn_div = drm_dp_get_vc_payload_bw(crtc_state->port_clock, > >> - crtc_state->lane_count); > >> - > >> return intel_dp_mtp_tu_compute_config(intel_dp, crtc_state, conn_state, > >> min_bpp, max_bpp, step, dsc); > >> } > >> -- > >> 2.39.5 > >> > > -- > Jani Nikula, Intel