diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-10-18 08:19:36 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-11-15 09:45:30 +0100 |
| commit | 1775db074a327d33af9536450635aedb6105b71a (patch) | |
| tree | a163583a01dcb296775f32a3b5a79548bfec7194 | |
| parent | 9785b4321b0bd701f8d21d3d3c676a7739a5cf22 (diff) | |
| download | op-kernel-dev-1775db074a327d33af9536450635aedb6105b71a.zip op-kernel-dev-1775db074a327d33af9536450635aedb6105b71a.tar.gz | |
Revert "drm: virtio: reinstate drm_virtio_set_busid()"
This reverts commit c2cbc38b9715bd8318062e600668fc30e5a3fbfa.
Commit "drm/virtio: fix busid regression" is a better fix.
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.h | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c index 8534a99..3b97d50 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c +++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c @@ -28,16 +28,6 @@ #include "virtgpu_drv.h" -int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master) -{ - struct pci_dev *pdev = dev->pdev; - - if (pdev) { - return drm_pci_set_busid(dev, master); - } - return 0; -} - static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev) { struct apertures_struct *ap; diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 5820b702..c13f70c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -117,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, diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index ae59080..06ad923 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -49,7 +49,6 @@ #define DRIVER_PATCHLEVEL 1 /* virtgpu_drm_bus.c */ -int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master); int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev); struct virtio_gpu_object { |
