| Message ID | c0ff2c9e-3f2c-4977-b52d-a1e33c6cb9d7@email.android.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Koenig, Christian (2018-06-20 17:28:33) > > > Am 20.06.2018 18:22 schrieb Chris Wilson <chris@chris-wilson.co.uk>: > > Fix i915's CI build after the removal of the dmabuf->kmap interface that > left the mock routines intact. > > In file included from drivers/gpu/drm/i915/i915_gem_dmabuf.c:335:0: > drivers/gpu/drm/i915/selftests/mock_dmabuf.c:104:13: error: > ‘mock_dmabuf_kunmap_atomic’ defined but not used [-Werror=unused-function] > static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned > long page_num, void *addr) > drivers/gpu/drm/i915/selftests/mock_dmabuf.c:97:14: error: > ‘mock_dmabuf_kmap_atomic’ defined but not used [-Werror=unused-function] > static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned > long page_num) > > Fixes: f664a5269542 ("dma-buf: remove kmap_atomic interface") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > > Reviewed-by: Christian König <christian.koenig@amd.com> > > And sorry for the noise, No worries, pushed to drm-misc-next, and so this never happened. -Chris
diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c index f81fda8ea45e..ca682caf1062 100644 --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c @@ -94,18 +94,6 @@ static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) vm_unmap_ram(vaddr, mock->npages); } -static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num) -{ - struct mock_dmabuf *mock = to_mock(dma_buf); - - return kmap_atomic(mock->pages[page_num]); -} - -static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr) -{ - kunmap_atomic(addr); -} - static void *mock_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num) { struct mock_dmabuf *mock = to_mock(dma_buf);
Am 20.06.2018 18:22 schrieb Chris Wilson <chris@chris-wilson.co.uk>: Fix i915's CI build after the removal of the dmabuf->kmap interface that left the mock routines intact. In file included from drivers/gpu/drm/i915/i915_gem_dmabuf.c:335:0: drivers/gpu/drm/i915/selftests/mock_dmabuf.c:104:13: error: ‘mock_dmabuf_kunmap_atomic’ defined but not used [-Werror=unused-function] static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr) drivers/gpu/drm/i915/selftests/mock_dmabuf.c:97:14: error: ‘mock_dmabuf_kmap_atomic’ defined but not used [-Werror=unused-function] static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num) Fixes: f664a5269542 ("dma-buf: remove kmap_atomic interface") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Christian König <christian.koenig@amd.com> And sorry for the noise, Christian. Cc: Christian König <christian.koenig@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sumit Semwal <sumit.semwal@linaro.org> --- drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.18.0.rc2