[PATCH 0/1][3.2 KERNEL] standard/default/emenlow update

[PATCH 0/1][3.2 KERNEL] standard/default/emenlow update

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This fixes [YOCTO #1669].  Please pull into linux-yocto-3.2.

The following changes since commit 86d05af47be45c786c1823a76b6854fa8b411bec:
  Bruce Ashfield (1):
        Merge branch 'yocto/standard/base' into standard/default/emenlow

are available in the git repository at:

  git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/drm-lock-fix
  http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/commit/?h=tzanussi/drm-lock-fix

Tom Zanussi (1):
  bsp/emenlow: give up drm_global_mutex on contention in drm_lock()

 drivers/gpu/drm-psb/drm_lock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

[PATCH 1/1][3.2 KERNEL] bsp/emenlow: give up drm_global_mutex on contention in drm_lock()

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

If drm_lock_take() fails, give up the global ioctl mutex and allow
other locked ioctls in the meantime.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 drivers/gpu/drm-psb/drm_lock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm-psb/drm_lock.c b/drivers/gpu/drm-psb/drm_lock.c
index b8e4a5d..ba6630e 100644
--- a/drivers/gpu/drm-psb/drm_lock.c
+++ b/drivers/gpu/drm-psb/drm_lock.c
@@ -89,7 +89,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 		}
 
 		/* Contention */
+		mutex_unlock(&drm_global_mutex);
 		schedule();
+		mutex_lock(&drm_global_mutex);
 		if (signal_pending(current)) {
 			ret = -ERESTARTSYS;
 			break;
-- 
1.7.0.4

Re: [PATCH 0/1][3.2 KERNEL] standard/default/emenlow update

[Bruce Ashfield]

On 12-04-25 10:11 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This fixes [YOCTO #1669].  Please pull into linux-yocto-3.2.
>
> The following changes since commit 86d05af47be45c786c1823a76b6854fa8b411bec:
>    Bruce Ashfield (1):
>          Merge branch 'yocto/standard/base' into standard/default/emenlow

Looks fine. I'll merge this into a spot that only the psb boards
will pick up, and we won't need any core SRCREV updates .. to stay
out of the 1.2 release's way.

Bruce

>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/drm-lock-fix
>    http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/commit/?h=tzanussi/drm-lock-fix
>
> Tom Zanussi (1):
>    bsp/emenlow: give up drm_global_mutex on contention in drm_lock()
>
>   drivers/gpu/drm-psb/drm_lock.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>

Re: [PATCH 0/1][3.2 KERNEL] standard/default/emenlow update

[Bruce Ashfield]

On 12-04-25 01:17 PM, Bruce Ashfield wrote:
> On 12-04-25 10:11 AM, tom.zanussi@intel.com wrote:
>> From: Tom Zanussi<tom.zanussi@intel.com>
>>
>> This fixes [YOCTO #1669]. Please pull into linux-yocto-3.2.
>>
>> The following changes since commit
>> 86d05af47be45c786c1823a76b6854fa8b411bec:
>> Bruce Ashfield (1):
>> Merge branch 'yocto/standard/base' into standard/default/emenlow
>
> Looks fine. I'll merge this into a spot that only the psb boards
> will pick up, and we won't need any core SRCREV updates .. to stay
> out of the 1.2 release's way.

both emenlow updates are pushed to the 3.2 tree now. Feel free
to update your SRCREVs.

Bruce

>
> Bruce
>
>>
>> are available in the git repository at:
>>
>> git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git
>> tzanussi/drm-lock-fix
>> http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/commit/?h=tzanussi/drm-lock-fix
>>
>>
>> Tom Zanussi (1):
>> bsp/emenlow: give up drm_global_mutex on contention in drm_lock()
>>
>> drivers/gpu/drm-psb/drm_lock.c | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto