Attachment 37845 Details for Bug 29556 – rebased V2 blit patch from dri-devel

[patch] rebased V2 blit patch from dri-devel

fix-blit.patch (text/plain), 1.62 KB, created by Marc Dietrich on 2010-08-13 05:14:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Dietrich

Created: 2010-08-13 05:14:33 UTC

Size: 1.62 KB

patch

obsolete

>commit 310493a649ccc214c54efc32f5557419a740388f
>Author: Marc Dietrich <marvin24@gmx.de>
>Date:   Thu Aug 12 17:16:59 2010 +0200
>
>    modify blit init
>
>diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
>index 37f6181..8d3f4f3 100644
>--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
>@@ -448,19 +448,8 @@ int r600_blit_init(struct radeon_device *rdev)
> 	int num_packet2s = 0;
> 
> 	/* pin copy shader into vram if already initialized */
>-	if (rdev->r600_blit.shader_obj) {
>-		r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
>-		if (unlikely(r != 0))
>-			return r;
>-		r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
>-				  &rdev->r600_blit.shader_gpu_addr);
>-		radeon_bo_unreserve(rdev->r600_blit.shader_obj);
>-		if (r) {
>-			dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
>-			return r;
>-		}
>-		return 0;
>-	}
>+	if (rdev->r600_blit.shader_obj) 
>+		goto done;
> 
> 	mutex_init(&rdev->r600_blit.mutex);
> 	rdev->r600_blit.state_offset = 0;
>@@ -519,6 +508,18 @@ int r600_blit_init(struct radeon_device *rdev)
> 	memcpy(ptr + rdev->r600_blit.ps_offset, r6xx_ps, r6xx_ps_size * 4);
> 	radeon_bo_kunmap(rdev->r600_blit.shader_obj);
> 	radeon_bo_unreserve(rdev->r600_blit.shader_obj);
>+
>+done:
>+	r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
>+	if (unlikely(r != 0))
>+		return r;
>+	r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
>+			  &rdev->r600_blit.shader_gpu_addr);
>+	radeon_bo_unreserve(rdev->r600_blit.shader_obj);
>+	if (r) {
>+		dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
>+		return r;
>+	}
> 	return 0;
> }
>

Actions: View | Splinter Review

Attachments on bug 29556: 37840 | 37841 | 37845

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.