Messages in this thread Patch in this message | | | Date | Fri, 26 Apr 2019 12:17:35 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the drm tree |
| |
Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/gpu/drm/virtio/virtgpu_prime.c:43:18: error: redefinition of 'virtgpu_gem_prime_get_sg_table' struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/virtio/virtgpu_prime.c:31:18: note: previous definition of 'virtgpu_gem_prime_get_sg_table' was here struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by a bad automaic merge between commit
a0cecc23cfcb ("Revert "drm/virtio: drop prime import/export callbacks"")
from Linus' tree and commit
98f41dc3b3ee ("drm/virtio: implement prime export")
from the drm tree.
I dropped the version of this function from the drm-fixes tree:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 26 Apr 2019 12:13:26 +1000 Subject: [PATCH] drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/virtio/virtgpu_prime.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 0f670fc6c954..8fbf71bd0c5e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -40,11 +40,6 @@ struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) bo->tbo.ttm->num_pages); } -struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) -{ - return ERR_PTR(-ENODEV); -} - struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *table) -- 2.20.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |