From d4dbf457813e97531ded3bf24f3b6ad421189c69 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 24 Aug 2004 11:15:53 +0000 Subject: Merged drmfntbl-0-0-2 --- linux-core/drm_scatter.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux-core/drm_scatter.c') diff --git a/linux-core/drm_scatter.c b/linux-core/drm_scatter.c index 4aaf89d4..89ac166a 100644 --- a/linux-core/drm_scatter.c +++ b/linux-core/drm_scatter.c @@ -74,6 +74,9 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp, DRM_DEBUG( "%s\n", __FUNCTION__ ); + if ( dev->driver_features & DRIVER_SG ) + return -EINVAL; + if ( dev->sg ) return -EINVAL; @@ -207,6 +210,9 @@ int DRM(sg_free)( struct inode *inode, struct file *filp, drm_scatter_gather_t request; drm_sg_mem_t *entry; + if ( dev->driver_features & DRIVER_SG ) + return -EINVAL; + if ( copy_from_user( &request, (drm_scatter_gather_t __user *)arg, sizeof(request) ) ) -- cgit v1.2.3