Attachment 9520 Details for Bug 10561 – Don't sleep between texture upload ioctls, drop hardware lock instead

[patch] Don't sleep between texture upload ioctls, drop hardware lock instead

r300-texupload-nosleep.patch (text/plain), 1.48 KB, created by Michel Dänzer on 2007-04-09 01:59:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2007-04-09 01:59:56 UTC

Size: 1.48 KB

patch

obsolete

>r300: Don't sleep between texture upload ioctl calls.
>
>From: (null) <michel@tungstengraphics.com>
>
>Drop the hardware lock instead, so others get a chance to grab it and try
>and do something useful.
>---
>
> src/mesa/drivers/dri/r300/r300_texmem.c |   11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
>index 2db6dc5..9287ee3 100644
>--- a/src/mesa/drivers/dri/r300/r300_texmem.c
>+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
>@@ -43,7 +43,6 @@ SOFTWARE.
> #include "colormac.h"
> #include "macros.h"
> #include "simple_list.h"
>-#include "radeon_reg.h"		/* gets definition for usleep */
> #include "r300_context.h"
> #include "r300_state.h"
> #include "r300_cmdbuf.h"
>@@ -53,7 +52,6 @@ SOFTWARE.
> */
> #include "r300_tex.h"
> #include "r300_ioctl.h"
>-#include <unistd.h>		/* for usleep() */
> 
> #ifdef USER_BUFFERS
> #include "radeon_mm.h"
>@@ -467,10 +465,11 @@ static void uploadSubImage( r300ContextPtr rmesa, r300TexObjPtr t,
> 	do {
> 		ret = drmCommandWriteRead( rmesa->radeon.dri.fd, DRM_RADEON_TEXTURE,
> 		                           &tex, sizeof(drm_radeon_texture_t) );
>-		if (ret) {
>-		if (RADEON_DEBUG & DEBUG_IOCTL)
>-		fprintf(stderr, "DRM_RADEON_TEXTURE:  again!\n");
>-		usleep(1);
>+		if (ret == -EAGAIN) {
>+			UNLOCK_HARDWARE( &rmesa->radeon );
>+			if (RADEON_DEBUG & DEBUG_IOCTL)
>+				fprintf(stderr, "DRM_RADEON_TEXTURE:  again!\n");
>+			LOCK_HARDWARE( &rmesa->radeon );
> 		}
> 	} while ( ret == -EAGAIN );
>

Actions: View | Splinter Review

Attachments on bug 10561: 9520

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.