Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b53af8bb authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Use GUC prefix for CORE_FAMILY definitions 



Almost all other GuC fw definitions are using GUC|guc prefix.
While around, in get_core_family() change explicit WARN into MISSING_CASE
as it looks more appropriate, since GuC support capability we are controlling
by intel_device_info.has_guc flag.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170404133836.125736-1-michal.wajdeczko@intel.com


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b64b7a60

drivers/gpu/drm/i915/intel_guc_fwif.h

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#ifndef _INTEL_GUC_FWIF_H

#define _INTEL_GUC_FWIF_H



#define GFXCORE_FAMILY_GEN9		12

#define GFXCORE_FAMILY_UNKNOWN		0x7fffffff

#define GUC_CORE_FAMILY_GEN9		12

#define GUC_CORE_FAMILY_UNKNOWN		0x7fffffff



#define GUC_CLIENT_PRIORITY_KMD_HIGH	0

#define GUC_CLIENT_PRIORITY_HIGH	1

drivers/gpu/drm/i915/intel_guc_loader.c

+3 −3
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ static u32 get_core_family(struct drm_i915_private *dev_priv) 


	switch (gen) {

	case 9:

		return GFXCORE_FAMILY_GEN9;

		return GUC_CORE_FAMILY_GEN9;



	default:

		WARN(1, "GEN%d does not support GuC operation!\n", gen);

		return GFXCORE_FAMILY_UNKNOWN;

		MISSING_CASE(gen);

		return GUC_CORE_FAMILY_UNKNOWN;

	}

}