leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "drm: virtio: reinstate drm_virtio_set_busid()"

Browse Source 
This reverts commit c2cbc38b97.

Commit "drm/virtio: fix busid regression" is a better fix.
This commit is contained in:
Gerd Hoffmann 2016-10-18 08:19:36 +02:00
parent 9785b4321b
commit 1775db074a
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/virtio/virtgpu_drm_bus.c
View File

@ -28,16 +28,6 @@
#include "virtgpu_drv.h" #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) static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev)
{ {
struct apertures_struct *ap; struct apertures_struct *ap;

1
drivers/gpu/drm/virtio/virtgpu_drv.c
View File

@ -117,7 +117,6 @@ static const struct file_operations virtio_gpu_driver_fops = {
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC,
.set_busid = drm_virtio_set_busid,
.load = virtio_gpu_driver_load, .load = virtio_gpu_driver_load,
.unload = virtio_gpu_driver_unload, .unload = virtio_gpu_driver_unload,
.open = virtio_gpu_driver_open, .open = virtio_gpu_driver_open,

1
drivers/gpu/drm/virtio/virtgpu_drv.h
View File

@ -49,7 +49,6 @@
#define DRIVER_PATCHLEVEL 1 #define DRIVER_PATCHLEVEL 1
/* virtgpu_drm_bus.c */ /* 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); int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev);
struct virtio_gpu_object { struct virtio_gpu_object {