Commit 39a445bb authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move has_pooled_eu to runtime info 



If it's modified runtime, it's runtime info.

Curiously, the flag was never initialized statically.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMaarten Lankhort <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/db6d47abd87c74ae5f5be1cda62af13518c896fb.1660910433.git.jani.nikula@intel.com
parent 268c67e5

drivers/gpu/drm/i915/gt/intel_sseu.c

+2 −3
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ static void cherryview_sseu_info_init(struct intel_gt *gt) 
static void gen9_sseu_info_init(struct intel_gt *gt)

{

	struct drm_i915_private *i915 = gt->i915;

	struct intel_device_info *info = mkwrite_device_info(i915);

	struct sseu_dev_info *sseu = &gt->info.sseu;

	struct intel_uncore *uncore = gt->uncore;

	u32 fuse2, eu_disable, subslice_mask;
@@ -471,10 +470,10 @@ static void gen9_sseu_info_init(struct intel_gt *gt) 


	if (IS_GEN9_LP(i915)) {

#define IS_SS_DISABLED(ss)	(!(sseu->subslice_mask.hsw[0] & BIT(ss)))

		info->has_pooled_eu = hweight8(sseu->subslice_mask.hsw[0]) == 3;

		RUNTIME_INFO(i915)->has_pooled_eu = hweight8(sseu->subslice_mask.hsw[0]) == 3;



		sseu->min_eu_in_pool = 0;

		if (info->has_pooled_eu) {

		if (HAS_POOLED_EU(i915)) {

			if (IS_SS_DISABLED(2) || IS_SS_DISABLED(0))

				sseu->min_eu_in_pool = 3;

			else if (IS_SS_DISABLED(1))

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 


#define HAS_GT_UC(dev_priv)	(INTEL_INFO(dev_priv)->has_gt_uc)



#define HAS_POOLED_EU(dev_priv)	(INTEL_INFO(dev_priv)->has_pooled_eu)

#define HAS_POOLED_EU(dev_priv)	(RUNTIME_INFO(dev_priv)->has_pooled_eu)



#define HAS_GLOBAL_MOCS_REGISTERS(dev_priv)	(INTEL_INFO(dev_priv)->has_global_mocs)

drivers/gpu/drm/i915/intel_device_info.c

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ void intel_device_info_print(const struct intel_device_info *info, 
	DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG);

#undef PRINT_FLAG



	drm_printf(p, "has_pooled_eu: %s\n", str_yes_no(runtime->has_pooled_eu));



#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display.name))

	DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);

#undef PRINT_FLAG

drivers/gpu/drm/i915/intel_device_info.h

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ enum intel_ppgtt_type { 
	func(has_media_ratio_mode); \

	func(has_mslice_steering); \

	func(has_one_eu_per_fuse_bit); \

	func(has_pooled_eu); \

	func(has_pxp); \

	func(has_rc6); \

	func(has_rc6p); \
@@ -226,6 +225,8 @@ struct intel_runtime_info { 
	enum intel_ppgtt_type ppgtt_type;

	unsigned int ppgtt_size; /* log2, e.g. 31/32/48 bits */



	bool has_pooled_eu;



	/* display */

	struct {

		u8 num_sprites[I915_MAX_PIPES];