From e408d569973b610ba4aafdba016c48b25e563468 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Wed, 27 Mar 2019 20:52:52 +0200 Subject: Revert "lib/igt_device: Move intel_get_pci_device under igt_device" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One significant usecase for intel_reg/etc. is to be able to examine the hardware state *before* loading the driver. If the tool forces the driver to load we've totally lost that capability. This reverts commit 8ae86621d6fff60b6e20c6b0f9b336785c935b0f. Cc: Michał Winiarski Cc: Chris Wilson Signed-off-by: Ville Syrjälä Acked-by: Jani Nikula Acked-by: Michał Winiarski --- tools/intel_watermark.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'tools/intel_watermark.c') diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index 2dc4307c..e71c3d9c 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c @@ -29,14 +29,12 @@ #include #include #include -#include "igt_device.h" #include "intel_io.h" #include "intel_chipset.h" #include "drmtest.h" static uint32_t display_base; static uint32_t devid; -static int fd; static uint32_t read_reg(uint32_t addr) { @@ -251,7 +249,7 @@ static void skl_wm_dump(void) uint32_t plane_ctl[num_pipes][max_planes]; uint32_t wm_linetime[num_pipes]; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); for (pipe = 0; pipe < num_pipes; pipe++) { int num_planes = skl_num_planes(devid, pipe); @@ -471,7 +469,7 @@ static void ilk_wm_dump(void) int num_pipes = intel_gen(devid) >= 7 ? 3 : 2; struct ilk_wm wm = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); for (i = 0; i < num_pipes; i++) { dspcntr[i] = read_reg(0x70180 + i * 0x1000); @@ -621,7 +619,7 @@ static void vlv_wm_dump(void) uint32_t dsp_ss_pm, ddr_setup2; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); dsparb2 = read_reg(0x70060); @@ -837,7 +835,7 @@ static void g4x_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dspacntr = read_reg(0x70180); dspbcntr = read_reg(0x71180); @@ -923,7 +921,7 @@ static void gen4_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); fw1 = read_reg(0x70034); @@ -994,7 +992,7 @@ static void pnv_wm_dump(void) uint32_t cbr; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); fw1 = read_reg(0x70034); @@ -1084,7 +1082,7 @@ static void gen3_wm_dump(void) uint32_t mi_arb_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); instpm = read_reg(0x20c0); @@ -1153,7 +1151,7 @@ static void gen2_wm_dump(void) uint32_t mi_state; struct gmch_wm wms[MAX_PLANE] = {}; - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); dsparb = read_reg(0x70030); mem_mode = read_reg(0x20cc); @@ -1228,8 +1226,7 @@ static void gen2_wm_dump(void) int main(int argc, char *argv[]) { - fd = drm_open_driver(DRIVER_INTEL); - devid = igt_device_get_pci_device(fd)->device_id; + devid = intel_get_pci_device()->device_id; if (intel_gen(devid) >= 9) { skl_wm_dump(); @@ -1253,7 +1250,5 @@ int main(int argc, char *argv[]) return 1; } - close(fd); - return 0; } -- cgit v1.2.3