Skip to content

Commit

Permalink
vmwgfx: Remove initialisation of dev::devname
Browse files Browse the repository at this point in the history
The removed code causes oopses with newer drms on master drop.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Thomas Hellstrom authored and Dave Airlie committed Oct 1, 2010
1 parent 7a1c2f6 commit f1a28ee
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ static struct pci_device_id vmw_pci_id_list[] = {
{0, 0, 0}
};

static char *vmw_devname = "vmwgfx";
static int enable_fbdev;

static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
Expand Down Expand Up @@ -407,9 +406,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
"running the device in SVGA mode yet.\n");
}

if (!dev->devname)
dev->devname = vmw_devname;

if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {
ret = drm_irq_install(dev);
if (unlikely(ret != 0)) {
Expand Down Expand Up @@ -466,8 +462,6 @@ static int vmw_driver_unload(struct drm_device *dev)

if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
drm_irq_uninstall(dev_priv->dev);
if (dev->devname == vmw_devname)
dev->devname = NULL;
if (dev_priv->enable_fb) {
vmw_fb_close(dev_priv);
vmw_kms_restore_vga(dev_priv);
Expand Down

0 comments on commit f1a28ee

Please sign in to comment.