drm: Remove drm_device->virtdev
This is a leftover from the drm_bus days, where we've had a bus-specific device type for every bus type in drm_device. Except for pci (which we can't remove because dri1 drivers) this is all gone. And the virt driver also doesn't really need it, dev_to_virtio works perfectly fine. Cc: David Airlie <airlied@linux.ie> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: virtualization@lists.linux-foundation.org Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-3-daniel.vetter@ffwll.ch
This commit is contained in:
Родитель
a301b11186
Коммит
18e51064c4
|
@ -56,7 +56,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
|
|||
dev = drm_dev_alloc(driver, &vdev->dev);
|
||||
if (IS_ERR(dev))
|
||||
return PTR_ERR(dev);
|
||||
dev->virtdev = vdev;
|
||||
vdev->priv = dev;
|
||||
|
||||
if (strcmp(vdev->dev.parent->bus->name, "pci") == 0) {
|
||||
|
|
|
@ -138,7 +138,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
|
|||
u32 num_scanouts, num_capsets;
|
||||
int ret;
|
||||
|
||||
if (!virtio_has_feature(dev->virtdev, VIRTIO_F_VERSION_1))
|
||||
if (!virtio_has_feature(dev_to_virtio(dev->dev), VIRTIO_F_VERSION_1))
|
||||
return -ENODEV;
|
||||
|
||||
vgdev = kzalloc(sizeof(struct virtio_gpu_device), GFP_KERNEL);
|
||||
|
@ -147,7 +147,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
|
|||
|
||||
vgdev->ddev = dev;
|
||||
dev->dev_private = vgdev;
|
||||
vgdev->vdev = dev->virtdev;
|
||||
vgdev->vdev = dev_to_virtio(dev->dev);
|
||||
vgdev->dev = dev->dev;
|
||||
|
||||
spin_lock_init(&vgdev->display_info_lock);
|
||||
|
|
|
@ -429,8 +429,6 @@ struct drm_device {
|
|||
struct pci_controller *hose;
|
||||
#endif
|
||||
|
||||
struct virtio_device *virtdev;
|
||||
|
||||
struct drm_sg_mem *sg; /**< Scatter gather memory */
|
||||
unsigned int num_crtcs; /**< Number of CRTCs on this device */
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче