From patchwork Thu Aug 29 03:46:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13782423 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 51BE6C7115D for ; Thu, 29 Aug 2024 03:46:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3AADB10E148; Thu, 29 Aug 2024 03:46:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="dz46H/nF"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A34510E046; Thu, 29 Aug 2024 03:46:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1724903201; bh=YkNIh8pmguQ+pL3J+DT+WdJ5jztxp5xvsfFYQSUAA8s=; h=Date:From:To:Cc:Subject:From; b=dz46H/nFFrIQl6ECXV7SPRSlhktGTNa2HXQ7EM45UhLcYEDfr4YwN9uDWHA1/13S/ v1JjlEFWRignypUc8SLnLKrcNOgRZ+xWUOj4cROoRNSqmC9Ds30u7x5T84qPOS7A3d odzU2ldQBNmlbVIVuvQnZ3LFyI4g7KOVfQ2Z/Akk+OjKm/LHjEhDqHc+dD6Pmxz8+9 Yv9qTB6/c1aPM3DaTfFUdTkXBBACLnlsl3jDNZxDH0WW/URQep9EUtgo8KSRZZvABg 7uIiUnVFcKMnEHZualezPRPm2d1hyePDPdu1M9Vp1etuqlqIz0VMnyLOhZuhnnuSvz zOUdmpoPEU2xg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WvRzM59rRz4wyR; Thu, 29 Aug 2024 13:46:39 +1000 (AEST) Date: Thu, 29 Aug 2024 13:46:38 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-intel tree Message-ID: <20240829134638.7f9f1bf5@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/display/intel_dp_mst.c:2118:6: error: redefinition of 'intel_dp_mst_verify_dpcd_state' 2118 | bool intel_dp_mst_verify_dpcd_state(struct intel_dp *intel_dp) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/display/intel_dp_mst.c:2048:6: note: previous definition of 'intel_dp_mst_verify_dpcd_state' with type 'bool(struct intel_dp *)' {aka '_Bool(struct intel_dp *)'} 2048 | bool intel_dp_mst_verify_dpcd_state(struct intel_dp *intel_dp) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 594cf78dc36f ("drm/i915/dp_mst: Fix MST state after a sink reset") interacting with my merge of the drm tree and commit a2ccc33b88e2 ("drm/i915/dp_mst: Fix MST state after a sink reset") from the drm-intel-fixes tree. I have applied the following patch for today. From: Stephen Rothwell Date: Thu, 29 Aug 2024 11:24:26 +1000 Subject: [PATCH] fix up for "drm/i915/dp_mst: Fix MST state after a sink reset" interacting with "Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git" from linux-next and "drm/i915/dp_mst: Fix MST state after a sink reset" from drm-intel-fixes. Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 40 --------------------- 1 file changed, 40 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 639190ee6ff9..696b6ee52014 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -2102,43 +2102,3 @@ void intel_dp_mst_prepare_probe(struct intel_dp *intel_dp) intel_mst_set_probed_link_params(intel_dp, link_rate, lane_count); } - -/* - * intel_dp_mst_verify_dpcd_state - verify the MST SW enabled state wrt. the DPCD - * @intel_dp: DP port object - * - * Verify if @intel_dp's MST enabled SW state matches the corresponding DPCD - * state. A long HPD pulse - not long enough to be detected as a disconnected - * state - could've reset the DPCD state, which requires tearing - * down/recreating the MST topology. - * - * Returns %true if the SW MST enabled and DPCD states match, %false - * otherwise. - */ -bool intel_dp_mst_verify_dpcd_state(struct intel_dp *intel_dp) -{ - struct intel_display *display = to_intel_display(intel_dp); - struct intel_connector *connector = intel_dp->attached_connector; - struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); - struct intel_encoder *encoder = &dig_port->base; - int ret; - u8 val; - - if (!intel_dp->is_mst) - return true; - - ret = drm_dp_dpcd_readb(intel_dp->mst_mgr.aux, DP_MSTM_CTRL, &val); - - /* Adjust the expected register value for SST + SideBand. */ - if (ret < 0 || val != (DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC)) { - drm_dbg_kms(display->drm, - "[CONNECTOR:%d:%s][ENCODER:%d:%s] MST mode got reset, removing topology (ret=%d, ctrl=0x%02x)\n", - connector->base.base.id, connector->base.name, - encoder->base.base.id, encoder->base.name, - ret, val); - - return false; - } - - return true; -}