Commit 46bfdf9a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Nuke SET_UNIQUE ioctl 



Ever since

commit 2e1868b560315a8b20d688e646c489a5ad93eeae
Author: Eric Anholt <anholt@freebsd.org>
Date:   Wed Jun 16 09:25:21 2004 +0000

    DRI trunk-20040613 import

the X server supports drm 1.1, thus doesn't call call libdrm's
drmSetBusid - the sole user of this ioctl. When reviewing this note
that for hilarity both the kernel-internal functions (set_busid) and
the libdrm wrapper (drmSetBusid) have names not matching this ioctl
(SET_UNIQUE).

v2: Polish commit message (Emil).

Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466499262-18717-6-git-send-email-daniel.vetter@ffwll.ch
parent a742946a

drivers/gpu/drm/drm_internal.h

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ extern struct mutex drm_global_mutex; 
void drm_lastclose(struct drm_device *dev);



/* drm_pci.c */

int drm_pci_set_unique(struct drm_device *dev,

		       struct drm_master *master,

		       struct drm_unique *u);

int drm_irq_by_busid(struct drm_device *dev, void *data,

		     struct drm_file *file_priv);

drivers/gpu/drm/drm_ioctl.c

+1 −46
Original line number Diff line number Diff line
@@ -75,51 +75,6 @@ drm_unset_busid(struct drm_device *dev, 
	master->unique_len = 0;

}



/*

 * Set the bus id.

 *

 * \param inode device inode.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg user argument, pointing to a drm_unique structure.

 * \return zero on success or a negative number on failure.

 *

 * Copies the bus id from userspace into drm_device::unique, and verifies that

 * it matches the device this DRM is attached to (EINVAL otherwise).  Deprecated

 * in interface version 1.1 and will return EBUSY when setversion has requested

 * version 1.1 or greater. Also note that KMS is all version 1.1 and later and

 * UMS was only ever supported on pci devices.

 */

static int drm_setunique(struct drm_device *dev, void *data,

		  struct drm_file *file_priv)

{

	struct drm_unique *u = data;

	struct drm_master *master = file_priv->master;

	int ret;



	if (master->unique_len || master->unique)

		return -EBUSY;



	if (!u->unique_len || u->unique_len > 1024)

		return -EINVAL;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return 0;



	if (WARN_ON(!dev->pdev))

		return -EINVAL;



	ret = drm_pci_set_unique(dev, master, u);

	if (ret)

		goto err;



	return 0;



err:

	drm_unset_busid(dev, master);

	return ret;

}



static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)

{

	struct drm_master *master = file_priv->master;
@@ -508,7 +463,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_SET_CLIENT_CAP, drm_setclientcap, 0),

	DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),



	DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_UNLOCKED|DRM_MASTER),

drivers/gpu/drm/drm_pci.c

+0 −51
Original line number Diff line number Diff line
@@ -144,50 +144,6 @@ int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master) 
}

EXPORT_SYMBOL(drm_pci_set_busid);



int drm_pci_set_unique(struct drm_device *dev,

		       struct drm_master *master,

		       struct drm_unique *u)

{

	int domain, bus, slot, func, ret;



	master->unique_len = u->unique_len;

	master->unique = kmalloc(master->unique_len + 1, GFP_KERNEL);

	if (!master->unique) {

		ret = -ENOMEM;

		goto err;

	}



	if (copy_from_user(master->unique, u->unique, master->unique_len)) {

		ret = -EFAULT;

		goto err;

	}



	master->unique[master->unique_len] = '\0';



	/* Return error if the busid submitted doesn't match the device's actual

	 * busid.

	 */

	ret = sscanf(master->unique, "PCI:%d:%d:%d", &bus, &slot, &func);

	if (ret != 3) {

		ret = -EINVAL;

		goto err;

	}



	domain = bus >> 8;

	bus &= 0xff;



	if ((domain != drm_get_pci_domain(dev)) ||

	    (bus != dev->pdev->bus->number) ||

	    (slot != PCI_SLOT(dev->pdev->devfn)) ||

	    (func != PCI_FUNC(dev->pdev->devfn))) {

		ret = -EINVAL;

		goto err;

	}

	return 0;

err:

	return ret;

}



static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)

{

	if ((p->busnum >> 8) != drm_get_pci_domain(dev) ||
@@ -444,13 +400,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, 
{

	return -EINVAL;

}



int drm_pci_set_unique(struct drm_device *dev,

		       struct drm_master *master,

		       struct drm_unique *u)

{

	return -EINVAL;

}

#endif



EXPORT_SYMBOL(drm_pci_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE