[Intel-gfx] [drm-tip:drm-tip 1/7] drivers/gpu/drm/nouveau/nvkm/engine/device/base.c:2347:1: error: redefinition of 'nv137_chipset'

[Jani Nikula]

On Thu, 13 Apr 2017, kbuild test robot <fengguang.wu at intel.com> wrote:
> tree:   git://anongit.freedesktop.org/drm/drm-tip drm-tip
> head:   f1faf571d9530365a34fe33a3efa3fb224661692
> commit: 15b670ebb1bb7309b60c23b3fa1479d31cd79122 [1/7] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip
> config: x86_64-randconfig-i0-201715 (attached as .config)
> compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
> reproduce:
>         git checkout 15b670ebb1bb7309b60c23b3fa1479d31cd79122
>         # save the attached .config to linux build tree
>         make ARCH=x86_64 
>
> All errors (new ones prefixed by >>):
>
>>> drivers/gpu/drm/nouveau/nvkm/engine/device/base.c:2347:1: error: redefinition of 'nv137_chipset'
>     nv137_chipset = {
>     ^
>    drivers/gpu/drm/nouveau/nvkm/engine/device/base.c:2290:1: note: previous definition of 'nv137_chipset' was here
>     nv137_chipset = {
>     ^

Blergh, this is probably due to me messing up a conflict resolution for
drm-tip.

BR,
Jani.

>
> vim +/nv137_chipset +2347 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
>
> fa1dbc49 Alexandre Courbot 2017-03-29  2331  	.imem = gk20a_instmem_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2332  	.ltc = gp100_ltc_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2333  	.mc = gp10b_mc_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2334  	.mmu = gf100_mmu_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2335  	.secboot = gp10b_secboot_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2336  	.pmu = gm20b_pmu_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2337  	.timer = gk20a_timer_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2338  	.top = gk104_top_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2339  	.ce[2] = gp102_ce_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2340  	.dma = gf119_dma_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2341  	.fifo = gp10b_fifo_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2342  	.gr = gp10b_gr_new,
> fa1dbc49 Alexandre Courbot 2017-03-29  2343  	.sw = gf100_sw_new,
> 1fe487d7 Ben Skeggs        2016-12-09  2344  };
> 1fe487d7 Ben Skeggs        2016-12-09  2345  
> da2ba564 Ben Skeggs        2017-04-06  2346  static const struct nvkm_device_chip
> da2ba564 Ben Skeggs        2017-04-06 @2347  nv137_chipset = {
> da2ba564 Ben Skeggs        2017-04-06  2348  	.name = "GP107",
> da2ba564 Ben Skeggs        2017-04-06  2349  	.bar = gf100_bar_new,
> da2ba564 Ben Skeggs        2017-04-06  2350  	.bios = nvkm_bios_new,
> da2ba564 Ben Skeggs        2017-04-06  2351  	.bus = gf100_bus_new,
> da2ba564 Ben Skeggs        2017-04-06  2352  	.devinit = gm200_devinit_new,
> da2ba564 Ben Skeggs        2017-04-06  2353  	.fb = gp102_fb_new,
> da2ba564 Ben Skeggs        2017-04-06  2354  	.fuse = gm107_fuse_new,
> da2ba564 Ben Skeggs        2017-04-06  2355  	.gpio = gk104_gpio_new,
>
> :::::: The code at line 2347 was first introduced by commit
> :::::: da2ba564a6dcf46df4f828624ff55531ff11d5b0 drm/nouveau: initial support (display-only) for GP107
>
> :::::: TO: Ben Skeggs <bskeggs at redhat.com>
> :::::: CC: Ben Skeggs <bskeggs at redhat.com>
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Jani Nikula, Intel Open Source Technology Center