[PATCH 1/2] intel_dump_decode: Actually parse the -d option

[PATCH 1/2] intel_dump_decode: Actually parse the -d option

[Damien Lespiau]

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 tools/intel_dump_decode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/intel_dump_decode.c b/tools/intel_dump_decode.c
index a3cd2e5..959ec87 100644
--- a/tools/intel_dump_decode.c
+++ b/tools/intel_dump_decode.c
@@ -168,7 +168,7 @@ main (int argc, char *argv[])
 		{"binary", 0, 0, 'b'}
 	};
 
-	while((c = getopt_long(argc, argv, "ab",
+	while((c = getopt_long(argc, argv, "ad:b",
 			       long_options, &option_index)) != -1) {
 		switch(c) {
 		case 'd':
-- 
1.8.3.1

[PATCH 2/2] intel_dump_decode: Support the INTEL_DEVID_OVERRIDE env variable

[Damien Lespiau]

This is the one that already works in libdrm, so don't disappoint people
coming with expectations.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 tools/intel_dump_decode.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/intel_dump_decode.c b/tools/intel_dump_decode.c
index 959ec87..a8dcca0 100644
--- a/tools/intel_dump_decode.c
+++ b/tools/intel_dump_decode.c
@@ -158,6 +158,7 @@ int
 main (int argc, char *argv[])
 {
 	uint32_t devid = 0xa011;
+	char *devid_str = NULL;
 	int i, c;
 	int option_index = 0;
 	int binary = -1;
@@ -168,11 +169,13 @@ main (int argc, char *argv[])
 		{"binary", 0, 0, 'b'}
 	};
 
+	devid_str = getenv("INTEL_DEVID_OVERRIDE");
+
 	while((c = getopt_long(argc, argv, "ad:b",
 			       long_options, &option_index)) != -1) {
 		switch(c) {
 		case 'd':
-			devid = strtoul(optarg, NULL, 0);
+			devid_str = optarg;
 			break;
 		case 'b':
 			binary = 1;
@@ -186,6 +189,9 @@ main (int argc, char *argv[])
 		}
 	}
 
+	if (devid_str)
+		devid = strtoul(devid_str, NULL, 0);
+
 	ctx = drm_intel_decode_context_alloc(devid);
 
 	if (optind == argc) {
-- 
1.8.3.1

Re: [PATCH 1/2] intel_dump_decode: Actually parse the -d option

[Damien Lespiau]

On Fri, Nov 22, 2013 at 05:33:41PM +0000, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

No screams, pushed the 2 commits.

-- 
Damien