Commit 9fe2f897 authored by David Stevens's avatar David Stevens Committed by Gerd Hoffmann
Browse files

virtio: fix build for configs without dma-bufs 



Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarDavid Stevens <stevensd@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200819031011.310180-1-stevensd@chromium.org


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent a25b6b27

drivers/gpu/drm/virtio/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config DRM_VIRTIO_GPU 
	depends on DRM && VIRTIO && MMU

	select DRM_KMS_HELPER

	select DRM_GEM_SHMEM_HELPER

	select VIRTIO_DMA_SHARED_BUFFER

	help

	   This is the virtual GPU driver for virtio.  It can be used with

	   QEMU based VMMs (like KVM or Xen).

drivers/virtio/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -126,4 +126,11 @@ config VIRTIO_MMIO_CMDLINE_DEVICES 


	 If unsure, say 'N'.



config VIRTIO_DMA_SHARED_BUFFER

	tristate

	depends on DMA_SHARED_BUFFER

	help

	 This option adds a flavor of dma buffers that are backed by

	 virtio resources.



endif # VIRTIO_MENU

drivers/virtio/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o virtio_dma_buf.o

obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o

obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o

obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o

virtio_pci-y := virtio_pci_modern.o virtio_pci_common.o
@@ -8,3 +8,4 @@ obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o 
obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o

obj-$(CONFIG_VIRTIO_VDPA) += virtio_vdpa.o

obj-$(CONFIG_VIRTIO_MEM) += virtio_mem.o

obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o

drivers/virtio/virtio_dma_buf.c

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2020 Google, Inc.

 */



#include <linux/module.h>

#include <linux/virtio_dma_buf.h>



/**
@@ -83,3 +84,5 @@ int virtio_dma_buf_get_uuid(struct dma_buf *dma_buf, 
	return ops->get_uuid(dma_buf, uuid);

}

EXPORT_SYMBOL(virtio_dma_buf_get_uuid);



MODULE_LICENSE("GPL");