From 57b86ef335408a159694aebfca3f041b515b33b5 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 30 Oct 2015 13:52:09 -0500 Subject: [PATCH] intel_extreme: Clean up PLL reg defines --- .../private/graphics/intel_extreme/intel_extreme.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h b/headers/private/graphics/intel_extreme/intel_extreme.h index d81117e15c..c20c0e1763 100644 --- a/headers/private/graphics/intel_extreme/intel_extreme.h +++ b/headers/private/graphics/intel_extreme/intel_extreme.h @@ -467,7 +467,7 @@ struct intel_free_graphics_memory { #define GEN4_HDMI_PORT_B (0x1140 | REGS_NORTH_PIPE_AND_PORT) #define GEN4_HDMI_PORT_C (0x1160 | REGS_NORTH_PIPE_AND_PORT) -#define GEN4_HDMI_PORT_D (0x116C | REGS_NORTH_PIPE_AND_PORT) +#define CHV_HDMI_PORT_D (0x116C | REGS_NORTH_PIPE_AND_PORT) #define INTEL_DISPLAY_PORT_A (0x4000 | REGS_NORTH_PIPE_AND_PORT) #define INTEL_DISPLAY_PORT_B (0x4100 | REGS_NORTH_PIPE_AND_PORT) @@ -539,10 +539,12 @@ struct intel_free_graphics_memory { // PLL registers #define INTEL_DISPLAY_A_PLL (0x6014 | REGS_SOUTH_SHARED) #define INTEL_DISPLAY_B_PLL (0x6018 | REGS_SOUTH_SHARED) -#define INTEL_DISPLAY_A_PLL_MULTIPLIER_DIVISOR \ - (0x601c | REGS_SOUTH_SHARED) -#define INTEL_DISPLAY_B_PLL_MULTIPLIER_DIVISOR \ - (0x6020 | REGS_SOUTH_SHARED) +#define CHV_DISPLAY_C_PLL (0x6030 | REGS_SOUTH_SHARED) + +#define INTEL_DISPLAY_A_PLL_MULTIPLIER_DIVISOR (INTEL_DISPLAY_A_PLL + 0x8) +#define INTEL_DISPLAY_B_PLL_MULTIPLIER_DIVISOR (INTEL_DISPLAY_B_PLL + 0x8) +#define CHV_DISPLAY_C_PLL_MULTIPLIER_DIVISOR (CHV_DISPLAY_C_PLL + 0xc) + #define INTEL_DISPLAY_A_PLL_DIVISOR_0 (0x6040 | REGS_SOUTH_SHARED) #define INTEL_DISPLAY_A_PLL_DIVISOR_1 (0x6044 | REGS_SOUTH_SHARED) #define INTEL_DISPLAY_B_PLL_DIVISOR_0 (0x6048 | REGS_SOUTH_SHARED)