Skip to contentSkip to conversation

standard/default/emenlow update

PATCH In review [email protected] 2 participants 4 messages Apr 25, 2012 – Apr 26, 2012 DRM drivers

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover standard/default/emenlow update

From: Tom Zanussi <[email protected]>

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(-)
author
#1 lore raw

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

From: Tom Zanussi <[email protected]>

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

Signed-off-by Tom Zanussi <[email protected]>
---
 drivers/gpu/drm-psb/drm_lock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm-psb/drm_lock.c +2 -0
index b8e4a5d..ba6630e 100644
@@ -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;
Signature · 1 line
1.7.0.4
#2 lore raw
In reply to [email protected]
Quoted 7 lines · On 12-04-25 10:11 AM, [email protected] wrote:

From: Tom Zanussi<[email protected]>

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

Quoted 12 lines

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(-)
#3 lore raw
Quoted 5 lines · Bruce Ashfield
Quoted 4 lines · On 12-04-25 10:11 AM, [email protected] wrote:

From: Tom Zanussi<[email protected]>

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

Quoted 8 lines
Quoted 4 lines

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

Quoted 22 lines

Bruce

Quoted 8 lines

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

Quoted 6 lines

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
[email protected]
https://lists.yoctoproject.org/listinfo/yocto