From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the drm-intel tree
Date: Thu, 29 Aug 2024 13:46:38 +1000 [thread overview]
Message-ID: <20240829134638.7f9f1bf5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3341 bytes --]
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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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;
-}
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-29 3:46 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-29 3:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-16 17:15 linux-next: build failure after merge of the drm-intel tree Mark Brown
2026-03-17 9:00 ` Jani Nikula
2024-06-12 4:12 Stephen Rothwell
2024-06-17 19:19 ` Rodrigo Vivi
2024-06-27 21:48 ` Dave Airlie
2024-06-28 9:29 ` Jani Nikula
2022-08-26 2:36 Stephen Rothwell
2022-08-26 7:50 ` Jani Nikula
2022-04-26 2:08 Stephen Rothwell
2022-04-26 7:36 ` Jani Nikula
2022-02-15 1:10 Stephen Rothwell
2022-02-15 12:11 ` Jani Nikula
2021-05-21 1:58 Stephen Rothwell
2021-01-19 23:57 Stephen Rothwell
2021-01-21 1:11 ` Stephen Rothwell
[not found] <20191210093957.5120f717@canb.auug.org.au>
[not found] ` <20191210094224.4a294cb7@canb.auug.org.au>
2019-12-11 9:31 ` Jani Nikula
2019-03-27 2:59 Stephen Rothwell
2019-03-27 11:07 ` Joonas Lahtinen
2019-03-27 11:31 ` Stephen Rothwell
2018-07-13 1:54 Stephen Rothwell
2018-07-23 2:29 ` Stephen Rothwell
2018-05-08 1:07 Stephen Rothwell
2018-05-08 7:08 ` Oleksandr Andrushchenko
2018-05-09 5:02 ` Stephen Rothwell
2018-05-09 5:08 ` Christoph Hellwig
2018-05-09 5:18 ` Stephen Rothwell
2016-08-23 1:56 Stephen Rothwell
2016-08-23 16:33 ` Daniel Vetter
2016-05-23 2:24 Stephen Rothwell
2014-04-03 1:24 Stephen Rothwell
2014-03-19 0:53 Stephen Rothwell
2014-03-19 1:18 ` Steven Rostedt
2013-02-15 2:37 Stephen Rothwell
2013-02-15 9:30 ` Daniel Vetter
2013-02-15 16:16 ` Jesse Barnes
2013-02-19 2:01 ` Stephen Rothwell
2013-02-19 10:28 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240829134638.7f9f1bf5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox