Re: [igt-dev] [PATCH i-g-t 8/8] tools/intel_watermark: Widen register bitfields
From: Lisovskiy, Stanislav <hidden>
Date: 2021-05-14 09:48:30
On Wed, Apr 14, 2021 at 05:27:54AM +0300, Ville Syrjala wrote:
From: Ville Syrjälä <redacted> Modern platforms have more bits in the registers. Deal with it. Signed-off-by: Ville Syrjälä <redacted>
Reviewed-by: Stanislav Lisovskiy <redacted>
quoted hunk ↗ jump to hunk
--- tools/intel_watermark.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index f5613c333dc3..1e235ed30a63 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c@@ -471,8 +471,8 @@ static void skl_wm_dump(void) for (level = 0; level < num_levels; level++) { printf("%10d", level); for (plane = 0; plane < num_planes; plane++) { - blocks = REG_DECODE1(wm[level][pipe][plane], 0, 11); - lines = REG_DECODE1(wm[level][pipe][plane], 14, 5); + blocks = REG_DECODE1(wm[level][pipe][plane], 0, 12); + lines = REG_DECODE1(wm[level][pipe][plane], 14, 13); enable = REG_DECODE1(wm[level][pipe][plane], 31, 1); printf("%5d%c", blocks, endis_ast(enable));@@ -486,8 +486,8 @@ static void skl_wm_dump(void) printf(" TRANS"); for (plane = 0; plane < num_planes; plane++) { - blocks = REG_DECODE1(wm_trans[pipe][plane], 0, 11); - lines = REG_DECODE1(wm_trans[pipe][plane], 14, 5); + blocks = REG_DECODE1(wm_trans[pipe][plane], 0, 12); + lines = REG_DECODE1(wm_trans[pipe][plane], 14, 13); enable = REG_DECODE1(wm_trans[pipe][plane], 31, 1); printf("%5d%c", blocks, endis_ast(enable));@@ -500,8 +500,8 @@ static void skl_wm_dump(void) if (skl_has_sagv_wm(devid)) { printf("\n SAGV"); for (plane = 0; plane < num_planes; plane++) { - blocks = REG_DECODE1(wm_sagv[pipe][plane], 0, 11); - lines = REG_DECODE1(wm_sagv[pipe][plane], 14, 5); + blocks = REG_DECODE1(wm_sagv[pipe][plane], 0, 12); + lines = REG_DECODE1(wm_sagv[pipe][plane], 14, 13); enable = REG_DECODE1(wm_sagv[pipe][plane], 31, 1); printf("%5d%c", blocks, endis_ast(enable));@@ -513,8 +513,8 @@ static void skl_wm_dump(void) printf("\nSAGV TRANS"); for (plane = 0; plane < num_planes; plane++) { - blocks = REG_DECODE1(wm_sagv_trans[pipe][plane], 0, 11); - lines = REG_DECODE1(wm_sagv_trans[pipe][plane], 14, 5); + blocks = REG_DECODE1(wm_sagv_trans[pipe][plane], 0, 12); + lines = REG_DECODE1(wm_sagv_trans[pipe][plane], 14, 13); enable = REG_DECODE1(wm_sagv_trans[pipe][plane], 31, 1); printf("%5d%c", blocks, endis_ast(enable));@@ -529,20 +529,20 @@ static void skl_wm_dump(void) printf("\nstart"); for (plane = 0; plane < num_planes; plane++) { - start = REG_DECODE1(buf_cfg[pipe][plane], 0, 11); + start = REG_DECODE1(buf_cfg[pipe][plane], 0, 12); printf("%10d", start); } printf("\n end"); for (plane = 0; plane < num_planes; plane++) { - end = REG_DECODE1(buf_cfg[pipe][plane], 16, 11); + end = REG_DECODE1(buf_cfg[pipe][plane], 16, 12); printf("%10d", end); } printf("\n size"); for (plane = 0; plane < num_planes; plane++) { - start = REG_DECODE1(buf_cfg[pipe][plane], 0, 11); - end = REG_DECODE1(buf_cfg[pipe][plane], 16, 11); + start = REG_DECODE1(buf_cfg[pipe][plane], 0, 12); + end = REG_DECODE1(buf_cfg[pipe][plane], 16, 12); size = end - start + 1; printf("%10d", (end == 0 && size == 1) ? 0 : size); }@@ -553,20 +553,20 @@ static void skl_wm_dump(void) printf("\nstart"); for (plane = 0; plane < num_planes; plane++) { - start = REG_DECODE1(nv12_buf_cfg[pipe][plane], 0, 11); + start = REG_DECODE1(nv12_buf_cfg[pipe][plane], 0, 12); printf("%10d", start); } printf("\n end"); for (plane = 0; plane < num_planes; plane++) { - end = REG_DECODE1(nv12_buf_cfg[pipe][plane], 16, 11); + end = REG_DECODE1(nv12_buf_cfg[pipe][plane], 16, 12); printf("%10d", end); } printf("\n size"); for (plane = 0; plane < num_planes; plane++) { - start = REG_DECODE1(nv12_buf_cfg[pipe][plane], 0, 11); - end = REG_DECODE1(nv12_buf_cfg[pipe][plane], 16, 11); + start = REG_DECODE1(nv12_buf_cfg[pipe][plane], 0, 12); + end = REG_DECODE1(nv12_buf_cfg[pipe][plane], 16, 12); size = end - start + 1; printf("%10d", (end == 0 && size == 1) ? 0 : size); }-- 2.26.3 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev