drm/i915/gen9: Fix clearing of the BIOS power well request register

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_runtime_pm.c

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 9bbbdbc1c843379df33bb15a0da13932df191cfe..62c99a96c8e799fb65a1a59e21ada6231a435124 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -862,8 +862,13 @@ static bool skl_power_well_enabled(struct drm_i915_private *dev_priv,
 static void skl_power_well_sync_hw(struct drm_i915_private *dev_priv,
                                struct i915_power_well *power_well)
 {
+       uint32_t mask = SKL_POWER_WELL_REQ(power_well->id);
+       uint32_t bios_req = I915_READ(HSW_PWR_WELL_BIOS);
+
        /* Clear any request made by BIOS as driver is taking over */
-       I915_WRITE(HSW_PWR_WELL_BIOS, 0);
+       if (bios_req & mask) {
+               I915_WRITE(HSW_PWR_WELL_BIOS, bios_req & ~mask);
+       }
 }
 
 static void skl_power_well_enable(struct drm_i915_private *dev_priv,