couldn't we remove now .always_on variable? anyways:
Reviewed-by Rodrigo Vivi <[email protected]> On Thu, Jul 6, 2017 at 7:40 AM, Imre Deak <[email protected]> wrote: > Power well IDs are used for lookup so they must be unique. To ensure > this assign the always-on power well ID everywhere where it's missing. > This didn't cause a problem so far, since we didn't need to look up > power wells that happened to share their IDs. > > Signed-off-by: Imre Deak <[email protected]> > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c > b/drivers/gpu/drm/i915/intel_runtime_pm.c > index ad314c1..9601b62 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -2013,6 +2013,7 @@ static struct i915_power_well > i9xx_always_on_power_well[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > }; > > @@ -2029,6 +2030,7 @@ static struct i915_power_well i830_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "pipes", > @@ -2071,6 +2073,7 @@ static struct i915_power_well hsw_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "display", > @@ -2085,6 +2088,7 @@ static struct i915_power_well bdw_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "display", > @@ -2178,6 +2182,7 @@ static struct i915_power_well chv_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "display", > @@ -2282,6 +2287,7 @@ static struct i915_power_well bxt_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "power well 1", > @@ -2323,6 +2329,7 @@ static struct i915_power_well glk_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "power well 1", > @@ -2408,6 +2415,7 @@ static struct i915_power_well cnl_power_wells[] = { > .always_on = 1, > .domains = POWER_DOMAIN_MASK, > .ops = &i9xx_always_on_power_well_ops, > + .id = I915_DISP_PW_ALWAYS_ON, > }, > { > .name = "power well 1", > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
