Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "drm: virtio: reinstate drm_virtio_set_busid()"

This reverts commit c2cbc38b9715bd8318062e600668fc30e5a3fbfa.

Commit "drm/virtio: fix busid regression" is a better fix.

-12
-10
drivers/gpu/drm/virtio/virtgpu_drm_bus.c
··· 28 28 29 29 #include "virtgpu_drv.h" 30 30 31 - int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master) 32 - { 33 - struct pci_dev *pdev = dev->pdev; 34 - 35 - if (pdev) { 36 - return drm_pci_set_busid(dev, master); 37 - } 38 - return 0; 39 - } 40 - 41 31 static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev) 42 32 { 43 33 struct apertures_struct *ap;
-1
drivers/gpu/drm/virtio/virtgpu_drv.c
··· 117 117 118 118 static struct drm_driver driver = { 119 119 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, 120 - .set_busid = drm_virtio_set_busid, 121 120 .load = virtio_gpu_driver_load, 122 121 .unload = virtio_gpu_driver_unload, 123 122 .open = virtio_gpu_driver_open,
-1
drivers/gpu/drm/virtio/virtgpu_drv.h
··· 49 49 #define DRIVER_PATCHLEVEL 1 50 50 51 51 /* virtgpu_drm_bus.c */ 52 - int drm_virtio_set_busid(struct drm_device *dev, struct drm_master *master); 53 52 int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev); 54 53 55 54 struct virtio_gpu_object {