[Intel-gfx] [PATCH 01/10] drm/i915/icl: Fix power well anonymous union initializers

[Paulo Zanoni]

Em Sex, 2018-07-20 às 17:14 +0300, Imre Deak escreveu:
> Similarly to
> 0a445945be6d ("drm/i915: Work around GCC anonymous union
> initialization bug")
> we need to initialize anonymous unions inside extra braces to work
> around a GCC4.4 build error.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Ville Syrjala <ville.syrjala at linux.intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>

With the checkpatch issues fixed:

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

> Cc: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 22 +++++++++++++++-------
>  1 file changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
> b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 6b5aa3b074ec..1a87176a85c1 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -2620,14 +2620,18 @@ static struct i915_power_well
> icl_power_wells[] = {
>  		.domains = 0,
>  		.ops = &hsw_power_well_ops,
>  		.id = ICL_DISP_PW_1,
> -		.hsw.has_fuses = true,
> +		{
> +			.hsw.has_fuses = true,
> +		},
>  	},
>  	{
>  		.name = "power well 2",
>  		.domains = ICL_PW_2_POWER_DOMAINS,
>  		.ops = &hsw_power_well_ops,
>  		.id = ICL_DISP_PW_2,
> -		.hsw.has_fuses = true,
> +		{
> +			.hsw.has_fuses = true,
> +		},
>  	},
>  	{
>  		.name = "DC off",
> @@ -2640,9 +2644,11 @@ static struct i915_power_well
> icl_power_wells[] = {
>  		.domains = ICL_PW_3_POWER_DOMAINS,
>  		.ops = &hsw_power_well_ops,
>  		.id = ICL_DISP_PW_3,
> -		.hsw.irq_pipe_mask = BIT(PIPE_B),
> -		.hsw.has_vga = true,
> -		.hsw.has_fuses = true,
> +		{
> +			.hsw.irq_pipe_mask = BIT(PIPE_B),
> +			.hsw.has_vga = true,
> +			.hsw.has_fuses = true,
> +		},
>  	},
>  	{
>  		.name = "DDI A IO",
> @@ -2745,8 +2751,10 @@ static struct i915_power_well
> icl_power_wells[] = {
>  		.domains = ICL_PW_4_POWER_DOMAINS,
>  		.ops = &hsw_power_well_ops,
>  		.id = ICL_DISP_PW_4,
> -		.hsw.has_fuses = true,
> -		.hsw.irq_pipe_mask = BIT(PIPE_C),
> +		{
> +			.hsw.has_fuses = true,
> +			.hsw.irq_pipe_mask = BIT(PIPE_C),
> +		},
>  	},
>  };
>