Commit ae9b06ca authored by Imre Deak's avatar Imre Deak

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

Similarly to commit 0a445945
("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: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180806095843.13294-2-imre.deak@intel.com
parent 97f06158
...@@ -2620,15 +2620,19 @@ static struct i915_power_well icl_power_wells[] = { ...@@ -2620,15 +2620,19 @@ static struct i915_power_well icl_power_wells[] = {
.domains = 0, .domains = 0,
.ops = &hsw_power_well_ops, .ops = &hsw_power_well_ops,
.id = ICL_DISP_PW_1, .id = ICL_DISP_PW_1,
{
.hsw.has_fuses = true, .hsw.has_fuses = true,
}, },
},
{ {
.name = "power well 2", .name = "power well 2",
.domains = ICL_PW_2_POWER_DOMAINS, .domains = ICL_PW_2_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &hsw_power_well_ops,
.id = ICL_DISP_PW_2, .id = ICL_DISP_PW_2,
{
.hsw.has_fuses = true, .hsw.has_fuses = true,
}, },
},
{ {
.name = "DC off", .name = "DC off",
.domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS, .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS,
...@@ -2640,10 +2644,12 @@ static struct i915_power_well icl_power_wells[] = { ...@@ -2640,10 +2644,12 @@ static struct i915_power_well icl_power_wells[] = {
.domains = ICL_PW_3_POWER_DOMAINS, .domains = ICL_PW_3_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &hsw_power_well_ops,
.id = ICL_DISP_PW_3, .id = ICL_DISP_PW_3,
{
.hsw.irq_pipe_mask = BIT(PIPE_B), .hsw.irq_pipe_mask = BIT(PIPE_B),
.hsw.has_vga = true, .hsw.has_vga = true,
.hsw.has_fuses = true, .hsw.has_fuses = true,
}, },
},
{ {
.name = "DDI A IO", .name = "DDI A IO",
.domains = ICL_DDI_IO_A_POWER_DOMAINS, .domains = ICL_DDI_IO_A_POWER_DOMAINS,
...@@ -2745,9 +2751,11 @@ static struct i915_power_well icl_power_wells[] = { ...@@ -2745,9 +2751,11 @@ static struct i915_power_well icl_power_wells[] = {
.domains = ICL_PW_4_POWER_DOMAINS, .domains = ICL_PW_4_POWER_DOMAINS,
.ops = &hsw_power_well_ops, .ops = &hsw_power_well_ops,
.id = ICL_DISP_PW_4, .id = ICL_DISP_PW_4,
{
.hsw.has_fuses = true, .hsw.has_fuses = true,
.hsw.irq_pipe_mask = BIT(PIPE_C), .hsw.irq_pipe_mask = BIT(PIPE_C),
}, },
},
}; };
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment