diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-20 15:58:59 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-21 11:57:49 +0000 |
| commit | 538091ce7008b4281d912422d8bb676c541401a4 (patch) | |
| tree | 406fa375e51a17d2d87500cd6c5aa8a2ee230abf /tools/intel_watermark.c | |
| parent | 9fb5344bab2540e3d12a7d3a94c2a3801a6fec36 (diff) | |
tools: Stop opening the driver just to find the debugfs
Since the tools want to work without the module loaded, remove the
assumption that we want to load the driver to find debugfs.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tools/intel_watermark.c')
| -rw-r--r-- | tools/intel_watermark.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index d8c78480..de0b0831 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c @@ -34,7 +34,6 @@ static uint32_t display_base; static uint32_t devid; -static int drm_fd; static uint32_t read_reg(uint32_t addr) { @@ -143,7 +142,7 @@ static void ilk_wm_dump(void) int num_pipes = is_gen7_plus(devid) ? 3 : 2; struct ilk_wm wm = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); for (i = 0; i < num_pipes; i++) { dspcntr[i] = read_reg(0x70180 + i * 0x1000); @@ -291,7 +290,7 @@ static void vlv_wm_dump(void) uint32_t dsp_ss_pm, ddr_setup2; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); dsparb2 = read_reg(0x70060); @@ -507,7 +506,7 @@ static void g4x_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dspacntr = read_reg(0x70180); dspbcntr = read_reg(0x71180); @@ -593,7 +592,7 @@ static void gen4_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); fw1 = read_reg(0x70034); @@ -664,7 +663,7 @@ static void pnv_wm_dump(void) uint32_t cbr; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); fw1 = read_reg(0x70034); @@ -754,7 +753,7 @@ static void gen3_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); instpm = read_reg(0x20c0); @@ -823,7 +822,7 @@ static void gen2_wm_dump(void) uint32_t mi_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(intel_get_pci_device(), 0, drm_fd); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); mem_mode = read_reg(0x20cc); @@ -900,9 +899,6 @@ int main(int argc, char *argv[]) { devid = intel_get_pci_device()->device_id; - /* Just to make sure we open the right debugfs files */ - drm_fd = drm_open_driver_master(DRIVER_INTEL); - if (IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)) { display_base = 0x180000; vlv_wm_dump(); @@ -923,7 +919,5 @@ int main(int argc, char *argv[]) return 1; } - close(drm_fd); - return 0; } |