summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/northbridge/intel/haswell/gma.c21
-rw-r--r--src/southbridge/intel/lynxpoint/pcie.c3
2 files changed, 6 insertions, 18 deletions
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index f13ef7a62d..00d7583048 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -350,20 +350,11 @@ static void gma_pm_init_post_vbios(struct device *dev)
gpu_is_ulx = 1;
/* CD Frequency */
- if (gtt_read(0x42014) & 0x1000000) {
- cdclk = 0; /* only 450mhz */
- } else {
- cdclk = 2; /* 337.5mhz, 450mhz, or 540mhz */
- if (gpu_is_ulx)
- cdclk = 0; /* only 337.5mhz */
-
- /* TODO: this check does not seem right... */
- if (haswell_is_ult() &&
- haswell_stepping() < HASWELL_STEPPING_MOBILE_D0)
- cdclk = 0; /* only 450mhz */
- else
- cdclk = 1; /* 337.5mhz and 450mhz */
- }
+ if ((gtt_read(0x42014) & 0x1000000) || gpu_is_ulx || haswell_is_ult())
+ cdclk = 0; /* fixed frequency */
+ else
+ cdclk = 2; /* variable frequency */
+
if (gpu_is_ulx || cdclk != 0)
gtt_rmw(0x130040, 0xf7ffffff, 0x04000000);
else
@@ -371,7 +362,7 @@ static void gma_pm_init_post_vbios(struct device *dev)
/* More magic */
if (haswell_is_ult() || gpu_is_ulx) {
- if (cdclk == 1 && gpu_is_ulx == 0)
+ if (!gpu_is_ulx)
gtt_write(0x138128, 0x00000000);
else
gtt_write(0x138128, 0x00000001);
diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index 6a4d75cac2..581b79d1a4 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -649,9 +649,6 @@ static void pch_pcie_early(struct device *dev)
pcie_update_cfg(dev, 0x33c, ~0x00ffffff, 0x854c74);
- /* Set undocumented bits in MPC2 register. */
- pcie_update_cfg(dev, 0xd4, ~0, (1 << 12) | (1 << 6));
-
/* Set Invalid Recieve Range Check Enable in MPC register. */
pcie_update_cfg(dev, 0xd8, ~0, (1 << 25));