enum conversion warnings

enum conversion warnings

[Nick Desaulniers]

pulling down tot, I'm seeing:

  CC [M]  drivers/gpu/drm/i915/intel_ddi.o
drivers/gpu/drm/i915/intel_ddi.c:1481:30: error: implicit conversion
from enumeration type 'enum port' to different enumeration type 'enum
intel_dpll_id' [-Werror,-Wenum-conversion]
        enum intel_dpll_id pll_id = port;
                           ~~~~~~   ^~~~

seems to be coming from commit 2952cd6fb4cc9 "drm/i915: Let's use more
enum intel_dpll_id pll_id."

That commit seems to be using enums instead of uints.  I think maybe
the final 2 hunks of that patch should be reverted?

[PATCH] drm/i915: Avoid enum conversion warning

[Nick Desaulniers]

Fixes the following enum conversion warning:

drivers/gpu/drm/i915/intel_ddi.c:1481:30: error: implicit conversion
from enumeration type 'enum port' to different enumeration type 'enum
intel_dpll_id' [-Werror,-Wenum-conversion]
        enum intel_dpll_id pll_id = port;
                           ~~~~~~   ^~~~

Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 933c18fd4258..f9de45316901 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1478,7 +1478,7 @@ static void bxt_ddi_clock_get(struct intel_encoder *encoder,
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	enum port port = intel_ddi_get_encoder_port(encoder);
-	enum intel_dpll_id pll_id = port;
+	uint32_t pll_id = port;
 
 	pipe_config->port_clock = bxt_calc_pll_link(dev_priv, pll_id);
 
-- 
2.14.1

Re: [Intel-gfx] [PATCH] drm/i915: Avoid enum conversion warning

[Daniel Vetter]

On Wed, Nov 22, 2017 at 11:50:48PM -0800, Nick Desaulniers wrote:
> Fixes the following enum conversion warning:
> 
> drivers/gpu/drm/i915/intel_ddi.c:1481:30: error: implicit conversion
> from enumeration type 'enum port' to different enumeration type 'enum
> intel_dpll_id' [-Werror,-Wenum-conversion]
>         enum intel_dpll_id pll_id = port;
>                            ~~~~~~   ^~~~
> 
> Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 933c18fd4258..f9de45316901 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1478,7 +1478,7 @@ static void bxt_ddi_clock_get(struct intel_encoder *encoder,
>  {
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	enum port port = intel_ddi_get_encoder_port(encoder);
> -	enum intel_dpll_id pll_id = port;
> +	uint32_t pll_id = port;

Please do a cast instead of dropping the dpll enum annotation. Just
shutting up compilers doesn't really help anyone.
-Daniel
>  
>  	pipe_config->port_clock = bxt_calc_pll_link(dev_priv, pll_id);
>  
> -- 
> 2.14.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

[PATCH v2] drm/i915: Avoid enum conversion warning

[Nick Desaulniers]

Fixes the following enum conversion warning:

drivers/gpu/drm/i915/intel_ddi.c:1481:30: error: implicit conversion
from enumeration type 'enum port' to different enumeration type 'enum
intel_dpll_id' [-Werror,-Wenum-conversion]
        enum intel_dpll_id pll_id = port;
                           ~~~~~~   ^~~~

Suggested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 933c18fd4258..3c346c8cbf78 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1477,8 +1477,8 @@ static void bxt_ddi_clock_get(struct intel_encoder *encoder,
 				struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-	enum port port = intel_ddi_get_encoder_port(encoder);
-	enum intel_dpll_id pll_id = port;
+	enum intel_dpll_id pll_id =
+		(enum intel_dpll_id)intel_ddi_get_encoder_port(encoder);
 
 	pipe_config->port_clock = bxt_calc_pll_link(dev_priv, pll_id);
 
-- 
2.14.1

Re: [PATCH v2] drm/i915: Avoid enum conversion warning

[Daniel Vetter]

On Sun, Nov 26, 2017 at 07:49:14PM -0800, Nick Desaulniers wrote:
> Fixes the following enum conversion warning:
> 
> drivers/gpu/drm/i915/intel_ddi.c:1481:30: error: implicit conversion
> from enumeration type 'enum port' to different enumeration type 'enum
> intel_dpll_id' [-Werror,-Wenum-conversion]
>         enum intel_dpll_id pll_id = port;
>                            ~~~~~~   ^~~~
> 
> Suggested-by: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>

This doesn't apply on latest drm-intel.git code anymore, we removed this.
Thanks anyway.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 933c18fd4258..3c346c8cbf78 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1477,8 +1477,8 @@ static void bxt_ddi_clock_get(struct intel_encoder *encoder,
>  				struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> -	enum port port = intel_ddi_get_encoder_port(encoder);
> -	enum intel_dpll_id pll_id = port;
> +	enum intel_dpll_id pll_id =
> +		(enum intel_dpll_id)intel_ddi_get_encoder_port(encoder);
>  
>  	pipe_config->port_clock = bxt_calc_pll_link(dev_priv, pll_id);
>  
> -- 
> 2.14.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch