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(). Commita325725633
removed 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, commita325725633
also 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:a325725633
Ref: 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>
161 lines
4.8 KiB
C
161 lines
4.8 KiB
C
/*
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* Authors:
|
|
* Dave Airlie <airlied@redhat.com>
|
|
* Gerd Hoffmann <kraxel@redhat.com>
|
|
*
|
|
* 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
|
|
* VA LINUX SYSTEMS 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/module.h>
|
|
#include <linux/console.h>
|
|
#include <linux/pci.h>
|
|
#include "drmP.h"
|
|
#include "drm/drm.h"
|
|
|
|
#include "virtgpu_drv.h"
|
|
static struct drm_driver driver;
|
|
|
|
static int virtio_gpu_modeset = -1;
|
|
|
|
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
|
|
module_param_named(modeset, virtio_gpu_modeset, int, 0400);
|
|
|
|
static int virtio_gpu_probe(struct virtio_device *vdev)
|
|
{
|
|
if (vgacon_text_force() && virtio_gpu_modeset == -1)
|
|
return -EINVAL;
|
|
|
|
if (virtio_gpu_modeset == 0)
|
|
return -EINVAL;
|
|
|
|
return drm_virtio_init(&driver, vdev);
|
|
}
|
|
|
|
static void virtio_gpu_remove(struct virtio_device *vdev)
|
|
{
|
|
struct drm_device *dev = vdev->priv;
|
|
drm_put_dev(dev);
|
|
}
|
|
|
|
static void virtio_gpu_config_changed(struct virtio_device *vdev)
|
|
{
|
|
struct drm_device *dev = vdev->priv;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
|
|
schedule_work(&vgdev->config_changed_work);
|
|
}
|
|
|
|
static struct virtio_device_id id_table[] = {
|
|
{ VIRTIO_ID_GPU, VIRTIO_DEV_ANY_ID },
|
|
{ 0 },
|
|
};
|
|
|
|
static unsigned int features[] = {
|
|
#ifdef __LITTLE_ENDIAN
|
|
/*
|
|
* Gallium command stream send by virgl is native endian.
|
|
* Because of that we only support little endian guests on
|
|
* little endian hosts.
|
|
*/
|
|
VIRTIO_GPU_F_VIRGL,
|
|
#endif
|
|
};
|
|
static struct virtio_driver virtio_gpu_driver = {
|
|
.feature_table = features,
|
|
.feature_table_size = ARRAY_SIZE(features),
|
|
.driver.name = KBUILD_MODNAME,
|
|
.driver.owner = THIS_MODULE,
|
|
.id_table = id_table,
|
|
.probe = virtio_gpu_probe,
|
|
.remove = virtio_gpu_remove,
|
|
.config_changed = virtio_gpu_config_changed
|
|
};
|
|
|
|
module_virtio_driver(virtio_gpu_driver);
|
|
|
|
MODULE_DEVICE_TABLE(virtio, id_table);
|
|
MODULE_DESCRIPTION("Virtio GPU driver");
|
|
MODULE_LICENSE("GPL and additional rights");
|
|
MODULE_AUTHOR("Dave Airlie <airlied@redhat.com>");
|
|
MODULE_AUTHOR("Gerd Hoffmann <kraxel@redhat.com>");
|
|
MODULE_AUTHOR("Alon Levy");
|
|
|
|
static const struct file_operations virtio_gpu_driver_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = drm_open,
|
|
.mmap = virtio_gpu_mmap,
|
|
.poll = drm_poll,
|
|
.read = drm_read,
|
|
.unlocked_ioctl = drm_ioctl,
|
|
.release = drm_release,
|
|
#ifdef CONFIG_COMPAT
|
|
.compat_ioctl = drm_compat_ioctl,
|
|
#endif
|
|
.llseek = noop_llseek,
|
|
};
|
|
|
|
|
|
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,
|
|
.postclose = virtio_gpu_driver_postclose,
|
|
|
|
.dumb_create = virtio_gpu_mode_dumb_create,
|
|
.dumb_map_offset = virtio_gpu_mode_dumb_mmap,
|
|
.dumb_destroy = virtio_gpu_mode_dumb_destroy,
|
|
|
|
#if defined(CONFIG_DEBUG_FS)
|
|
.debugfs_init = virtio_gpu_debugfs_init,
|
|
.debugfs_cleanup = virtio_gpu_debugfs_takedown,
|
|
#endif
|
|
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
|
|
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
|
|
.gem_prime_export = drm_gem_prime_export,
|
|
.gem_prime_import = drm_gem_prime_import,
|
|
.gem_prime_pin = virtgpu_gem_prime_pin,
|
|
.gem_prime_unpin = virtgpu_gem_prime_unpin,
|
|
.gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table,
|
|
.gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,
|
|
.gem_prime_vmap = virtgpu_gem_prime_vmap,
|
|
.gem_prime_vunmap = virtgpu_gem_prime_vunmap,
|
|
.gem_prime_mmap = virtgpu_gem_prime_mmap,
|
|
|
|
.gem_free_object_unlocked = virtio_gpu_gem_free_object,
|
|
.gem_open_object = virtio_gpu_gem_object_open,
|
|
.gem_close_object = virtio_gpu_gem_object_close,
|
|
.fops = &virtio_gpu_driver_fops,
|
|
|
|
.ioctls = virtio_gpu_ioctls,
|
|
.num_ioctls = DRM_VIRTIO_NUM_IOCTLS,
|
|
|
|
.name = DRIVER_NAME,
|
|
.desc = DRIVER_DESC,
|
|
.date = DRIVER_DATE,
|
|
.major = DRIVER_MAJOR,
|
|
.minor = DRIVER_MINOR,
|
|
.patchlevel = DRIVER_PATCHLEVEL,
|
|
};
|