#include <fcntl.h>
#include <getopt.h>
-#include "intel_decode.h"
+#include <intel_bufmgr.h>
+
+struct drm_intel_decode *ctx;
static void
-read_bin_file(uint32_t devid, const char * filename)
+read_bin_file(const char * filename)
{
uint32_t buf[16384];
int fd, offset, ret;
- fd = open (filename, O_RDONLY);
+ if (!strcmp(filename, "-"))
+ fd = fileno(stdin);
+ else
+ fd = open (filename, O_RDONLY);
if (fd < 0) {
fprintf (stderr, "Failed to open %s: %s\n",
filename, strerror (errno));
exit (1);
}
+ drm_intel_decode_set_dump_past_end(ctx, 1);
+
offset = 0;
while ((ret = read (fd, buf, sizeof(buf))) > 0) {
- intel_decode (buf, ret/4, offset, devid, 1);
+ drm_intel_decode_set_batch_pointer(ctx, buf, offset, ret/4);
+ drm_intel_decode(ctx);
offset += ret;
}
close (fd);
}
static void
-read_data_file(uint32_t devid, const char * filename)
+read_data_file(const char * filename)
{
FILE *file;
uint32_t *data = NULL;
uint32_t offset, value;
uint32_t gtt_offset = 0;
- file = fopen (filename, "r");
+ if (!strcmp(filename, "-"))
+ file = stdin;
+ else
+ file = fopen (filename, "r");
+
if (file == NULL) {
fprintf (stderr, "Failed to open %s: %s\n",
filename, strerror (errno));
}
if (count) {
- intel_decode (data, count, gtt_offset, devid, 0);
+ drm_intel_decode_set_batch_pointer(ctx, data, gtt_offset, count);
+ drm_intel_decode(ctx);
}
free (data);
}
static void
-read_autodetect_file(uint32_t devid, const char * filename)
+read_autodetect_file(const char * filename)
{
int binary = 0, c;
FILE *file;
fclose(file);
if (binary == 1)
- read_bin_file(devid, filename);
+ read_bin_file(filename);
else
- read_data_file(devid, filename);
+ read_data_file(filename);
}
main (int argc, char *argv[])
{
uint32_t devid = 0xa011;
+ char *devid_str = NULL;
int i, c;
int option_index = 0;
int binary = -1;
{"binary", 0, 0, 'b'}
};
- while((c = getopt_long(argc, argv, "ab",
+ devid_str = getenv("INTEL_DEVID_OVERRIDE");
+
+ while((c = getopt_long(argc, argv, "ad:b",
long_options, &option_index)) != -1) {
switch(c) {
case 'd':
- devid = atoi(optarg);
+ devid_str = optarg;
break;
case 'b':
binary = 1;
}
}
+ if (devid_str)
+ devid = strtoul(devid_str, NULL, 0);
+
+ ctx = drm_intel_decode_context_alloc(devid);
+
if (optind == argc) {
fprintf(stderr, "no input file given\n");
exit(-1);
}
-
for (i = optind; i < argc; i++) {
+ /* For stdin input, let's read as data file */
+ if (!strcmp(argv[i], "-")) {
+ read_data_file(argv[i]);
+ continue;
+ }
if (binary == 1)
- read_bin_file(devid, argv[i]);
+ read_bin_file(argv[i]);
else if (binary == 0)
- read_data_file(devid, argv[i]);
+ read_data_file(argv[i]);
else
- read_autodetect_file(devid, argv[i]);
+ read_autodetect_file(argv[i]);
}
return 0;