dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

gma500: Fix clashes with DRM updates 

The private object support has migrated from gma500 into the DRM core,
remove our now clashing copy so -next can build.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-07-26 17:15:50 +01:00 committed by Greg Kroah-Hartman
parent fd6b68bbac
commit 2f8d92b777
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/gma500/gem_glue.c
View File

@ -20,26 +20,6 @@
#include <drm/drmP.h>
#include <drm/drm.h>
/**
* Initialize an already allocated GEM object of the specified size with
* no GEM provided backing store. Instead the caller is responsible for
* backing the object and handling it.
*/
int drm_gem_private_object_init(struct drm_device *dev,
struct drm_gem_object *obj, size_t size)
{
BUG_ON((size & (PAGE_SIZE - 1)) != 0);
obj->dev = dev;
obj->filp = NULL;
kref_init(&obj->refcount);
atomic_set(&obj->handle_count, 0);
obj->size = size;
return 0;
}
void drm_gem_object_release_wrap(struct drm_gem_object *obj)
{
/* Remove the list map if one is present */
@ -51,8 +31,7 @@ void drm_gem_object_release_wrap(struct drm_gem_object *obj)
kfree(list->map);
list->map = NULL;
}
if (obj->filp)
drm_gem_object_release(obj);
drm_gem_object_release(obj);
}
/**

2
drivers/staging/gma500/gem_glue.h
View File

@ -1,4 +1,2 @@
extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);
extern int drm_gem_private_object_init(struct drm_device *dev,
struct drm_gem_object *obj, size_t size);
extern int gem_create_mmap_offset(struct drm_gem_object *obj);