diff mbox

[i-g-t] igt/tools: Update intel_watermark with SKL support

Message ID 1476767975-25406-1-git-send-email-dhinakaran.pandiyan@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dhinakaran Pandiyan Oct. 18, 2016, 5:19 a.m. UTC 
Added support to print SKL watermark and DDB registers.

Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
 tools/intel_watermark.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 1 deletion(-)

Comments

Ville Syrjälä Oct. 18, 2016, 9:08 a.m. UTC | #1 
On Mon, Oct 17, 2016 at 10:19:35PM -0700, Dhinakaran Pandiyan wrote:
> Added support to print SKL watermark and DDB registers.
> 
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
>  tools/intel_watermark.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 103 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
> index e9a2b05..903a0b2 100644
> --- a/tools/intel_watermark.c
> +++ b/tools/intel_watermark.c
> @@ -120,6 +120,11 @@ static const char *endis(bool enabled)
>  	return enabled ? "enabled" : "disabled";
>  }
>  
> +static const char endis_ast(bool enabled)
> +{
> +	return enabled ? '*' : ' ';
> +}
> +
>  static int is_gen7_plus(uint32_t d)
>  {
>  	return !(IS_GEN5(d) || IS_GEN6(d));
> @@ -130,6 +135,101 @@ static int is_hsw_plus(uint32_t d)
>  	return !(IS_GEN5(d) || IS_GEN6(d) || IS_IVYBRIDGE(d));
>  }
>  
> +
> +static void skl_wm_dump(void)
> +{
> +	int pipe, plane, level;
> +	int num_pipes = 3;
> +	int num_planes = 5;
> +	int num_levels = 8;
> +	uint32_t base_addr = 0x70000, addr, wm_offset;
> +
> +	uint32_t wm[num_levels][num_pipes][num_planes];
> +	uint32_t wm_trans[num_pipes][num_planes];
> +	uint32_t buf_cfg[num_pipes][num_planes];
> +
> +	intel_register_access_init(intel_get_pci_device(), 0);
> +
> +	for (pipe = 0; pipe < num_pipes; pipe++) {
> +		for (plane = 0; plane < num_planes; plane++) {
> +			addr =  base_addr +  pipe * 0x1000 + plane * 0x100;
> +
> +			wm_trans[pipe][plane] = read_reg(addr + 0x00168);
> +			buf_cfg[pipe][plane] = read_reg(addr + 0x0017C);
> +			for (level = 0; level < num_levels; level++) {
> +				wm_offset = addr + 0x00140 + level * 0x4;
> +				wm[level][pipe][plane] = read_reg(wm_offset);
> +			}
> +		}
> +	}
> +

Please dump out the all the raw register values first. Then proceed to
print out the decoded output. That's what I've been doing for all the
other platforms.

> +	for (pipe = 0; pipe < num_pipes; pipe++) {
> +		uint32_t start, end, size;
> +		uint32_t lines, blocks, enable;
> +
> +		printf("PIPE_%c\n", pipe_name(pipe));
> +		printf("LEVEL   CURSOR   PLANE_A   PLANE_B   PLANE_C   PLANE_D\n");

Planes are labelled 1,2,3,... not A,B,C,...

> +		for (level = 0; level < num_levels; level++) {
> +			printf("%5d  ", level);
> +			for (plane = 0; plane < num_planes; plane++) {
> +				blocks = REG_DECODE1(wm[level][pipe][plane], 0, 9);
> +				lines = REG_DECODE1(wm[level][pipe][plane], 14, 5);
> +				enable = REG_DECODE1(wm[level][pipe][plane], 31, 1);
> +
> +				printf("%3d", blocks);
> +				printf("%c", endis_ast(enable));

One printf() will do.

> +				if (!REG_DECODE1(wm[level][pipe][plane], 30, 1))
> +					printf("(%2d)  ", lines);
> +				else
> +					printf("(--)  ");
> +			}
> +			printf("\n");
> +		}
> +
> +		printf("TRANS: ");
> +		for (plane = 0; plane < num_planes; plane++) {
> +			blocks = REG_DECODE1(wm_trans[pipe][plane], 0, 9);
> +			lines = REG_DECODE1(wm_trans[pipe][plane], 14, 5);
> +			enable = REG_DECODE1(wm_trans[pipe][plane], 31, 1);
> +
> +			printf("%3d", blocks);
> +			printf("%c", endis_ast(enable));
> +			if (!REG_DECODE1(wm_trans[pipe][plane], 30, 1))
> +				printf("(%2d)  ", lines);
> +			else
> +				printf("(--)  ");
> +		}
> +
> +		printf("\nDDB allocation:");
> +
> +		printf("\nstart ");
> +		for (plane = 0; plane < num_planes; plane++) {
> +			start = REG_DECODE1(buf_cfg[pipe][plane], 0, 10);
> +			printf("%7d   ", start);
> +		}
> +
> +		printf("\nend   ");
> +		for (plane = 0; plane < num_planes; plane++) {
> +			end = REG_DECODE1(buf_cfg[pipe][plane], 16, 10);
> +			printf("%7d   ", end);
> +		}
> +
> +		printf("\nsize  ");
> +		for (plane = 0; plane < num_planes; plane++) {
> +			start = REG_DECODE1(buf_cfg[pipe][plane], 0, 10);
> +			end =  REG_DECODE1(buf_cfg[pipe][plane], 16, 10);
> +			size = end - start + 1;
> +			printf("%7d   ", (end == 0 && size == 1) ? 0 : size);
> +		}
> +
> +		printf("\n\n\n");
> +	}
> +
> +	printf("* plane watermark enabled\n");
> +	printf("(x) line watermark if enabled\n");
> +
> +}
> +
>  static void ilk_wm_dump(void)
>  {
>  	int i;
> @@ -900,7 +1000,9 @@ int main(int argc, char *argv[])
>  {
>  	devid = intel_get_pci_device()->device_id;
>  
> -	if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
> +	if (IS_GEN9(devid)) {
> +		skl_wm_dump();
> +	} else if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
>  		display_base = 0x180000;
>  		vlv_wm_dump();
>  	} else if (HAS_PCH_SPLIT(devid)) {
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index e9a2b05..903a0b2 100644
--- a/tools/intel_watermark.c
+++ b/tools/intel_watermark.c
@@ -120,6 +120,11 @@  static const char *endis(bool enabled)
 	return enabled ? "enabled" : "disabled";
 }
 
+static const char endis_ast(bool enabled)
+{
+	return enabled ? '*' : ' ';
+}
+
 static int is_gen7_plus(uint32_t d)
 {
 	return !(IS_GEN5(d) || IS_GEN6(d));
@@ -130,6 +135,101 @@  static int is_hsw_plus(uint32_t d)
 	return !(IS_GEN5(d) || IS_GEN6(d) || IS_IVYBRIDGE(d));
 }
 
+
+static void skl_wm_dump(void)
+{
+	int pipe, plane, level;
+	int num_pipes = 3;
+	int num_planes = 5;
+	int num_levels = 8;
+	uint32_t base_addr = 0x70000, addr, wm_offset;
+
+	uint32_t wm[num_levels][num_pipes][num_planes];
+	uint32_t wm_trans[num_pipes][num_planes];
+	uint32_t buf_cfg[num_pipes][num_planes];
+
+	intel_register_access_init(intel_get_pci_device(), 0);
+
+	for (pipe = 0; pipe < num_pipes; pipe++) {
+		for (plane = 0; plane < num_planes; plane++) {
+			addr =  base_addr +  pipe * 0x1000 + plane * 0x100;
+
+			wm_trans[pipe][plane] = read_reg(addr + 0x00168);
+			buf_cfg[pipe][plane] = read_reg(addr + 0x0017C);
+			for (level = 0; level < num_levels; level++) {
+				wm_offset = addr + 0x00140 + level * 0x4;
+				wm[level][pipe][plane] = read_reg(wm_offset);
+			}
+		}
+	}
+
+	for (pipe = 0; pipe < num_pipes; pipe++) {
+		uint32_t start, end, size;
+		uint32_t lines, blocks, enable;
+
+		printf("PIPE_%c\n", pipe_name(pipe));
+		printf("LEVEL   CURSOR   PLANE_A   PLANE_B   PLANE_C   PLANE_D\n");
+		for (level = 0; level < num_levels; level++) {
+			printf("%5d  ", level);
+			for (plane = 0; plane < num_planes; plane++) {
+				blocks = REG_DECODE1(wm[level][pipe][plane], 0, 9);
+				lines = REG_DECODE1(wm[level][pipe][plane], 14, 5);
+				enable = REG_DECODE1(wm[level][pipe][plane], 31, 1);
+
+				printf("%3d", blocks);
+				printf("%c", endis_ast(enable));
+				if (!REG_DECODE1(wm[level][pipe][plane], 30, 1))
+					printf("(%2d)  ", lines);
+				else
+					printf("(--)  ");
+			}
+			printf("\n");
+		}
+
+		printf("TRANS: ");
+		for (plane = 0; plane < num_planes; plane++) {
+			blocks = REG_DECODE1(wm_trans[pipe][plane], 0, 9);
+			lines = REG_DECODE1(wm_trans[pipe][plane], 14, 5);
+			enable = REG_DECODE1(wm_trans[pipe][plane], 31, 1);
+
+			printf("%3d", blocks);
+			printf("%c", endis_ast(enable));
+			if (!REG_DECODE1(wm_trans[pipe][plane], 30, 1))
+				printf("(%2d)  ", lines);
+			else
+				printf("(--)  ");
+		}
+
+		printf("\nDDB allocation:");
+
+		printf("\nstart ");
+		for (plane = 0; plane < num_planes; plane++) {
+			start = REG_DECODE1(buf_cfg[pipe][plane], 0, 10);
+			printf("%7d   ", start);
+		}
+
+		printf("\nend   ");
+		for (plane = 0; plane < num_planes; plane++) {
+			end = REG_DECODE1(buf_cfg[pipe][plane], 16, 10);
+			printf("%7d   ", end);
+		}
+
+		printf("\nsize  ");
+		for (plane = 0; plane < num_planes; plane++) {
+			start = REG_DECODE1(buf_cfg[pipe][plane], 0, 10);
+			end =  REG_DECODE1(buf_cfg[pipe][plane], 16, 10);
+			size = end - start + 1;
+			printf("%7d   ", (end == 0 && size == 1) ? 0 : size);
+		}
+
+		printf("\n\n\n");
+	}
+
+	printf("* plane watermark enabled\n");
+	printf("(x) line watermark if enabled\n");
+
+}
+
 static void ilk_wm_dump(void)
 {
 	int i;
@@ -900,7 +1000,9 @@  int main(int argc, char *argv[])
 {
 	devid = intel_get_pci_device()->device_id;
 
-	if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
+	if (IS_GEN9(devid)) {
+		skl_wm_dump();
+	} else if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) {
 		display_base = 0x180000;
 		vlv_wm_dump();
 	} else if (HAS_PCH_SPLIT(devid)) {