Skip to contentSkip to conversation

drm/i915/selftests: Remove unused dmabuf->kmap routines, fix the build

PATCH Koenig, Christian 2 participants 2 messages Jun 20, 2018

Subsystems (2)
lore
Share & tools
lore

Koenig, Christian

author Reviewed-by
#0 lore raw

Am 20.06.2018 18:22 schrieb Chris Wilson <[email protected]>:
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")

And sorry for the noise,
Christian.

Cc Christian König <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Sumit Semwal <[email protected]>
---
 drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 12 ------------
 1 file changed, 12 deletions(-)
drivers/gpu/drm/i915/selftests/mock_dmabuf.c +0 -12
index f81fda8ea45e..ca682caf1062 100644
@@ -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);

--
2.18.0.rc2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#1 lore raw

Quoting Koenig, Christian (2018-06-20 17:28:33)

Quoted 17 lines

Am 20.06.2018 18:22 schrieb Chris Wilson <[email protected]>:

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)

Quoted 7 lines
Fixes f664a5269542 ("dma-buf: remove kmap_atomic interface")

And sorry for the noise,

No worries, pushed to drm-misc-next, and so this never happened. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx