]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915/skl: Assert the requirements to enter or exit DC5.
authorSuketu Shah <suketu.j.shah@intel.com>
Thu, 16 Apr 2015 08:52:10 +0000 (14:22 +0530)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 8 May 2015 11:03:13 +0000 (13:03 +0200)
Warn if the conditions to enter or exit DC5 are not satisfied such
as support for runtime PM, state of power well, CSR loading etc.

v2: Removed camelcase in functions and variables.

v3: Do some minimal check to assert if CSR program is not loaded.

v4:
1] Used an appropriate function lookup_power_well() to identify power well,
instead of using a magic number which can change in future.
2] Split the conditions further in assert_can_enable_DC5() and added more checks.
3] Removed all WARNs from assert_can_disable_DC5 as they were unnecessary and added two
   new ones.
4] Changed variable names as updated in earlier patches.

v5:
1] Change lookup_power_well function to take an int power well id.
2] Define a new intel_display_power_well_is_enabled helper function to check whether a
   particular power well is enabled.
3] Use CSR-related mutex in assert_csr_loaded function.

v6: Remove use of dc5_enabled variable as it's no longer needed.

v7:
1] Rebase to latest.
2] Move all DC5-related functions from intel_display.c to intel_runtime_pm.c.

v8: After adding dmc ver 1.0 support rebased on top of nightly. (Animesh)

v9: Modified below changes based on review comments from Imre.
- Moved intel_display_power_well_is_enabled() to intel_runtime_pm.c.
- Removed mutex lock from assert_csr_loaded(). (Animesh)

Issue: VIZ-2819
Signed-off-by: A.Sunil Kamath <sunil.kamath@intel.com>
Signed-off-by: Suketu Shah <suketu.j.shah@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_runtime_pm.c

index 0cae0cd90c21eeaacdd8bb4aecd216e0d6579059..9311cddb86e670a0a23f265839c5802a84462239 100644 (file)
@@ -403,3 +403,12 @@ void intel_csr_ucode_fini(struct drm_device *dev)
        intel_csr_load_status_set(dev_priv, FW_FAILED);
        kfree(dev_priv->csr.dmc_payload);
 }
+
+void assert_csr_loaded(struct drm_i915_private *dev_priv)
+{
+       WARN((intel_csr_load_status_get(dev_priv) != FW_LOADED), "CSR is not loaded.\n");
+       WARN(!I915_READ(CSR_PROGRAM_BASE),
+                               "CSR program storage start is NULL\n");
+       WARN(!I915_READ(CSR_SSP_BASE), "CSR SSP Base Not fine\n");
+       WARN(!I915_READ(CSR_HTP_SKL), "CSR HTP Not fine\n");
+}
index 980b3aff9bf415e8184346bfe7e0f6a665e59d1c..ddf3fefd96b2b3e05a3ae200ba2871e28534b0b3 100644 (file)
@@ -1160,6 +1160,7 @@ void intel_csr_load_status_set(struct drm_i915_private *dev_priv,
                                        enum csr_state state);
 void intel_csr_load_program(struct drm_device *dev);
 void intel_csr_ucode_fini(struct drm_device *dev);
+void assert_csr_loaded(struct drm_i915_private *dev_priv);
 
 /* intel_dp.c */
 void intel_dp_init(struct drm_device *dev, int output_reg, enum port port);
index 839010a57a2b10b2eea703c53c94d5c0d0c0c5b4..2f7f0ab363fb25a451ffdc491c5e61e0a57a5526 100644 (file)
@@ -64,6 +64,9 @@
             i--)                                                        \
                if ((power_well)->domains & (domain_mask))
 
+bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,
+                                   int power_well_id);
+
 /*
  * We should only use the power well if we explicitly asked the hardware to
  * enable it, so check if it's enabled and also check if we've requested it to
@@ -433,12 +436,39 @@ static void gen9_set_dc_state_debugmask_memory_up(
        }
 }
 
-static void gen9_enable_dc5(struct drm_i915_private *dev_priv)
+static void assert_can_enable_dc5(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
+       bool pg2_enabled = intel_display_power_well_is_enabled(dev_priv,
+                                       SKL_DISP_PW_2);
+
+       WARN(!IS_SKYLAKE(dev), "Platform doesn't support DC5.\n");
+       WARN(!HAS_RUNTIME_PM(dev), "Runtime PM not enabled.\n");
+       WARN(pg2_enabled, "PG2 not disabled to enable DC5.\n");
+
+       WARN((I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5),
+                               "DC5 already programmed to be enabled.\n");
+       WARN(dev_priv->pm.suspended,
+               "DC5 cannot be enabled, if platform is runtime-suspended.\n");
+
+       assert_csr_loaded(dev_priv);
+}
+
+static void assert_can_disable_dc5(struct drm_i915_private *dev_priv)
+{
+       bool pg2_enabled = intel_display_power_well_is_enabled(dev_priv,
+                                       SKL_DISP_PW_2);
+
+       WARN(!pg2_enabled, "PG2 not enabled to disable DC5.\n");
+       WARN(dev_priv->pm.suspended,
+               "Disabling of DC5 while platform is runtime-suspended should never happen.\n");
+}
+
+static void gen9_enable_dc5(struct drm_i915_private *dev_priv)
+{
        uint32_t val;
 
-       WARN_ON(!IS_GEN9(dev));
+       assert_can_enable_dc5(dev_priv);
 
        DRM_DEBUG_KMS("Enabling DC5\n");
 
@@ -453,10 +483,9 @@ static void gen9_enable_dc5(struct drm_i915_private *dev_priv)
 
 static void gen9_disable_dc5(struct drm_i915_private *dev_priv)
 {
-       struct drm_device *dev = dev_priv->dev;
        uint32_t val;
 
-       WARN_ON(!IS_GEN9(dev));
+       assert_can_disable_dc5(dev_priv);
 
        DRM_DEBUG_KMS("Disabling DC5\n");
 
@@ -1416,7 +1445,7 @@ static struct i915_power_well chv_power_wells[] = {
 };
 
 static struct i915_power_well *lookup_power_well(struct drm_i915_private *dev_priv,
-                                                enum punit_power_well power_well_id)
+                                                int power_well_id)
 {
        struct i915_power_domains *power_domains = &dev_priv->power_domains;
        struct i915_power_well *power_well;
@@ -1430,6 +1459,18 @@ static struct i915_power_well *lookup_power_well(struct drm_i915_private *dev_pr
        return NULL;
 }
 
+bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,
+                                   int power_well_id)
+{
+       struct i915_power_well *power_well;
+       bool ret;
+
+       power_well = lookup_power_well(dev_priv, power_well_id);
+       ret = power_well->ops->is_enabled(dev_priv, power_well);
+
+       return ret;
+}
+
 static struct i915_power_well skl_power_wells[] = {
        {
                .name = "always-on",