[Intel-gfx] [PATCH 4/5] drm/i915: power_domains_init sort platforms newer-to-older

2018-10-22 Thread Rodrigo Vivi 
No functional change.

Just sorting this "if" block from newer to older platform.

v2: Fix few positions (Ville)

Cc: Jani Nikula 
Signed-off-by: Rodrigo Vivi 
Reviewed-by: Ville Syrjälä 
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c 
b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 31a49bdcf193..5f5416eb9644 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3084,12 +3084,6 @@ int intel_power_domains_init(struct drm_i915_private 
*dev_priv)
 */
if (IS_ICELAKE(dev_priv)) {
err = set_power_wells(power_domains, icl_power_wells);
-   } else if (IS_HASWELL(dev_priv)) {
-   err = set_power_wells(power_domains, hsw_power_wells);
-   } else if (IS_BROADWELL(dev_priv)) {
-   err = set_power_wells(power_domains, bdw_power_wells);
-   } else if (IS_GEN9_BC(dev_priv)) {
-   err = set_power_wells(power_domains, skl_power_wells);
} else if (IS_CANNONLAKE(dev_priv)) {
err = set_power_wells(power_domains, cnl_power_wells);
 
@@ -3101,13 +3095,18 @@ int intel_power_domains_init(struct drm_i915_private 
*dev_priv)
 */
if (!IS_CNL_WITH_PORT_F(dev_priv))
power_domains->power_well_count -= 2;
-
-   } else if (IS_BROXTON(dev_priv)) {
-   err = set_power_wells(power_domains, bxt_power_wells);
} else if (IS_GEMINILAKE(dev_priv)) {
err = set_power_wells(power_domains, glk_power_wells);
+   } else if (IS_BROXTON(dev_priv)) {
+   err = set_power_wells(power_domains, bxt_power_wells);
+   } else if (IS_GEN9_BC(dev_priv)) {
+   err = set_power_wells(power_domains, skl_power_wells);
} else if (IS_CHERRYVIEW(dev_priv)) {
err = set_power_wells(power_domains, chv_power_wells);
+   } else if (IS_BROADWELL(dev_priv)) {
+   err = set_power_wells(power_domains, bdw_power_wells);
+   } else if (IS_HASWELL(dev_priv)) {
+   err = set_power_wells(power_domains, hsw_power_wells);
} else if (IS_VALLEYVIEW(dev_priv)) {
err = set_power_wells(power_domains, vlv_power_wells);
} else if (IS_I830(dev_priv)) {
-- 
2.19.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 4/5] drm/i915: power_domains_init sort platforms newer-to-older

2018-10-19 Thread Ville Syrjälä 
On Fri, Oct 19, 2018 at 12:03:34PM -0700, Rodrigo Vivi wrote:
> No functional change.
> 
> Just sorting this "if" block from newer to older platform.
> 
> Cc: Jani Nikula 
> Signed-off-by: Rodrigo Vivi 
> ---
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 17 -
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c 
> b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 31a49bdcf193..bcc639940c5e 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -3084,12 +3084,6 @@ int intel_power_domains_init(struct drm_i915_private 
> *dev_priv)
>*/
>   if (IS_ICELAKE(dev_priv)) {
>   err = set_power_wells(power_domains, icl_power_wells);
> - } else if (IS_HASWELL(dev_priv)) {
> - err = set_power_wells(power_domains, hsw_power_wells);
> - } else if (IS_BROADWELL(dev_priv)) {
> - err = set_power_wells(power_domains, bdw_power_wells);
> - } else if (IS_GEN9_BC(dev_priv)) {
> - err = set_power_wells(power_domains, skl_power_wells);
>   } else if (IS_CANNONLAKE(dev_priv)) {
>   err = set_power_wells(power_domains, cnl_power_wells);
>  
> @@ -3101,15 +3095,20 @@ int intel_power_domains_init(struct drm_i915_private 
> *dev_priv)
>*/
>   if (!IS_CNL_WITH_PORT_F(dev_priv))
>   power_domains->power_well_count -= 2;
> -
> - } else if (IS_BROXTON(dev_priv)) {
> - err = set_power_wells(power_domains, bxt_power_wells);
>   } else if (IS_GEMINILAKE(dev_priv)) {
>   err = set_power_wells(power_domains, glk_power_wells);
> + } else if (IS_GEN9_BC(dev_priv)) {
> + err = set_power_wells(power_domains, skl_power_wells);
> + } else if (IS_BROXTON(dev_priv)) {
> + err = set_power_wells(power_domains, bxt_power_wells);

bxt before skl+ is what my chronometer says

> + } else if (IS_BROADWELL(dev_priv)) {
> + err = set_power_wells(power_domains, bdw_power_wells);
>   } else if (IS_CHERRYVIEW(dev_priv)) {
>   err = set_power_wells(power_domains, chv_power_wells);

and chv before bdw

>   } else if (IS_VALLEYVIEW(dev_priv)) {
>   err = set_power_wells(power_domains, vlv_power_wells);
> + } else if (IS_HASWELL(dev_priv)) {
> + err = set_power_wells(power_domains, hsw_power_wells);

and hsw before vlv ... I think

>   } else if (IS_I830(dev_priv)) {
>   err = set_power_wells(power_domains, i830_power_wells);

Dang! i830 ruins it anyway ;)

Reviewed-by: Ville Syrjälä 

>   } else {
> -- 
> 2.19.1
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 4/5] drm/i915: power_domains_init sort platforms newer-to-older

2018-10-19 Thread Rodrigo Vivi 
No functional change.

Just sorting this "if" block from newer to older platform.

Cc: Jani Nikula 
Signed-off-by: Rodrigo Vivi 
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c 
b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 31a49bdcf193..bcc639940c5e 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3084,12 +3084,6 @@ int intel_power_domains_init(struct drm_i915_private 
*dev_priv)
 */
if (IS_ICELAKE(dev_priv)) {
err = set_power_wells(power_domains, icl_power_wells);
-   } else if (IS_HASWELL(dev_priv)) {
-   err = set_power_wells(power_domains, hsw_power_wells);
-   } else if (IS_BROADWELL(dev_priv)) {
-   err = set_power_wells(power_domains, bdw_power_wells);
-   } else if (IS_GEN9_BC(dev_priv)) {
-   err = set_power_wells(power_domains, skl_power_wells);
} else if (IS_CANNONLAKE(dev_priv)) {
err = set_power_wells(power_domains, cnl_power_wells);
 
@@ -3101,15 +3095,20 @@ int intel_power_domains_init(struct drm_i915_private 
*dev_priv)
 */
if (!IS_CNL_WITH_PORT_F(dev_priv))
power_domains->power_well_count -= 2;
-
-   } else if (IS_BROXTON(dev_priv)) {
-   err = set_power_wells(power_domains, bxt_power_wells);
} else if (IS_GEMINILAKE(dev_priv)) {
err = set_power_wells(power_domains, glk_power_wells);
+   } else if (IS_GEN9_BC(dev_priv)) {
+   err = set_power_wells(power_domains, skl_power_wells);
+   } else if (IS_BROXTON(dev_priv)) {
+   err = set_power_wells(power_domains, bxt_power_wells);
+   } else if (IS_BROADWELL(dev_priv)) {
+   err = set_power_wells(power_domains, bdw_power_wells);
} else if (IS_CHERRYVIEW(dev_priv)) {
err = set_power_wells(power_domains, chv_power_wells);
} else if (IS_VALLEYVIEW(dev_priv)) {
err = set_power_wells(power_domains, vlv_power_wells);
+   } else if (IS_HASWELL(dev_priv)) {
+   err = set_power_wells(power_domains, hsw_power_wells);
} else if (IS_I830(dev_priv)) {
err = set_power_wells(power_domains, i830_power_wells);
} else {
-- 
2.19.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx