Rev 4245 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4245 | Rev 4251 | ||
---|---|---|---|
Line 35... | Line 35... | ||
35 | #include "sna.h" |
35 | #include "sna.h" |
36 | #include "sna_reg.h" |
36 | #include "sna_reg.h" |
Line 37... | Line 37... | ||
37 | 37 | ||
Line 38... | Line -... | ||
38 | #include "kgem_debug.h" |
- | |
39 | - | ||
40 | #include |
- | |
41 | - | ||
42 | /* |
- | |
43 | void |
- | |
44 | ErrorF(const char *f, ...) |
- | |
45 | { |
- | |
46 | va_list args; |
- | |
47 | - | ||
48 | va_start(args, f); |
- | |
49 | VErrorF(f, args); |
- | |
50 | va_end(args); |
- | |
51 | } |
- | |
52 | */ |
- | |
53 | - | ||
54 | #define ErrorF printf |
38 | #include "kgem_debug.h" |
55 | 39 | ||
56 | struct drm_i915_gem_relocation_entry * |
40 | struct drm_i915_gem_relocation_entry * |
57 | kgem_debug_get_reloc_entry(struct kgem *kgem, uint32_t offset) |
41 | kgem_debug_get_reloc_entry(struct kgem *kgem, uint32_t offset) |
Line 386... | Line 370... | ||
386 | return 1; |
370 | return 1; |
387 | } |
371 | } |
Line 388... | Line 372... | ||
388 | 372 | ||
389 | static int (*decode_3d(int gen))(struct kgem*, uint32_t) |
373 | static int (*decode_3d(int gen))(struct kgem*, uint32_t) |
390 | { |
- | |
391 | return kgem_gen6_decode_3d; |
- | |
392 | /* |
374 | { |
393 | if (gen >= 0100) { |
375 | if (gen >= 0100) { |
394 | } else if (gen >= 070) { |
376 | } else if (gen >= 070) { |
395 | return kgem_gen7_decode_3d; |
377 | return kgem_gen7_decode_3d; |
396 | } else if (gen >= 060) { |
378 | } else if (gen >= 060) { |
Line 399... | Line 381... | ||
399 | return kgem_gen5_decode_3d; |
381 | return kgem_gen5_decode_3d; |
400 | } else if (gen >= 040) { |
382 | } else if (gen >= 040) { |
401 | return kgem_gen4_decode_3d; |
383 | return kgem_gen4_decode_3d; |
402 | } else if (gen >= 030) { |
384 | } else if (gen >= 030) { |
403 | return kgem_gen3_decode_3d; |
385 | return kgem_gen3_decode_3d; |
404 | } else if (gen >= 020) { |
- | |
405 | return kgem_gen2_decode_3d; |
- | |
406 | } |
386 | } |
407 | assert(0); |
387 | assert(0); |
408 | */ |
- | |
409 | } |
388 | } |
Line 410... | Line 389... | ||
410 | 389 | ||
411 | static void (*finish_state(int gen))(struct kgem*) |
390 | static void (*finish_state(int gen))(struct kgem*) |
412 | { |
- | |
413 | - | ||
414 | return kgem_gen6_finish_state; |
- | |
415 | /* |
391 | { |
416 | if (gen >= 0100) { |
392 | if (gen >= 0100) { |
417 | } else if (gen >= 070) { |
393 | } else if (gen >= 070) { |
418 | return kgem_gen7_finish_state; |
394 | return kgem_gen7_finish_state; |
419 | } else if (gen >= 060) { |
395 | } else if (gen >= 060) { |
Line 422... | Line 398... | ||
422 | return kgem_gen5_finish_state; |
398 | return kgem_gen5_finish_state; |
423 | } else if (gen >= 040) { |
399 | } else if (gen >= 040) { |
424 | return kgem_gen4_finish_state; |
400 | return kgem_gen4_finish_state; |
425 | } else if (gen >= 030) { |
401 | } else if (gen >= 030) { |
426 | return kgem_gen3_finish_state; |
402 | return kgem_gen3_finish_state; |
427 | } else if (gen >= 020) { |
- | |
428 | return kgem_gen2_finish_state; |
- | |
429 | } |
403 | } |
430 | assert(0); |
404 | assert(0); |
431 | */ |
- | |
432 | } |
405 | } |
Line 433... | Line 406... | ||
433 | 406 | ||
434 | void __kgem_batch_debug(struct kgem *kgem, uint32_t nbatch) |
407 | void __kgem_batch_debug(struct kgem *kgem, uint32_t nbatch) |
435 | { |
408 | { |