[Intel-gfx] [PATCH] drm/i915/blt: Remove recursive vma->lock

[kbuild test robot]

Hi Chris,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20190618]
[cannot apply to v5.2-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Chris-Wilson/drm-i915-blt-Remove-recursive-vma-lock/20190618-194749
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-rhel (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
        # 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 at intel.com>

All errors (new ones prefixed by >>):

   drivers/gpu/drm/i915/gem/i915_gem_client_blt.c: In function 'clear_pages_worker':
>> drivers/gpu/drm/i915/gem/i915_gem_client_blt.c:201:57: error: passing argument 3 of 'i915_active_ref' from incompatible pointer type [-Werror=incompatible-pointer-types]
     err = i915_active_ref(&vma->active, rq->fence.context, &rq->fence);
                                                            ^
   In file included from drivers/gpu/drm/i915/i915_timeline.h:30:0,
                    from drivers/gpu/drm/i915/gt/intel_engine.h:17,
                    from drivers/gpu/drm/i915/i915_drv.h:67,
                    from drivers/gpu/drm/i915/intel_drv.h:45,
                    from drivers/gpu/drm/i915/gem/i915_gem_client_blt.c:8:
   drivers/gpu/drm/i915/i915_active.h:376:5: note: expected 'struct i915_request *' but argument is of type 'struct dma_fence *'
    int i915_active_ref(struct i915_active *ref,
        ^~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors

vim +/i915_active_ref +201 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c

   153	
   154	static void clear_pages_worker(struct work_struct *work)
   155	{
   156		struct clear_pages_work *w = container_of(work, typeof(*w), work);
   157		struct drm_i915_private *i915 = w->ce->gem_context->i915;
   158		struct drm_i915_gem_object *obj = w->sleeve->obj;
   159		struct i915_vma *vma = w->sleeve->vma;
   160		struct i915_request *rq;
   161		int err = w->dma.error;
   162	
   163		if (unlikely(err))
   164			goto out_signal;
   165	
   166		if (obj->cache_dirty) {
   167			obj->write_domain = 0;
   168			if (i915_gem_object_has_struct_page(obj))
   169				drm_clflush_sg(w->sleeve->pages);
   170			obj->cache_dirty = false;
   171		}
   172	
   173		/* XXX: we need to kill this */
   174		mutex_lock(&i915->drm.struct_mutex);
   175		err = i915_vma_pin(vma, 0, 0, PIN_USER);
   176		if (unlikely(err))
   177			goto out_unlock;
   178	
   179		rq = i915_request_create(w->ce);
   180		if (IS_ERR(rq)) {
   181			err = PTR_ERR(rq);
   182			goto out_unpin;
   183		}
   184	
   185		/* There's no way the fence has signalled */
   186		if (dma_fence_add_callback(&rq->fence, &w->cb,
   187					   clear_pages_dma_fence_cb))
   188			GEM_BUG_ON(1);
   189	
   190		if (w->ce->engine->emit_init_breadcrumb) {
   191			err = w->ce->engine->emit_init_breadcrumb(rq);
   192			if (unlikely(err))
   193				goto out_request;
   194		}
   195	
   196		/*
   197		 * w->dma is already exported via (vma|obj)->resv we need only
   198		 * keep track of the GPU activity within this vma/request, and
   199		 * propagate the signal from the request to w->dma.
   200		 */
 > 201		err = i915_active_ref(&vma->active, rq->fence.context, &rq->fence);
   202		if (err)
   203			goto out_request;
   204	
   205		err = intel_emit_vma_fill_blt(rq, vma, w->value);
   206	out_request:
   207		if (unlikely(err)) {
   208			i915_request_skip(rq, err);
   209			err = 0;
   210		}
   211	
   212		i915_request_add(rq);
   213	out_unpin:
   214		i915_vma_unpin(vma);
   215	out_unlock:
   216		mutex_unlock(&i915->drm.struct_mutex);
   217	out_signal:
   218		if (unlikely(err)) {
   219			dma_fence_set_error(&w->dma, err);
   220			dma_fence_signal(&w->dma);
   221			dma_fence_put(&w->dma);
   222		}
   223	}
   224	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/gzip
Size: 42816 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20190619/ba786b3e/attachment-0001.gz>