drm/i915: Check for duplicated power well IDs

Check that all the power well IDs are unique on the given platform.

v2:
- Fix using BIT_ULL() instead of BIT() for 64 bit mask.
v3:
- Move the check to a separate function. (Ville)

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170711204236.5618-4-imre.deak@intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 7443a61ba0c52bf8aa6a0550fded5b25c5354034..262c3fa886a9fed807648f72dbbeb78b37819a85 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -2548,6 +2548,22 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv,
        return mask;
 }
 
+static void assert_power_well_ids_unique(struct drm_i915_private *dev_priv)
+{
+       struct i915_power_domains *power_domains = &dev_priv->power_domains;
+       u64 power_well_ids;
+       int i;
+
+       power_well_ids = 0;
+       for (i = 0; i < power_domains->power_well_count; i++) {
+               enum i915_power_well_id id = power_domains->power_wells[i].id;
+
+               WARN_ON(id >= sizeof(power_well_ids) * 8);
+               WARN_ON(power_well_ids & BIT_ULL(id));
+               power_well_ids |= BIT_ULL(id);
+       }
+}
+
 #define set_power_wells(power_domains, __power_wells) ({               \
        (power_domains)->power_wells = (__power_wells);                 \
        (power_domains)->power_well_count = ARRAY_SIZE(__power_wells);  \
@@ -2599,6 +2615,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
                set_power_wells(power_domains, i9xx_always_on_power_well);
        }
 
+       assert_power_well_ids_unique(dev_priv);
+
        return 0;
 }