drm: Lobotomize set_busid nonsense for !pci drivers

[deliverable/linux.git] / drivers / gpu / drm / virtio / virtgpu_drv.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 7f898cfdc7468c6697a50ede409749f3e89fa08b..c13f70cfc46130946cd41e1846101160d426439b 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -42,10 +42,8 @@ module_param_named(modeset, virtio_gpu_modeset, int, 0400);
 
 static int virtio_gpu_probe(struct virtio_device *vdev)
 {
-#ifdef CONFIG_VGA_CONSOLE
        if (vgacon_text_force() && virtio_gpu_modeset == -1)
                return -EINVAL;
-#endif
 
        if (virtio_gpu_modeset == 0)
                return -EINVAL;
@@ -119,7 +117,6 @@ static const struct file_operations virtio_gpu_driver_fops = {
 
 static struct drm_driver driver = {
        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC,
-       .set_busid = drm_virtio_set_busid,
        .load = virtio_gpu_driver_load,
        .unload = virtio_gpu_driver_unload,
        .open = virtio_gpu_driver_open,
@@ -145,7 +142,7 @@ static struct drm_driver driver = {
        .gem_prime_vunmap = virtgpu_gem_prime_vunmap,
        .gem_prime_mmap = virtgpu_gem_prime_mmap,
 
-       .gem_free_object = virtio_gpu_gem_free_object,
+       .gem_free_object_unlocked = virtio_gpu_gem_free_object,
        .gem_open_object = virtio_gpu_gem_object_open,
        .gem_close_object = virtio_gpu_gem_object_close,
        .fops = &virtio_gpu_driver_fops,