iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gma500: sort out the file operations

Browse Source 
Route everything via the proper DRM layer calls. This fixes the crash in
plymouth and is also necessary to begin supporting libkms.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-05-09 16:04:32 +01:00 committed by Greg Kroah-Hartman
parent b18aaa1c7c
commit ea1ce3762b
1 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/gma500/psb_drv.c
View File

@ -1313,13 +1313,6 @@ static int psb_register_rw_ioctl(struct drm_device *dev, void *data,
return 0; return 0;
} }
/* always available as we are SIGIO'd */
static unsigned int psb_poll(struct file *filp,
struct poll_table_struct *wait)
{
return POLLIN | POLLRDNORM;
}
static int psb_driver_open(struct drm_device *dev, struct drm_file *priv) static int psb_driver_open(struct drm_device *dev, struct drm_file *priv)
{ {
return 0; return 0;
@ -1345,29 +1338,9 @@ static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,
pm_runtime_allow(&dev->pdev->dev); pm_runtime_allow(&dev->pdev->dev);
dev_priv->rpm_enabled = 1; dev_priv->rpm_enabled = 1;
} }
/*
* The driver private ioctls should be thread-safe.
*/
if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
&& (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
struct drm_ioctl_desc *ioctl =
&psb_ioctls[nr - DRM_COMMAND_BASE];
if (unlikely(ioctl->cmd != cmd)) {
DRM_ERROR(
"Invalid drm cmnd %d ioctl->cmd %x, cmd %x\n",
nr - DRM_COMMAND_BASE, ioctl->cmd, cmd);
return -EINVAL;
}
return drm_ioctl(filp, cmd, arg);
}
/*
* Not all old drm ioctls are thread-safe.
*/
return drm_ioctl(filp, cmd, arg); return drm_ioctl(filp, cmd, arg);
/* FIXME: do we need to wrap the other side of this */
} }
@ -1384,17 +1357,6 @@ static void psb_remove(struct pci_dev *pdev)
drm_put_dev(dev); drm_put_dev(dev);
} }
static int psb_open(struct inode *inode, struct file *filp)
{
return 0;
}
static int psb_release(struct inode *inode, struct file *filp)
{
return 0;
}
static const struct dev_pm_ops psb_pm_ops = { static const struct dev_pm_ops psb_pm_ops = {
.runtime_suspend = psb_runtime_suspend, .runtime_suspend = psb_runtime_suspend,
.runtime_resume = psb_runtime_resume, .runtime_resume = psb_runtime_resume,
@ -1438,11 +1400,11 @@ static struct drm_driver driver = {
.fops = { .fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = psb_open, .open = drm_open,
.release = psb_release, .release = drm_release,
.unlocked_ioctl = psb_unlocked_ioctl, .unlocked_ioctl = psb_unlocked_ioctl,
/* .mmap = psb_mmap, */ .mmap = drm_mmap,
.poll = psb_poll, .poll = drm_poll,
.fasync = drm_fasync, .fasync = drm_fasync,
.read = drm_read, .read = drm_read,
}, },