This too was caused by a merge conflict and one missing Fixes:.

Regards, Joonas

Quoting kbuild test robot (2019-05-07 14:08:25)

tree: git://anongit.freedesktop.org/drm/drm-tip drm-tip head: ae28cc6cf80a2e8cbb58f255ef7cac6b2923c98a commit: 47f4a14297839cb4cedd725fb916a5da5eb9b5ba [/8] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip config: x86_64-rhel (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout 47f4a14297839cb4cedd725fb916a5da5eb9b5ba # save the attached .config to linux build tree make ARCH=x86_64

If you fix the issue, kindly add following tag Reported-by: kbuild test robot lkp@intel.com

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

All errors (new ones prefixed by >>):

drivers/gpu/drm/i915/i915_request.c:827:1: error: redefinition of 'i915_request_await_start' i915_request_await_start(struct i915_request *rq, struct i915_request *signal) ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/i915_request.c:794:1: note: previous definition of 'i915_request_await_start' was here i915_request_await_start(struct i915_request *rq, struct i915_request *signal) ^~~~~~~~~~~~~~~~~~~~~~~~

...

...

drivers/gpu/drm/i915/i915_request.c:842:1: error: redefinition of 'already_busywaiting'

already_busywaiting(struct i915_request *rq)
^~~~~~~~~~~~~~~~~~~

drivers/gpu/drm/i915/i915_request.c:809:1: note: previous definition of 'already_busywaiting' was here already_busywaiting(struct i915_request *rq) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/i915_request.c:809:1: warning: 'already_busywaiting' defined but not used [-Wunused-function] drivers/gpu/drm/i915/i915_request.c:794:1: warning: 'i915_request_await_start' defined but not used [-Wunused-function] i915_request_await_start(struct i915_request *rq, struct i915_request *signal) ^~~~~~~~~~~~~~~~~~~~~~~~

vim +/already_busywaiting +842 drivers/gpu/drm/i915/i915_request.c

47f4a1429 drivers/gpu/drm/i915/i915_request.c Joonas Lahtinen 2019-05-07 825 a2bc4695b drivers/gpu/drm/i915/i915_gem_request.c Chris Wilson 2016-09-09 826 static int e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 @827 i915_request_await_start(struct i915_request *rq, struct i915_request *signal) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 828 { e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 829 if (list_is_first(&signal->ring_link, &signal->ring->request_list)) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 830 return 0; e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 831 e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 832 signal = list_prev_entry(signal, ring_link); e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 833 if (i915_timeline_sync_is_later(rq->timeline, &signal->fence)) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 834 return 0; e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 835 e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 836 return i915_sw_fence_await_dma_fence(&rq->submit, e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 837 &signal->fence, 0, e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 838 I915_FENCE_GFP); e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 839 } e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 840 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 841 static intel_engine_mask_t 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 @842 already_busywaiting(struct i915_request *rq) 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 843 { 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 844 /* 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 845 * Polling a semaphore causes bus traffic, delaying other users of 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 846 * both the GPU and CPU. We want to limit the impact on others, 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 847 * while taking advantage of early submission to reduce GPU 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 848 * latency. Therefore we restrict ourselves to not using more 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 849 * than one semaphore from each source, and not using a semaphore 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 850 * if we have detected the engine is saturated (i.e. would not be 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 851 * submitted early and cause bus traffic reading an already passed 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 852 * semaphore). 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 853 * 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 854 * See the are-we-too-late? check in __i915_request_submit(). 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 855 */ 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 856 return rq->sched.semaphores | rq->hw_context->saturated; 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 857 } 2564fe708 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 858

:::::: The code at line 842 was first introduced by commit :::::: 2564fe708b580c1ef12b2b527ab6e8afe11ad444 drm/i915: Disable semaphore busywaits on saturated systems

:::::: TO: Chris Wilson chris@chris-wilson.co.uk :::::: CC: Joonas Lahtinen joonas.lahtinen@linux.intel.com

---

0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation