From 7c5e01902547a81d7d8b073eb3f130814d9125d9 Mon Sep 17 00:00:00 2001 From: David Stevens Date: Wed, 19 Aug 2020 12:10:11 +0900 Subject: [PATCH] BACKPORT: FROMGIT: virtio: fix build for configs without dma-bufs Reported-by: kernel test robot Signed-off-by: David Stevens Link: http://patchwork.freedesktop.org/patch/msgid/20200819031011.310180-1-stevensd@chromium.org Signed-off-by: Gerd Hoffmann (cherry picked from commit 9fe2f897499f129f9f0ef4c51a11512dcf2ab7d0 git://anongit.freedesktop.org/drm/drm-misc drm-misc-next) Conflicts: trivial rebase conflicts in with virtwl build config BUG=b:142423916 TEST=builds Change-Id: If6f93dcdd52db5d02142ad13d872909d3d782d80 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2405752 Reviewed-by: Gurchetan Singh Reviewed-by: Guenter Roeck Commit-Queue: Guenter Roeck Tested-by: Guenter Roeck --- drivers/gpu/drm/virtio/Kconfig | 1 + drivers/virtio/Kconfig | 7 +++++++ drivers/virtio/Makefile | 3 ++- drivers/virtio/virtio_dma_buf.c | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/Kconfig b/drivers/gpu/drm/virtio/Kconfig index ba2e4d6cf4c45f..569ff9d6ae14c6 100644 --- a/drivers/gpu/drm/virtio/Kconfig +++ b/drivers/gpu/drm/virtio/Kconfig @@ -5,6 +5,7 @@ config DRM_VIRTIO_GPU depends on PCI select DRM_KMS_HELPER select DRM_TTM + 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). diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 900435893d9567..4b2cabcc2a7eef 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -95,6 +95,13 @@ 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. + config VIRTIO_WL bool "Virtio Wayland driver" depends on VIRTIO diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 923d10990d25c8..5ce86174bd8864 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -1,5 +1,5 @@ # 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 @@ -7,3 +7,4 @@ virtio_pci-$(CONFIG_VIRTIO_PCI_LEGACY) += virtio_pci_legacy.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o obj-$(CONFIG_VIRTIO_WL) += virtio_wl.o +obj-$(CONFIG_VIRTIO_DMA_SHARED_BUFFER) += virtio_dma_buf.o diff --git a/drivers/virtio/virtio_dma_buf.c b/drivers/virtio/virtio_dma_buf.c index 45d6e8647dcf12..5127a2f0c986e6 100644 --- a/drivers/virtio/virtio_dma_buf.c +++ b/drivers/virtio/virtio_dma_buf.c @@ -5,6 +5,7 @@ * Copyright (C) 2020 Google, Inc. */ +#include #include /** @@ -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");