Attachment 73844 Details for Bug 60028 – diff of attempt to manually revert entire problem commit

diff of attempt to manually revert entire problem commit

attempted-revert2-full.txt (text/plain), 3.83 KB, created by Dave Witbrodt on 2013-01-29 16:12:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Witbrodt

Created: 2013-01-29 16:12:45 UTC

Size: 3.83 KB

patch

obsolete

>--- a/drivers/gpu/drm/radeon/r600_cs.c
>+++ b/drivers/gpu/drm/radeon/r600_cs.c
>@@ -657,30 +657,87 @@
> 			/* nby is npipes htiles aligned == npipes * 8 pixel aligned */
> 			nby = round_up(nby, track->npipes * 8);
> 		} else {
>-			/* always assume 8x8 htile */
>+			/* htile widht & nby (8 or 4) make 2 bits number */
>+			tmp = track->htile_surface & 3;
> 			/* align is htile align * 8, htile align vary according to
> 			 * number of pipe and tile width and nby
> 			 */
> 			switch (track->npipes) {
> 			case 8:
>-				/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>-				nbx = round_up(nbx, 64 * 8);
>-				nby = round_up(nby, 64 * 8);
>+				switch (tmp) {
>+				case 3:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>+					nbx = round_up(nbx, 64 * 8);
>+					nby = round_up(nby, 64 * 8);
>+					break;
>+				case 2:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 8*/
>+				case 1:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 64 * 8);
>+					nby = round_up(nby, 32 * 8);
>+					break;
>+				case 0:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 32 * 8);
>+					break;
>+				default:
>+					return -EINVAL;
>+				}
> 				break;
> 			case 4:
>-				/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>-				nbx = round_up(nbx, 64 * 8);
>-				nby = round_up(nby, 32 * 8);
>+				switch (tmp) {
>+				case 3:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>+					nbx = round_up(nbx, 64 * 8);
>+					nby = round_up(nby, 32 * 8);
>+					break;
>+				case 2:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 8*/
>+				case 1:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 32 * 8);
>+					break;
>+				case 0:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 16 * 8);
>+					break;
>+				default:
>+					return -EINVAL;
>+				}
> 				break;
> 			case 2:
>-				/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>-				nbx = round_up(nbx, 32 * 8);
>-				nby = round_up(nby, 32 * 8);
>+				switch (tmp) {
>+				case 3:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 32 * 8);
>+					break;
>+				case 2:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 8*/
>+				case 1:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 16 * 8);
>+					break;
>+				case 0:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 16 * 8);
>+					nby = round_up(nby, 16 * 8);
>+					break;
>+				default:
>+					return -EINVAL;
>+				}
> 				break;
> 			case 1:
>-				/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>-				nbx = round_up(nbx, 32 * 8);
>-				nby = round_up(nby, 16 * 8);
>+				switch (tmp) {
>+				case 3:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
>+					nbx = round_up(nbx, 32 * 8);
>+					nby = round_up(nby, 16 * 8);
>+					break;
>+				case 2:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 8*/
>+				case 1:	/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 16 * 8);
>+					nby = round_up(nby, 16 * 8);
>+					break;
>+				case 0:	/* HTILE_WIDTH = 4 & HTILE_HEIGHT = 4*/
>+					nbx = round_up(nbx, 16 * 8);
>+					nby = round_up(nby, 8 * 8);
>+					break;
>+				default:
>+					return -EINVAL;
>+				}
> 				break;
> 			default:
> 				dev_warn(p->dev, "%s:%d invalid num pipes %d\n",
>@@ -689,10 +746,9 @@
> 			}
> 		}
> 		/* compute number of htile */
>-		nbx = nbx >> 3;
>-		nby = nby >> 3;
>-		/* size must be aligned on npipes * 2K boundary */
>-		size = roundup(nbx * nby * 4, track->npipes * (2 << 10));
>+		nbx = G_028D24_HTILE_WIDTH(track->htile_surface) ? nbx / 8 : nbx / 4;
>+		nby = G_028D24_HTILE_HEIGHT(track->htile_surface) ? nby / 8 : nby / 4;
>+		size = nbx * nby * 4;
> 		size += track->htile_offset;
> 
> 		if (size > radeon_bo_size(track->htile_bo)) {
>@@ -1437,7 +1493,7 @@
> 	case DB_HTILE_SURFACE:
> 		track->htile_surface = radeon_get_ib_value(p, idx);
> 		/* force 8x8 htile width and height */
>-		ib[idx] |= 3;
>+		/* ib[idx] |= 3; */
> 		track->db_dirty = true;
> 		break;
> 	case SQ_PGM_START_FS:

Actions: View

Attachments on bug 60028: 73839 | 73840 | 73842 | 73843 | 73844

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.