[Intel-gfx] [drm-tip:drm-tip 1/7] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:219:6: error: redefinition of 'dm_dp_mst_dc_sink_create'

[Vivi, Rodrigo]

Drm-tip rebuild created this function duplication in some merge resolution... not sure where that came from or started... But Lucas had warned me yesterday morning...

So, yesterday night I added a fix-up on drm-rerere that remove the duplication on drm-tip... and that should be fixed by now I think...

Could you please fetch and recheck?!

On Dec 30, 2017, at 9:10 AM, Wu, Fengguang <fengguang.wu at intel.com<mailto:fengguang.wu at intel.com>> wrote:

tree:   git://anongit.freedesktop.org/drm/drm-tip drm-tip
head:   16432d39f2cbdc7a8798df3ebb4f7c882fb23132
commit: a79b622ef5cad1b3a868a1d7250494e39bb04c05 [1/7] Merge remote-tracking branch 'airlied/drm-next' into drm-tip
config: i386-randconfig-b0-12302345 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
       git checkout a79b622ef5cad1b3a868a1d7250494e39bb04c05
       # save the attached .config to linux build tree
       make ARCH=i386

Note: the drm-tip/drm-tip HEAD 16432d39f2cbdc7a8798df3ebb4f7c882fb23132 builds fine.
     It only hurts bisectibility.

All errors (new ones prefixed by >>):

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)
        ^

vim +/dm_dp_mst_dc_sink_create +219 drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c

54427651 Jerry Zuo           2017-09-20  218
becd0875 Jerry (Fangzhi  Zuo 2017-12-01 @219) void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  220) {
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  221)    struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  222)    struct edid *edid;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  223)    struct dc_sink *dc_sink;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  224)    struct dc_sink_init_data init_params = {
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  225)            .link = aconnector->dc_link,
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  226)            .sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  227)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  228)    edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  229)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  230)    if (!edid) {
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  231)        drm_mode_connector_update_edid_property(
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  232)            &aconnector->base,
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  233)            NULL);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  234)        return;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  235)    }
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  236)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  237)    aconnector->edid = edid;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  238)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  239)    dc_sink = dc_link_add_remote_sink(
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  240)        aconnector->dc_link,
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  241)        (uint8_t *)aconnector->edid,
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  242)        (aconnector->edid->extensions + 1) * EDID_LENGTH,
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  243)        &init_params);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  244)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  245)    dc_sink->priv = aconnector;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  246)    aconnector->dc_sink = dc_sink;
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  247)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  248)    amdgpu_dm_add_sink_to_freesync_module(
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  249)            connector, aconnector->edid);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  250)
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  251)    drm_mode_connector_update_edid_property(
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  252)                    &aconnector->base, aconnector->edid);
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  253) }
becd0875 Jerry (Fangzhi  Zuo 2017-12-01  254)

:::::: The code at line 219 was first introduced by commit
:::::: becd0875f4393a992afbf57aa323f7bf1a71c3ff drm/amd/display: Fix rehook MST display not light back on

:::::: TO: Jerry (Fangzhi) Zuo <Jerry.Zuo at amd.com<mailto:Jerry.Zuo at amd.com>>
:::::: CC: Alex Deucher <alexander.deucher at amd.com<mailto:alexander.deucher at amd.com>>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
<.config.gz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20171231/c1275c10/attachment.html>