From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com>,
Alex Deucher <alexander.deucher@amd.com>
Subject: linux-next: build failure after merge of the drm tree
Date: Tue, 2 Jan 2018 12:48:59 +1100 [thread overview]
Message-ID: <20180102124859.27c2e1fd@canb.auug.org.au> (raw)
Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:219:6: error: redefinition of 'dm_dp_mst_dc_sink_create'
void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:183:6: note: previous definition of 'dm_dp_mst_dc_sink_create' was here
void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
^
Caused by commit
391ef035200f ("drm/amd/display: Fix rehook MST display not light back on")
automatically mergeing badly with commit
becd0875f439 ("drm/amd/display: Fix rehook MST display not light back on")
from Linus' tree.
I applied this merge fix patch (to remove the second copy of
dm_dp_mst_dc_sink_create):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jan 2018 12:43:32 +1100
Subject: [PATCH] drm/amd/display: fix mismerge of identical patches
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 36 ----------------------
1 file changed, 36 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 7ace4dd302c1..f3d87f418d2e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -216,42 +216,6 @@ void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
&aconnector->base, aconnector->edid);
}
-void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
-{
- struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
- struct edid *edid;
- struct dc_sink *dc_sink;
- struct dc_sink_init_data init_params = {
- .link = aconnector->dc_link,
- .sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
-
- edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
-
- if (!edid) {
- drm_mode_connector_update_edid_property(
- &aconnector->base,
- NULL);
- return;
- }
-
- aconnector->edid = edid;
-
- dc_sink = dc_link_add_remote_sink(
- aconnector->dc_link,
- (uint8_t *)aconnector->edid,
- (aconnector->edid->extensions + 1) * EDID_LENGTH,
- &init_params);
-
- dc_sink->priv = aconnector;
- aconnector->dc_sink = dc_sink;
-
- amdgpu_dm_add_sink_to_freesync_module(
- connector, aconnector->edid);
-
- drm_mode_connector_update_edid_property(
- &aconnector->base, aconnector->edid);
-}
-
static int dm_dp_mst_get_modes(struct drm_connector *connector)
{
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
--
2.15.0
--
Cheers,
Stephen Rothwell
next reply other threads:[~2018-01-02 1:49 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-02 1:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 6:47 linux-next: build failure after merge of the drm tree Stephen Rothwell
2023-01-19 2:12 Stephen Rothwell
2022-09-30 10:54 broonie
2022-10-04 2:20 ` Stephen Rothwell
2022-10-04 2:24 ` David Airlie
2022-10-04 3:05 ` Stephen Rothwell
2022-10-04 11:39 ` Mark Brown
2022-10-05 15:30 ` Alex Deucher
2022-10-05 16:45 ` Hamza Mahfooz
2022-10-05 22:28 ` Stephen Rothwell
2022-10-06 8:12 ` Stephen Rothwell
2022-10-06 13:56 ` Alex Deucher
2022-10-06 16:52 ` Stephen Rothwell
2022-10-06 16:25 ` Hamza Mahfooz
2022-02-25 16:42 broonie
2022-02-28 3:46 ` Stephen Rothwell
2022-02-28 6:44 ` Hsin-Yi Wang
2022-02-28 6:48 ` Dave Airlie
2022-02-28 15:33 ` Robert Foss
2021-08-20 2:33 Stephen Rothwell
2021-08-20 6:23 ` Masahiro Yamada
2021-09-01 21:50 ` Stephen Rothwell
2021-09-05 22:49 ` Stephen Rothwell
2021-09-06 7:34 ` Daniel Vetter
2021-09-08 3:13 ` Masahiro Yamada
2021-09-08 9:07 ` Daniel Vetter
2021-04-09 3:36 Stephen Rothwell
2021-01-08 0:55 Stephen Rothwell
2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
2020-12-09 1:53 Stephen Rothwell
2020-09-28 3:54 Stephen Rothwell
2020-09-28 6:04 ` Christoph Hellwig
2020-09-28 6:08 ` Dave Airlie
2020-09-28 6:14 ` Christoph Hellwig
2020-09-28 10:15 ` Paul Cercueil
2020-09-28 11:34 ` Christoph Hellwig
2020-09-28 11:46 ` Paul Cercueil
2020-09-28 12:10 ` Christoph Hellwig
2020-09-28 13:31 ` Paul Cercueil
2020-09-30 9:02 ` Christoph Hellwig
2020-09-30 13:33 ` Paul Cercueil
2020-09-30 16:11 ` Christoph Hellwig
2020-09-30 16:39 ` Paul Cercueil
2020-09-30 16:40 ` Christoph Hellwig
2020-09-30 16:45 ` Paul Cercueil
2020-09-30 16:52 ` Christoph Hellwig
2020-05-08 4:29 Stephen Rothwell
2019-11-05 2:54 Stephen Rothwell
2019-10-10 0:22 Stephen Rothwell
2019-07-08 4:48 Stephen Rothwell
2019-04-26 2:17 Stephen Rothwell
2018-05-16 6:53 Stephen Rothwell
2018-05-16 8:09 ` Oded Gabbay
2018-05-17 5:00 ` Dave Airlie
2018-03-13 5:46 Stephen Rothwell
2017-09-28 4:57 Stephen Rothwell
2017-03-20 0:51 Stephen Rothwell
2017-03-20 8:03 ` Daniel Vetter
2017-03-20 8:05 ` Daniel Vetter
2017-02-23 23:25 Stephen Rothwell
2017-01-24 1:25 Stephen Rothwell
2017-01-25 10:52 ` Vincent ABRIOU
2016-07-15 3:40 Stephen Rothwell
2016-07-15 4:32 ` Sedat Dilek
2016-04-28 1:57 Stephen Rothwell
2016-04-28 8:11 ` Jani Nikula
2016-03-17 4:41 Stephen Rothwell
2016-03-17 8:41 ` Christian König
2016-02-22 0:45 Stephen Rothwell
2015-12-31 10:31 Stephen Rothwell
2016-01-07 2:44 ` Stephen Rothwell
2016-01-11 22:54 ` Stephen Rothwell
2016-01-12 0:31 ` Dave Airlie
2016-01-12 4:35 ` Stephen Rothwell
2016-01-12 7:48 ` Zhu, Rex
2015-12-31 2:40 Stephen Rothwell
2015-12-31 5:14 ` Mark yao
2015-11-04 9:22 Stephen Rothwell
2015-11-09 16:45 ` Guenter Roeck
2015-11-10 4:55 ` Alexandre Courbot
2015-10-06 1:09 Stephen Rothwell
2015-06-09 13:42 Stephen Rothwell
2015-06-09 14:02 ` Deucher, Alexander
2015-06-10 0:28 ` Stephen Rothwell
2015-05-20 3:08 Stephen Rothwell
2015-05-20 4:41 ` Dave Airlie
2015-05-20 5:25 ` Stephen Rothwell
2015-05-20 5:31 ` Stephen Rothwell
2015-05-20 6:01 ` Oded Gabbay
2015-05-20 6:08 ` Dave Airlie
2015-01-29 2:38 Stephen Rothwell
2015-01-29 8:21 ` Oded Gabbay
2015-01-29 9:35 ` Stephen Rothwell
2014-09-08 4:26 Stephen Rothwell
2014-06-05 4:12 Stephen Rothwell
2014-06-05 4:28 ` Stephen Rothwell
2012-09-24 3:18 Stephen Rothwell
2012-09-24 11:31 ` Daniel Vetter
2012-09-24 11:58 ` Stephen Rothwell
2012-08-24 3:49 Stephen Rothwell
2012-05-17 3:47 Stephen Rothwell
2012-04-30 3:22 Stephen Rothwell
2012-04-23 3:42 Stephen Rothwell
2012-03-16 2:53 Stephen Rothwell
2012-03-19 2:45 ` Stephen Rothwell
2011-11-28 2:49 Stephen Rothwell
2011-11-16 0:30 Stephen Rothwell
2011-11-16 10:16 ` Alan Cox
2011-11-16 16:42 ` Jesse Barnes
2011-11-25 1:49 ` Stephen Rothwell
2011-11-25 10:30 ` Alan Cox
2011-11-25 10:34 ` Dave Airlie
2011-11-28 2:53 ` Stephen Rothwell
2011-11-28 11:30 ` Alan Cox
2011-11-28 13:13 ` Stephen Rothwell
2011-11-28 13:18 ` Alan Cox
2011-11-28 13:53 ` Stephen Rothwell
2011-11-28 14:05 ` Dave Airlie
2011-11-28 14:08 ` Alan Cox
2011-11-28 2:52 ` Stephen Rothwell
2011-11-28 5:07 ` Greg KH
2011-11-28 11:33 ` Alan Cox
2011-03-15 3:49 Stephen Rothwell
2010-04-08 3:12 Stephen Rothwell
2010-04-08 3:52 ` Dave Airlie
2010-04-08 4:14 ` Stephen Rothwell
2010-04-08 16:19 ` Tony Luck
2010-04-08 20:50 ` Pauli Nieminen
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=20180102124859.27c2e1fd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jerry.Zuo@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).