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 56662CE7B00 for ; Fri, 6 Sep 2024 10:51:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2B3A10EA05; Fri, 6 Sep 2024 10:51:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Lm0FKLLy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA81E10EA03 for ; Fri, 6 Sep 2024 10:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725619898; x=1757155898; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:content-transfer-encoding:in-reply-to; bh=WzxU86cQwOwLh5gwCvEhfyiaJnn0urzZmnjoRSQcW6w=; b=Lm0FKLLyCxTPQHF44m1+wv3Au5DDSTqcLi52yIaB4wHMp8RpMYaermge 5U/kZxNzIo6mbf03N7CRz4R9qyNf3n1GeEhnhOVxwLMGxgxymjaN1iIyj Mv1CGVi2RPd3scSZr4aqnVWCgFWYxQN1pFiNEixVVJc/y/6ZbololoVqh iiNBUzadmSeH3eGarXjnNnMUDYBJfdaHP2yAEOOAER94B2VsoYn9GXdiZ U+9xaorvnLyeyK+6L4mR6yfSYVdj0nXwmpRQmhHbF3vj8MZziRh454MRB zXHu6jCVpFKQLsXK670DVVmjrDJG/lA63gq6FAxGm9dLsb8iXtls62k2X g==; X-CSE-ConnectionGUID: qQIC5NtsRGabnyW3uJdrHQ== X-CSE-MsgGUID: PrIks2sOSte+qaHGQAgrpw== X-IronPort-AV: E=McAfee;i="6700,10204,11186"; a="46902617" X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="46902617" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 03:51:38 -0700 X-CSE-ConnectionGUID: N9c5zZm4TJK1c2J2+4fuaA== X-CSE-MsgGUID: 2ZgGkjSUShGewIbJVxGctA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="70723974" Received: from ideak-desk.fi.intel.com ([10.237.72.78]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 03:51:37 -0700 Date: Fri, 6 Sep 2024 13:51:59 +0300 From: Imre Deak To: Jouni =?iso-8859-1?Q?H=F6gander?= Cc: intel-gfx@lists.freedesktop.org, animesh.manna@intel.com Subject: Re: [PATCH v2 2/4] drm/i915/display: Use intel_attached_dp instead of local implementation Message-ID: References: <20240906070033.289015-1-jouni.hogander@intel.com> <20240906070033.289015-3-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240906070033.289015-3-jouni.hogander@intel.com> 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: , Reply-To: imre.deak@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Sep 06, 2024 at 10:00:31AM +0300, Jouni Högander wrote: > Link training code contains local "connector to intel_dp" > implementation. This was added due to missing MST handling in > intel_attached_dp. Missing MST support is now fixed in > intel_attached_dp. We can now change link training code to use that instead > of local intel_connector_to_intel_dp. > > Signed-off-by: Jouni Högander Reviewed-by: Imre Deak > --- > .../drm/i915/display/intel_dp_link_training.c | 30 +++++++------------ > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c > index f45797c1a2051..28f6b7bb816e2 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c > @@ -1679,19 +1679,11 @@ void intel_dp_128b132b_sdp_crc16(struct intel_dp *intel_dp, > lt_dbg(intel_dp, DP_PHY_DPRX, "DP2.0 SDP CRC16 for 128b/132b enabled\n"); > } > > -static struct intel_dp *intel_connector_to_intel_dp(struct intel_connector *connector) > -{ > - if (connector->mst_port) > - return connector->mst_port; > - else > - return enc_to_intel_dp(intel_attached_encoder(connector)); > -} > - > static int i915_dp_force_link_rate_show(struct seq_file *m, void *data) > { > struct intel_connector *connector = to_intel_connector(m->private); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int current_rate = -1; > int force_rate; > int err; > @@ -1762,7 +1754,7 @@ static ssize_t i915_dp_force_link_rate_write(struct file *file, > struct seq_file *m = file->private_data; > struct intel_connector *connector = to_intel_connector(m->private); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int rate; > int err; > > @@ -1789,7 +1781,7 @@ static int i915_dp_force_lane_count_show(struct seq_file *m, void *data) > { > struct intel_connector *connector = to_intel_connector(m->private); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int current_lane_count = -1; > int force_lane_count; > int err; > @@ -1864,7 +1856,7 @@ static ssize_t i915_dp_force_lane_count_write(struct file *file, > struct seq_file *m = file->private_data; > struct intel_connector *connector = to_intel_connector(m->private); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int lane_count; > int err; > > @@ -1891,7 +1883,7 @@ static int i915_dp_max_link_rate_show(void *data, u64 *val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > @@ -1910,7 +1902,7 @@ static int i915_dp_max_lane_count_show(void *data, u64 *val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > @@ -1929,7 +1921,7 @@ static int i915_dp_force_link_training_failure_show(void *data, u64 *val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > @@ -1947,7 +1939,7 @@ static int i915_dp_force_link_training_failure_write(void *data, u64 val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > if (val > 2) > @@ -1971,7 +1963,7 @@ static int i915_dp_force_link_retrain_show(void *data, u64 *val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > @@ -1989,7 +1981,7 @@ static int i915_dp_force_link_retrain_write(void *data, u64 val) > { > struct intel_connector *connector = to_intel_connector(data); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > @@ -2012,7 +2004,7 @@ static int i915_dp_link_retrain_disabled_show(struct seq_file *m, void *data) > { > struct intel_connector *connector = to_intel_connector(m->private); > struct intel_display *display = to_intel_display(connector); > - struct intel_dp *intel_dp = intel_connector_to_intel_dp(connector); > + struct intel_dp *intel_dp = intel_attached_dp(connector); > int err; > > err = drm_modeset_lock_single_interruptible(&display->drm->mode_config.connection_mutex); > -- > 2.34.1 >