[PATCH] gma500: Fix clashes with DRM updates

[PATCH] gma500: Fix clashes with DRM updates

[Alan Cox]

From: Alan Cox <alan@linux.intel.com>

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>
---

 drivers/staging/gma500/gem_glue.c |   23 +----------------------
 drivers/staging/gma500/gem_glue.h |    2 --
 2 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/gma500/gem_glue.c b/drivers/staging/gma500/gem_glue.c
index 779ac1a..daac121 100644
--- a/drivers/staging/gma500/gem_glue.c
+++ b/drivers/staging/gma500/gem_glue.c
@@ -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);
 }
 
 /**
diff --git a/drivers/staging/gma500/gem_glue.h b/drivers/staging/gma500/gem_glue.h
index a0f2bc4..ce5ce30 100644
--- a/drivers/staging/gma500/gem_glue.h
+++ b/drivers/staging/gma500/gem_glue.h
@@ -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);

Re: [PATCH] gma500: Fix clashes with DRM updates

[H. Peter Anvin]

On 07/26/2011 09:15 AM, Alan Cox wrote:
> From: Alan Cox <alan@linux.intel.com>
> 
> 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>

This patch is needed in Linus' tree, as it is currently causing a build
failure for either i386 or x86_64 allyesconfig.

	-hpa

Re: [PATCH] gma500: Fix clashes with DRM updates

[Greg KH]

On Tue, Aug 02, 2011 at 01:37:51PM -0700, H. Peter Anvin wrote:
> On 07/26/2011 09:15 AM, Alan Cox wrote:
> > From: Alan Cox <alan@linux.intel.com>
> > 
> > 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>
> 
> This patch is needed in Linus' tree, as it is currently causing a build
> failure for either i386 or x86_64 allyesconfig.

Ick, it is?  I don't see that here on my builds, what am I doing wrong?

confused,

greg k-h

Re: [PATCH] gma500: Fix clashes with DRM updates

[H. Peter Anvin]

On 08/02/2011 01:48 PM, Greg KH wrote:
> On Tue, Aug 02, 2011 at 01:37:51PM -0700, H. Peter Anvin wrote:
>> On 07/26/2011 09:15 AM, Alan Cox wrote:
>>> From: Alan Cox <alan@linux.intel.com>
>>>
>>> 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>
>>
>> This patch is needed in Linus' tree, as it is currently causing a build
>> failure for either i386 or x86_64 allyesconfig.
> 
> Ick, it is?  I don't see that here on my builds, what am I doing wrong?
> 
> confused,
> 

No idea, but do a "make allyesconfig" on Linus' tree and you'll see it.

	-hpa

Re: [PATCH] gma500: Fix clashes with DRM updates

[Greg KH]

On Tue, Aug 02, 2011 at 01:59:08PM -0700, H. Peter Anvin wrote:
> On 08/02/2011 01:48 PM, Greg KH wrote:
> > On Tue, Aug 02, 2011 at 01:37:51PM -0700, H. Peter Anvin wrote:
> >> On 07/26/2011 09:15 AM, Alan Cox wrote:
> >>> From: Alan Cox <alan@linux.intel.com>
> >>>
> >>> 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>
> >>
> >> This patch is needed in Linus' tree, as it is currently causing a build
> >> failure for either i386 or x86_64 allyesconfig.
> > 
> > Ick, it is?  I don't see that here on my builds, what am I doing wrong?
> > 
> > confused,
> > 
> 
> No idea, but do a "make allyesconfig" on Linus' tree and you'll see it.

Ah, it's a link error, now I see it.  I'll queue it up, and some other
staging tree fixes and get them to Linus very soon now.

thanks,

greg k-h