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:
parent
fd6b68bbac
commit
2f8d92b777
|
@ -20,26 +20,6 @@
|
||||||
#include <drm/drmP.h>
|
#include <drm/drmP.h>
|
||||||
#include <drm/drm.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)
|
void drm_gem_object_release_wrap(struct drm_gem_object *obj)
|
||||||
{
|
{
|
||||||
/* Remove the list map if one is present */
|
/* 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);
|
kfree(list->map);
|
||||||
list->map = NULL;
|
list->map = NULL;
|
||||||
}
|
}
|
||||||
if (obj->filp)
|
drm_gem_object_release(obj);
|
||||||
drm_gem_object_release(obj);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,4 +1,2 @@
|
||||||
extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);
|
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);
|
extern int gem_create_mmap_offset(struct drm_gem_object *obj);
|
||||||
|
|
Loading…
Reference in New Issue