drm/i915/icl: Fix power well anonymous union initializers

Similarly to commit 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.

v2:
- Fix checkpatch errors in commit log. (Paulo)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180806095843.13294-2-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index cf89141b22816c855da4f5d7705430f4652b0ffd..11cb2a70e3febd3fdad89745503b4037b5e5e7b6 100644 (file)
--- 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),
+               },
        },
 };