Revert "CHROMIUM: drm/i915: Keep PUNIT_POWER_WELL_DPIO_CMN_BC enabled on Ninja"
This reverts commit 5b1463937329e39ed67ddae3a72eba584f5ff08f.
Keeping PUNIT_POWER_WELL_DPIO_CMN_BC enabled alone causes HDMI detect
issue on certain devices, so use i915.disable_power_well=0 to keep all
vlv power well enabled.
BUG=chromium:780122
TEST=none. this patch needs to be tested in verified mode.
Change-Id: I034238ab189cb122e6d05004b0eaefce8b8bde5b
Signed-off-by: Ben Zhang <benzh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/790811
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a6a6579..5fdd241 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1496,7 +1496,6 @@
disable_rpm_wakeref_asserts(dev_priv);
- intel_vlv_dpiocmn_wa(dev_priv, false);
intel_display_set_init_power(dev_priv, false);
fw_csr = !IS_BROXTON(dev_priv) &&
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6d28ed70..434e133 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1613,7 +1613,6 @@
/* intel_runtime_pm.c */
int intel_power_domains_init(struct drm_i915_private *);
void intel_power_domains_fini(struct drm_i915_private *);
-void intel_vlv_dpiocmn_wa(struct drm_i915_private *dev_priv, bool on);
void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);
void intel_power_domains_suspend(struct drm_i915_private *dev_priv);
void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume);
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 4749a4ac..c45968e 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -28,7 +28,6 @@
#include <linux/pm_runtime.h>
#include <linux/vgaarb.h>
-#include <linux/dmi.h>
#include "i915_drv.h"
#include "intel_drv.h"
@@ -2528,39 +2527,6 @@
cmn->ops->disable(dev_priv, cmn);
}
-static int intel_vlv_dpiocmn_wa_dmi_callback(const struct dmi_system_id *id)
-{
- return 1;
-}
-
-static const struct dmi_system_id intel_vlv_dpiocmn_wa_dmi[] = {
- {
- .callback = intel_vlv_dpiocmn_wa_dmi_callback,
- .ident = "AOPEN Ninja",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Ninja"),
- },
- },
- { }
-};
-
-void intel_vlv_dpiocmn_wa(struct drm_i915_private *dev_priv, bool on)
-{
- struct i915_power_well *cmn_bc;
-
- if (!dmi_check_system(intel_vlv_dpiocmn_wa_dmi))
- return;
-
- cmn_bc = lookup_power_well(dev_priv, PUNIT_POWER_WELL_DPIO_CMN_BC);
- if (on) {
- DRM_INFO("Keep PUNIT_POWER_WELL_DPIO_CMN_BC enabled on Ninja due to crbug.com/764813\n");
- intel_power_well_get(dev_priv, cmn_bc);
- } else {
- intel_power_well_put(dev_priv, cmn_bc);
- }
-}
-
/**
* intel_power_domains_init_hw - initialize hardware power domain state
* @dev_priv: i915 device instance
@@ -2594,7 +2560,6 @@
/* Disable power support if the user asked so. */
if (!i915.disable_power_well)
intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
- intel_vlv_dpiocmn_wa(dev_priv, true);
intel_power_domains_sync_hw(dev_priv);
power_domains->initializing = false;
}
