diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-04-09 15:50:03 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-05-14 16:05:15 +0300 |
| commit | 5c5734d8ee1afac871b69c4554ff14e9b56100e4 (patch) | |
| tree | 60778e76282c7d74c50fc63bcf87dd1acf1c0419 /tools/intel_watermark.c | |
| parent | 2f2ef9901788307d7e5717f1182e38edb6a3c9ea (diff) | |
tools/intel_watermark: Widen register bitfields
Modern platforms have more bits in the registers. Deal with it.
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tools/intel_watermark.c')
| -rw-r--r-- | tools/intel_watermark.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index f5613c33..1e235ed3 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); } |