Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1775db07 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

Revert "drm: virtio: reinstate drm_virtio_set_busid()" 

This reverts commit c2cbc38b.

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

drivers/gpu/drm/virtio/virtgpu_drm_bus.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/virtio/virtgpu_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/virtio/virtgpu_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {