flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-23 09:56:02 +00:00
Code Issues Releases Wiki Activity

lib/intel_chipset: intel_ prefix for pch global

Browse Source 
Just a bit better namespacing.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-22 14:59:58 +01:00
parent aed95c390a
commit 266b26b3ed
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/intel_chipset.c
View File

@ -40,7 +40,7 @@
#include "intel_chipset.h" #include "intel_chipset.h"
enum pch_type pch; enum pch_type intel_pch;
struct pci_device * struct pci_device *
intel_get_pci_device(void) intel_get_pci_device(void)
@ -148,18 +148,18 @@ intel_check_pch(void)
switch (pch_dev->device_id & 0xff00) { switch (pch_dev->device_id & 0xff00) {
case 0x3b00: case 0x3b00:
pch = PCH_IBX; intel_pch = PCH_IBX;
break; break;
case 0x1c00: case 0x1c00:
case 0x1e00: case 0x1e00:
pch = PCH_CPT; intel_pch = PCH_CPT;
break; break;
case 0x8c00: case 0x8c00:
case 0x9c00: case 0x9c00:
pch = PCH_LPT; intel_pch = PCH_LPT;
break; break;
default: default:
pch = PCH_NONE; intel_pch = PCH_NONE;
return; return;
} }
} }

8
lib/intel_chipset.h
View File

@ -35,7 +35,7 @@ struct pci_device *intel_get_pci_device(void);
uint32_t intel_get_drm_devid(int fd); uint32_t intel_get_drm_devid(int fd);
int intel_gen(uint32_t devid); int intel_gen(uint32_t devid);
extern enum pch_type pch; extern enum pch_type intel_pch;
enum pch_type { enum pch_type {
PCH_NONE, PCH_NONE,
PCH_IBX, PCH_IBX,
@ -45,9 +45,9 @@ enum pch_type {
void intel_check_pch(void); void intel_check_pch(void);
#define HAS_IBX (pch == PCH_IBX) #define HAS_IBX (intel_pch == PCH_IBX)
#define HAS_CPT (pch == PCH_CPT) #define HAS_CPT (intel_pch == PCH_CPT)
#define HAS_LPT (pch == PCH_LPT) #define HAS_LPT (intel_pch == PCH_LPT)
#define PCI_CHIP_I810 0x7121 #define PCI_CHIP_I810 0x7121
#define PCI_CHIP_I810_DC100 0x7123 #define PCI_CHIP_I810_DC100 0x7123

4
tools/intel_infoframes.c
View File

@ -367,7 +367,7 @@ static void dump_port_info(int hdmi_port_index)
if (gen == 4) if (gen == 4)
transcoder = (val & HDMI_PORT_TRANSCODER_GEN4) >> 30; transcoder = (val & HDMI_PORT_TRANSCODER_GEN4) >> 30;
else if (pch >= PCH_CPT) else if (intel_pch >= PCH_CPT)
transcoder = (val & HDMI_PORT_TRANSCODER_CPT) >> 29; transcoder = (val & HDMI_PORT_TRANSCODER_CPT) >> 29;
else else
transcoder = (val & HDMI_PORT_TRANSCODER_IBX) >> 30; transcoder = (val & HDMI_PORT_TRANSCODER_IBX) >> 30;
@ -1187,7 +1187,7 @@ int main(int argc, char *argv[])
transcoder = TRANSC_A; transcoder = TRANSC_A;
else if (!strcmp(optarg, "B")) else if (!strcmp(optarg, "B"))
transcoder = TRANSC_B; transcoder = TRANSC_B;
else if (pch >= PCH_CPT && !strcmp(optarg, "C")) { else if (intel_pch >= PCH_CPT && !strcmp(optarg, "C")) {
transcoder = TRANSC_C; transcoder = TRANSC_C;
} else { } else {
printf("Invalid transcoder.\n"); printf("Invalid transcoder.\n");

10
tools/intel_reg_dumper.c
View File

@ -2931,18 +2931,18 @@ int main(int argc, char** argv)
intel_map_file(file); intel_map_file(file);
if (devid) { if (devid) {
if (IS_GEN5(devid)) if (IS_GEN5(devid))
pch = PCH_IBX; intel_pch = PCH_IBX;
else if (IS_GEN6(devid) || IS_IVYBRIDGE(devid)) else if (IS_GEN6(devid) || IS_IVYBRIDGE(devid))
pch = PCH_CPT; intel_pch = PCH_CPT;
else if (IS_HASWELL(devid)) else if (IS_HASWELL(devid))
pch = PCH_LPT; intel_pch = PCH_LPT;
else else
pch = PCH_NONE; intel_pch = PCH_NONE;
} else { } else {
printf("Dumping from file without -d argument. " printf("Dumping from file without -d argument. "
"Assuming Ironlake machine.\n"); "Assuming Ironlake machine.\n");
devid = 0x0042; devid = 0x0042;
pch = PCH_IBX; intel_pch = PCH_IBX;
} }
} else { } else {
pci_dev = intel_get_pci_device(); pci_dev = intel_get_pci_device();