Revert "r300: Perform the locking closer to the DRM texture upload call."

This reverts commit 93881edb46fc95e1cfb4ded4e8a5db92612d3e4d.

diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index 30f3886542fa79690c64205e761aae28fbbbfd79..eef5ff186f4c991cddfbd71847f1041c2abae7d5 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -469,14 +469,12 @@ static void r300UploadSubImage(r300ContextPtr rmesa, r300TexObjPtr t,
                }
        }
 
+       LOCK_HARDWARE(&rmesa->radeon);
        do {
-               LOCK_HARDWARE(&rmesa->radeon);
                ret =
                    drmCommandWriteRead(rmesa->radeon.dri.fd,
                                        DRM_RADEON_TEXTURE, &tex,
                                        sizeof(drm_radeon_texture_t));
-               UNLOCK_HARDWARE(&rmesa->radeon);
-
                if (ret) {
                        if (RADEON_DEBUG & DEBUG_IOCTL)
                                fprintf(stderr,
@@ -485,6 +483,8 @@ static void r300UploadSubImage(r300ContextPtr rmesa, r300TexObjPtr t,
                }
        } while (ret == -EAGAIN);
 
+       UNLOCK_HARDWARE(&rmesa->radeon);
+
        if (ret) {
                fprintf(stderr, "DRM_RADEON_TEXTURE: return = %d\n", ret);
                fprintf(stderr, "   offset=0x%08x\n", offset);