Skip to content

L
linux
Commit 4ac0533a authored by Jerome Glisse's avatar Jerome Glisse Committed by Alex Deucher
Browse files
Options

drm/radeon: fix htile buffer size computation for command stream checker 

Fix the size computation of the htile buffer.
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9af20792
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 77 deletions
drivers/gpu/drm/radeon/evergreen_cs.c
View file @ 4ac0533a
...@@ -507,20 +507,28 @@ static int evergreen_cs_track_validate_htile(struct radeon_cs_parser *p, ...@@ -507,20 +507,28 @@ static int evergreen_cs_track_validate_htile(struct radeon_cs_parser *p,
/* height is npipes htiles aligned == npipes * 8 pixel aligned */ /* height is npipes htiles aligned == npipes * 8 pixel aligned */
nby = round_up(nby, track->npipes * 8); nby = round_up(nby, track->npipes * 8);
} else { } else {
/* always assume 8x8 htile */
/* align is htile align * 8, htile align vary according to
* number of pipe and tile width and nby
*/
switch (track->npipes) { switch (track->npipes) {
case 8: case 8:
/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 64 * 8); nbx = round_up(nbx, 64 * 8);
nby = round_up(nby, 64 * 8); nby = round_up(nby, 64 * 8);
break; break;
case 4: case 4:
/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 64 * 8); nbx = round_up(nbx, 64 * 8);
nby = round_up(nby, 32 * 8); nby = round_up(nby, 32 * 8);
break; break;
case 2: case 2:
/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 32 * 8); nbx = round_up(nbx, 32 * 8);
nby = round_up(nby, 32 * 8); nby = round_up(nby, 32 * 8);
break; break;
case 1: case 1:
/* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 32 * 8); nbx = round_up(nbx, 32 * 8);
nby = round_up(nby, 16 * 8); nby = round_up(nby, 16 * 8);
break; break;
...@@ -531,9 +539,10 @@ static int evergreen_cs_track_validate_htile(struct radeon_cs_parser *p, ...@@ -531,9 +539,10 @@ static int evergreen_cs_track_validate_htile(struct radeon_cs_parser *p,
} }
} }
/* compute number of htile */ /* compute number of htile */
nbx = nbx / 8; nbx = nbx >> 3;
nby = nby / 8; nby = nby >> 3;
size = nbx * nby * 4; /* size must be aligned on npipes * 2K boundary */
size = roundup(nbx * nby * 4, track->npipes * (2 << 10));
size += track->htile_offset; size += track->htile_offset;
if (size > radeon_bo_size(track->htile_bo)) { if (size > radeon_bo_size(track->htile_bo)) {
...@@ -1790,6 +1799,8 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) ...@@ -1790,6 +1799,8 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
case DB_HTILE_SURFACE: case DB_HTILE_SURFACE:
/* 8x8 only */ /* 8x8 only */
track->htile_surface = radeon_get_ib_value(p, idx); track->htile_surface = radeon_get_ib_value(p, idx);
/* force 8x8 htile width and height */
ib[idx] |= 3;
track->db_dirty = true; track->db_dirty = true;
break; break;
case CB_IMMED0_BASE: case CB_IMMED0_BASE:
......
drivers/gpu/drm/radeon/r600_cs.c
View file @ 4ac0533a
...@@ -657,88 +657,31 @@ static int r600_cs_track_validate_db(struct radeon_cs_parser *p) ...@@ -657,88 +657,31 @@ static int r600_cs_track_validate_db(struct radeon_cs_parser *p)
/* nby is npipes htiles aligned == npipes * 8 pixel aligned */ /* nby is npipes htiles aligned == npipes * 8 pixel aligned */
nby = round_up(nby, track->npipes * 8); nby = round_up(nby, track->npipes * 8);
} else { } else {
/* htile widht & nby (8 or 4) make 2 bits number */ /* always assume 8x8 htile */
tmp = track->htile_surface & 3;
/* align is htile align * 8, htile align vary according to /* align is htile align * 8, htile align vary according to
* number of pipe and tile width and nby * number of pipe and tile width and nby
*/ */
switch (track->npipes) { switch (track->npipes) {
case 8: case 8:
switch (tmp) { /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
case 3: /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 64 * 8); nbx = round_up(nbx, 64 * 8);
nby = round_up(nby, 64 * 8); nby = round_up(nby, 64 * 8);
break; 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: case 4:
switch (tmp) { /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
case 3: /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 64 * 8); nbx = round_up(nbx, 64 * 8);
nby = round_up(nby, 32 * 8); nby = round_up(nby, 32 * 8);
break; 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: case 2:
switch (tmp) { /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
case 3: /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 32 * 8); nbx = round_up(nbx, 32 * 8);
nby = round_up(nby, 32 * 8); nby = round_up(nby, 32 * 8);
break; 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: case 1:
switch (tmp) { /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
case 3: /* HTILE_WIDTH = 8 & HTILE_HEIGHT = 8*/
nbx = round_up(nbx, 32 * 8); nbx = round_up(nbx, 32 * 8);
nby = round_up(nby, 16 * 8); nby = round_up(nby, 16 * 8);
break; 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: default:
dev_warn(p->dev, "%s:%d invalid num pipes %d\n", dev_warn(p->dev, "%s:%d invalid num pipes %d\n",
__func__, __LINE__, track->npipes); __func__, __LINE__, track->npipes);
...@@ -746,9 +689,10 @@ static int r600_cs_track_validate_db(struct radeon_cs_parser *p) ...@@ -746,9 +689,10 @@ static int r600_cs_track_validate_db(struct radeon_cs_parser *p)
} }
} }
/* compute number of htile */ /* compute number of htile */
nbx = G_028D24_HTILE_WIDTH(track->htile_surface) ? nbx / 8 : nbx / 4; nbx = nbx >> 3;
nby = G_028D24_HTILE_HEIGHT(track->htile_surface) ? nby / 8 : nby / 4; nby = nby >> 3;
size = nbx * nby * 4; /* size must be aligned on npipes * 2K boundary */
size = roundup(nbx * nby * 4, track->npipes * (2 << 10));
size += track->htile_offset; size += track->htile_offset;
if (size > radeon_bo_size(track->htile_bo)) { if (size > radeon_bo_size(track->htile_bo)) {
...@@ -1492,6 +1436,8 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) ...@@ -1492,6 +1436,8 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
break; break;
case DB_HTILE_SURFACE: case DB_HTILE_SURFACE:
track->htile_surface = radeon_get_ib_value(p, idx); track->htile_surface = radeon_get_ib_value(p, idx);
/* force 8x8 htile width and height */
ib[idx] |= 3;
track->db_dirty = true; track->db_dirty = true;
break; break;
case SQ_PGM_START_FS: case SQ_PGM_START_FS:
......
drivers/gpu/drm/radeon/radeon_drv.c
View file @ 4ac0533a
...@@ -66,9 +66,10 @@ ...@@ -66,9 +66,10 @@
* 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880 * 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880
* 2.24.0 - eg only: allow MIP_ADDRESS=0 for MSAA textures * 2.24.0 - eg only: allow MIP_ADDRESS=0 for MSAA textures
* 2.25.0 - eg+: new info request for num SE and num SH * 2.25.0 - eg+: new info request for num SE and num SH
* 2.26.0 - r600-eg: fix htile size computation
*/ */
#define KMS_DRIVER_MAJOR 2 #define KMS_DRIVER_MAJOR 2
#define KMS_DRIVER_MINOR 25 #define KMS_DRIVER_MINOR 26
#define KMS_DRIVER_PATCHLEVEL 0 #define KMS_DRIVER_PATCHLEVEL 0
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
int radeon_driver_unload_kms(struct drm_device *dev); int radeon_driver_unload_kms(struct drm_device *dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7