@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
struct eu_rdata {
union {
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "../version.h"
#include "config.h"
+#include "intel_reg.h"
/* This file contains a bunch of wrapper functions to directly use gem ioctls.
* Mostly useful to write kernel tests. */
@@ -261,10 +261,6 @@
#define GEN6_TS_STRG_VAL 0x7e04
#define GEN6_TS_RDATA 0x7e08
-/* TD_CTL on gen6 is 0x7000, to not break stuff which depends on this... */
-#ifndef GEN6_TD_CTL
-#define GEN6_TD_CTL 0x8000
-#endif
#define GEN6_TD_CTL_MUX_SHIFT 8
#define GEN6_TD_CTL_EXTERNAL_HALT_R0_DEBUG_MATCH (1 << 7)
#define GEN6_TD_CTL_FORCE_EXTERNAL_HALT (1 << 6)
@@ -570,10 +566,6 @@
#define GEN6_TS_STRG_VAL 0x7e04
#define GEN6_TS_RDATA 0x7e08
-/* TD_CTL on gen6 is 0x7000, to not break stuff which depends on this... */
-#ifndef GEN6_TD_CTL
-#define GEN6_TD_CTL 0x8000
-#endif
#define GEN6_TD_CTL_MUX_SHIFT 8
#define GEN6_TD_CTL_EXTERNAL_HALT_R0_DEBUG_MATCH (1 << 7)
#define GEN6_TD_CTL_FORCE_EXTERNAL_HALT (1 << 6)
@@ -1,6 +1,8 @@
#ifndef GEN7_MEDIA_H
#define GEN7_MEDIA_H
+#include <stdint.h>
+
#define GEN7_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
#define GEN7_SURFACEFORMAT_R32G32B32A32_SINT 0x001
#define GEN7_SURFACEFORMAT_R32G32B32A32_UINT 0x002
@@ -1,6 +1,8 @@
#ifndef GEN8_MEDIA_H
#define GEN8_MEDIA_H
+#include <stdint.h>
+
#define GEN8_SURFACEFORMAT_R32G32B32A32_FLOAT 0x000
#define GEN8_SURFACEFORMAT_R32G32B32A32_SINT 0x001
#define GEN8_SURFACEFORMAT_R32G32B32A32_UINT 0x002
@@ -30,6 +30,8 @@
#ifndef IGT_CORE_H
#define IGT_CORE_H
+#include <stdbool.h>
+
bool __igt_fixture(void);
void __igt_fixture_complete(void);
void __igt_fixture_end(void) __attribute__((noreturn));
@@ -27,9 +27,8 @@
#include <stdbool.h>
#include <stdint.h>
-#include <stdio.h>
-#include "igt_display.h"
+enum pipe;
int igt_debugfs_open(const char *filename, int mode);
FILE *igt_debugfs_fopen(const char *filename,
@@ -26,11 +26,11 @@
#define __IGT_KMS_H__
#include <stdbool.h>
-
+#include <stdint.h>
#include <drm_fourcc.h>
#include <cairo.h>
-#include <igt_display.h>
+#include "igt_display.h"
struct kmstest_connector_config {
drmModeCrtc *crtc;
@@ -4,6 +4,7 @@
#include <stdint.h>
#include "intel_bufmgr.h"
#include "igt_core.h"
+#include "intel_reg.h"
#define BATCH_SZ 4096
#define BATCH_RESERVED 16
@@ -28,7 +28,6 @@
#ifndef _INTEL_CHIPSET_H
#define _INTEL_CHIPSET_H
-#include <sys/types.h>
#include <pciaccess.h>
struct pci_device *intel_get_pci_device(void);
@@ -36,6 +35,7 @@ uint32_t intel_get_drm_devid(int fd);
int intel_gen(uint32_t devid);
extern enum pch_type intel_pch;
+
enum pch_type {
PCH_NONE,
PCH_IBX,
@@ -29,13 +29,8 @@
#define INTEL_GPU_TOOLS_H
#include <stdint.h>
-#include <sys/types.h>
#include <pciaccess.h>
-#include "intel_chipset.h"
-#include "intel_reg.h"
-#include "drmtest.h"
-
/* register access helpers from intel_mmio.c */
extern void *mmio;
void intel_get_mmio(struct pci_device *pci_dev);
@@ -4,6 +4,7 @@
#include <err.h>
#include <errno.h>
#include "intel_gpu_tools.h"
+#include "intel_reg.h"
#define TIMEOUT_US 500000
@@ -43,6 +43,7 @@
#include "intel_gpu_tools.h"
#include "igt_debugfs.h"
+#include "intel_chipset.h"
#define FAKEKEY 0x2468ace0
@@ -49,6 +49,7 @@
#include "intel_gpu_tools.h"
#include "i915_drm.h"
+#include "drmtest.h"
uint64_t
intel_get_total_ram_mb(void)
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static struct intel_register_range gen_bwcl_register_map[] = {
{0x00000000, 0x00000fff, INTEL_RANGE_RW},
@@ -1,5 +1,6 @@
#include "media_fill.h"
#include "gen7_media.h"
+#include "intel_reg.h"
#include <assert.h>
@@ -1,5 +1,6 @@
#include "media_fill.h"
#include "gen8_media.h"
+#include "intel_reg.h"
#include <assert.h>
@@ -18,6 +18,7 @@
#include "intel_gpu_tools.h"
#include "rendercopy.h"
#include "gen6_render.h"
+#include "intel_reg.h"
#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
#define VERTEX_SIZE (3*4)
@@ -18,6 +18,7 @@
#include "intel_gpu_tools.h"
#include "rendercopy.h"
#include "gen7_render.h"
+#include "intel_reg.h"
#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
@@ -18,6 +18,7 @@
#include "intel_gpu_tools.h"
#include "rendercopy.h"
#include "gen8_render.h"
+#include "intel_reg.h"
#include <intel_aub.h>
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include "intel_gpu_tools.h"
+#include "drmtest.h"
#define LC_FREQ 2700
#define LC_FREQ_2K (LC_FREQ * 2000)
@@ -34,6 +34,9 @@
#include <err.h>
#include <arpa/inet.h>
#include "intel_gpu_tools.h"
+#include "intel_reg.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
static uint32_t devid;
@@ -31,6 +31,8 @@
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
/* XXX PCH only today */
@@ -37,6 +37,8 @@
#include "intel_bios.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
static uint32_t devid = -1;
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -55,6 +55,7 @@
#include "intel_chipset.h"
#include "intel_gpu_tools.h"
#include "instdone.h"
+#include "intel_reg.h"
static uint32_t
print_head(unsigned int reg)
@@ -35,6 +35,7 @@
#include <syslog.h>
#include <unistd.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
bool daemonized;
@@ -35,6 +35,8 @@
#include <sys/wait.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
#define SAMPLES_PER_SEC 10000
@@ -44,6 +44,8 @@
#endif
#include "intel_gpu_tools.h"
#include "instdone.h"
+#include "intel_reg.h"
+#include "intel_chipset.h"
#define FORCEWAKE 0xA18C
#define FORCEWAKE_ACK 0x130090
@@ -35,6 +35,7 @@
#include <unistd.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define KB(x) ((x) * 1024)
#define MB(x) ((x) * 1024 * 1024)
@@ -31,6 +31,8 @@
#include <string.h>
#include <getopt.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
typedef enum {
TRANSC_A = 0,
@@ -40,6 +40,7 @@
#include "intel_gpu_tools.h"
#include "intel_reg.h"
#include "intel_bios.h"
+#include "intel_chipset.h"
enum lid_status {
LID_UNKNOWN = -1,
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -38,6 +38,7 @@
#include <sys/types.h>
#include "intel_gpu_tools.h"
+#include "drmtest.h"
#define OPREGION_HEADER_OFFSET 0
#define OPREGION_ACPI_OFFSET 0x100
@@ -31,6 +31,8 @@
#include <stdlib.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
int gen;
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void usage(char *cmdname)
{
@@ -27,6 +27,7 @@
#include <string.h>
#include <stdbool.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static uint32_t devid;
static int gen;
@@ -34,6 +34,9 @@
#include <err.h>
#include <unistd.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
+#include "drmtest.h"
static uint32_t devid = 0;
@@ -31,6 +31,7 @@
#include <err.h>
#include <string.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void bit_decode(uint32_t reg)
{
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <assert.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
int main(int argc, char** argv)
{
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <err.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
int main(int argc, char** argv)
{
@@ -33,6 +33,7 @@
#include <err.h>
#include "intel_chipset.h"
#include "intel_gpu_tools.h"
+#include "intel_reg.h"
static void
print_clock(const char *name, int clock) {
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <sys/io.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static uint8_t read_reg(uint32_t reg, bool use_mmio)
{
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <sys/io.h>
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void write_reg(uint32_t reg, uint8_t val, bool use_mmio)
{
Only include what the header itself needs. The big fish here is intel-gpu-tools.h. More will follow. One ugly thing removed here is the duplicated GEN6_TD_CTL #define, one of which was broken. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- debugger/debug_rdata.c | 1 + lib/drmtest.c | 1 + lib/gen6_render.h | 8 -------- lib/gen7_media.h | 2 ++ lib/gen8_media.h | 2 ++ lib/igt_core.h | 2 ++ lib/igt_debugfs.h | 3 +-- lib/igt_kms.h | 4 ++-- lib/intel_batchbuffer.h | 1 + lib/intel_chipset.h | 2 +- lib/intel_gpu_tools.h | 5 ----- lib/intel_iosf.c | 1 + lib/intel_mmio.c | 1 + lib/intel_os.c | 1 + lib/intel_reg_map.c | 1 + lib/media_fill_gen7.c | 1 + lib/media_fill_gen8.c | 1 + lib/rendercopy_gen6.c | 1 + lib/rendercopy_gen7.c | 1 + lib/rendercopy_gen8.c | 1 + tests/ddi_compute_wrpll.c | 1 + tools/intel_audio_dump.c | 3 +++ tools/intel_backlight.c | 2 ++ tools/intel_bios_reader.c | 2 ++ tools/intel_dpio_read.c | 1 + tools/intel_dpio_write.c | 1 + tools/intel_error_decode.c | 1 + tools/intel_forcewaked.c | 1 + tools/intel_gpu_time.c | 2 ++ tools/intel_gpu_top.c | 2 ++ tools/intel_gtt.c | 1 + tools/intel_infoframes.c | 2 ++ tools/intel_lid.c | 1 + tools/intel_nc_read.c | 1 + tools/intel_nc_write.c | 1 + tools/intel_opregion_decode.c | 1 + tools/intel_panel_fitter.c | 2 ++ tools/intel_punit_read.c | 1 + tools/intel_punit_write.c | 1 + tools/intel_reg_checker.c | 1 + tools/intel_reg_dumper.c | 3 +++ tools/intel_reg_read.c | 1 + tools/intel_reg_snapshot.c | 1 + tools/intel_reg_write.c | 1 + tools/intel_stepping.c | 1 + tools/intel_vga_read.c | 1 + tools/intel_vga_write.c | 1 + 47 files changed, 59 insertions(+), 18 deletions(-)