forked from Minki/linux
c2cbc38b97
Before commita325725633("drm: Lobotomize set_busid nonsense for !pci drivers"), several DRM drivers for platform devices used to expose an explicit "drm_driver.set_busid" callback, invariably backed by drm_platform_set_busid(). Commita325725633removed drm_platform_set_busid(), along with the referring .set_busid field initializations. This was justified because interchangeable functionality had been implemented in drm_dev_alloc() / drm_dev_init(), which DRM_IOCTL_SET_VERSION would rely on going forward. However, commita325725633also removed drm_virtio_set_busid(), for which the same consolidation was not appropriate: this .set_busid callback had been implemented with drm_pci_set_busid(), and not drm_platform_set_busid(). The error regressed Xorg/xserver on QEMU's "virtio-vga" card; the drmGetBusid() function from libdrm would no longer return stable PCI identifiers like "pci:0000:00:02.0", but rather unstable platform ones like "virtio0". Reinstate drm_virtio_set_busid() with judicious use of git checkout -p a325725633c2^ -- drivers/gpu/drm/virtio Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Emil Velikov <emil.l.velikov@gmail.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Joachim Frieben <jfrieben@hotmail.com> Cc: stable@vger.kernel.org # v4.8 Reported-by: Joachim Frieben <jfrieben@hotmail.com> Fixes:a325725633Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1366842 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
97 lines
2.7 KiB
C
97 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <drm/drm_fb_helper.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)
|
|
{
|
|
struct apertures_struct *ap;
|
|
bool primary;
|
|
|
|
ap = alloc_apertures(1);
|
|
if (!ap)
|
|
return;
|
|
|
|
ap->ranges[0].base = pci_resource_start(pci_dev, 0);
|
|
ap->ranges[0].size = pci_resource_len(pci_dev, 0);
|
|
|
|
primary = pci_dev->resource[PCI_ROM_RESOURCE].flags
|
|
& IORESOURCE_ROM_SHADOW;
|
|
|
|
drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb", primary);
|
|
|
|
kfree(ap);
|
|
}
|
|
|
|
int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
|
|
{
|
|
struct drm_device *dev;
|
|
int ret;
|
|
|
|
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) {
|
|
struct pci_dev *pdev = to_pci_dev(vdev->dev.parent);
|
|
bool vga = (pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA;
|
|
|
|
DRM_INFO("pci: %s detected\n",
|
|
vga ? "virtio-vga" : "virtio-gpu-pci");
|
|
dev->pdev = pdev;
|
|
if (vga)
|
|
virtio_pci_kick_out_firmware_fb(pdev);
|
|
}
|
|
|
|
ret = drm_dev_register(dev, 0);
|
|
if (ret)
|
|
goto err_free;
|
|
|
|
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name,
|
|
driver->major, driver->minor, driver->patchlevel,
|
|
driver->date, dev->primary->index);
|
|
|
|
return 0;
|
|
|
|
err_free:
|
|
drm_dev_unref(dev);
|
|
return ret;
|
|
}
|