Mesa (10.2): freedreno/a3xx: fix depth/stencil gmem restore

[Carl Worth]

Module: Mesa
Branch: 10.2
Commit: cffb35c0f444ca1b3014a49fae5017e15c756f26
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cffb35c0f444ca1b3014a49fae5017e15c756f26

Author: Rob Clark <robclark at freedesktop.org>
Date:   Wed May 21 15:41:25 2014 -0400

freedreno/a3xx: fix depth/stencil gmem restore

We already multiply by bytes per pixel for this, so f3ba7611 broke
mem2gmem for depth/stencil.  Drop the now-redundant mutiply by cpp.

Signed-off-by: Rob Clark <robclark at freedesktop.org>
(cherry picked from commit b81de5352dc8f3db01888175561b816c0d92716b)

---

 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
index 7db049f..0c9dd99 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
@@ -82,7 +82,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
 				stride = bin_w * rsc->cpp;
 
 				if (bases) {
-					base = bases[i] * rsc->cpp;
+					base = bases[i];
 				}
 			} else {
 				stride = slice->pitch * rsc->cpp;