Commit 401d0ae3 authored by Andrew Morton's avatar Andrew Morton Committed by Jani Nikula

drm/i915/guc: work around gcc-4.4.4 union initializer issue

gcc-4.4.4 has problems with initalizers of anon unions.

drivers/gpu/drm/i915/intel_guc_log.c: In function 'guc_log_control':
drivers/gpu/drm/i915/intel_guc_log.c:64: error: unknown field 'logging_enabled' specified in initializer

Work around this.

Fixes: 35fe703c ("drm/i915/guc: Change values for i915_guc_log_control")
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180308001333.rI2vrNRTY%akpm@linux-foundation.org
parent a4713c5a
...@@ -61,8 +61,10 @@ static int guc_log_flush(struct intel_guc *guc) ...@@ -61,8 +61,10 @@ static int guc_log_flush(struct intel_guc *guc)
static int guc_log_control(struct intel_guc *guc, bool enable, u32 verbosity) static int guc_log_control(struct intel_guc *guc, bool enable, u32 verbosity)
{ {
union guc_log_control control_val = { union guc_log_control control_val = {
.logging_enabled = enable, {
.verbosity = verbosity, .logging_enabled = enable,
.verbosity = verbosity,
},
}; };
u32 action[] = { u32 action[] = {
INTEL_GUC_ACTION_UK_LOG_ENABLE_LOGGING, INTEL_GUC_ACTION_UK_LOG_ENABLE_LOGGING,
......
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