Commit 0258404f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: start moving runtime device info to a separate struct 



First move the low hanging fruit, the fields that are only initialized
runtime. Use RUNTIME_INFO() exclusively to access the fields.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c24fe7a4b0492a888690c46814c0ff21ce2f12b1.1546267488.git.jani.nikula@intel.com
parent 1216e3c3

drivers/gpu/drm/i915/i915_debugfs.c

+13 −13
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev_priv));



	intel_device_info_dump_flags(info, &p);

	intel_device_info_dump_runtime(info, &p);

	intel_device_info_dump_runtime(RUNTIME_INFO(dev_priv), &p);

	intel_driver_caps_print(&dev_priv->caps, &p);



	kernel_param_lock(THIS_MODULE);
@@ -3157,7 +3157,7 @@ static int i915_engine_info(struct seq_file *m, void *unused) 
	seq_printf(m, "Global active requests: %d\n",

		   dev_priv->gt.active_requests);

	seq_printf(m, "CS timestamp frequency: %u kHz\n",

		   dev_priv->info.cs_timestamp_frequency_khz);

		   RUNTIME_INFO(dev_priv)->cs_timestamp_frequency_khz);



	p = drm_seq_file_printer(m);

	for_each_engine(engine, dev_priv, id)
@@ -3173,7 +3173,7 @@ static int i915_rcs_topology(struct seq_file *m, void *unused) 
	struct drm_i915_private *dev_priv = node_to_i915(m->private);

	struct drm_printer p = drm_seq_file_printer(m);



	intel_device_info_dump_topology(&INTEL_INFO(dev_priv)->sseu, &p);

	intel_device_info_dump_topology(&RUNTIME_INFO(dev_priv)->sseu, &p);



	return 0;

}
@@ -4209,7 +4209,7 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, 
				     struct sseu_dev_info *sseu)

{

#define SS_MAX 6

	const struct intel_device_info *info = INTEL_INFO(dev_priv);

	const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv);

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;
@@ -4265,7 +4265,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 
				    struct sseu_dev_info *sseu)

{

#define SS_MAX 3

	const struct intel_device_info *info = INTEL_INFO(dev_priv);

	const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv);

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;
@@ -4293,7 +4293,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 


		if (IS_GEN9_BC(dev_priv))

			sseu->subslice_mask[s] =

				INTEL_INFO(dev_priv)->sseu.subslice_mask[s];

				RUNTIME_INFO(dev_priv)->sseu.subslice_mask[s];



		for (ss = 0; ss < info->sseu.max_subslices; ss++) {

			unsigned int eu_cnt;
@@ -4327,10 +4327,10 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, 


	if (sseu->slice_mask) {

		sseu->eu_per_subslice =

				INTEL_INFO(dev_priv)->sseu.eu_per_subslice;

			RUNTIME_INFO(dev_priv)->sseu.eu_per_subslice;

		for (s = 0; s < fls(sseu->slice_mask); s++) {

			sseu->subslice_mask[s] =

				INTEL_INFO(dev_priv)->sseu.subslice_mask[s];

				RUNTIME_INFO(dev_priv)->sseu.subslice_mask[s];

		}

		sseu->eu_total = sseu->eu_per_subslice *

				 sseu_subslice_total(sseu);
@@ -4338,7 +4338,7 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, 
		/* subtract fused off EU(s) from enabled slice(s) */

		for (s = 0; s < fls(sseu->slice_mask); s++) {

			u8 subslice_7eu =

				INTEL_INFO(dev_priv)->sseu.subslice_7eu[s];

				RUNTIME_INFO(dev_priv)->sseu.subslice_7eu[s];



			sseu->eu_total -= hweight8(subslice_7eu);

		}
@@ -4391,14 +4391,14 @@ static int i915_sseu_status(struct seq_file *m, void *unused) 
		return -ENODEV;



	seq_puts(m, "SSEU Device Info\n");

	i915_print_sseu_info(m, true, &INTEL_INFO(dev_priv)->sseu);

	i915_print_sseu_info(m, true, &RUNTIME_INFO(dev_priv)->sseu);



	seq_puts(m, "SSEU Device Status\n");

	memset(&sseu, 0, sizeof(sseu));

	sseu.max_slices = INTEL_INFO(dev_priv)->sseu.max_slices;

	sseu.max_subslices = INTEL_INFO(dev_priv)->sseu.max_subslices;

	sseu.max_slices = RUNTIME_INFO(dev_priv)->sseu.max_slices;

	sseu.max_subslices = RUNTIME_INFO(dev_priv)->sseu.max_subslices;

	sseu.max_eus_per_subslice =

		INTEL_INFO(dev_priv)->sseu.max_eus_per_subslice;

		RUNTIME_INFO(dev_priv)->sseu.max_eus_per_subslice;



	intel_runtime_pm_get(dev_priv);

drivers/gpu/drm/i915/i915_drv.c

+8 −8
Original line number Diff line number Diff line
@@ -358,12 +358,12 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, 
		value = i915_cmd_parser_get_version(dev_priv);

		break;

	case I915_PARAM_SUBSLICE_TOTAL:

		value = sseu_subslice_total(&INTEL_INFO(dev_priv)->sseu);

		value = sseu_subslice_total(&RUNTIME_INFO(dev_priv)->sseu);

		if (!value)

			return -ENODEV;

		break;

	case I915_PARAM_EU_TOTAL:

		value = INTEL_INFO(dev_priv)->sseu.eu_total;

		value = RUNTIME_INFO(dev_priv)->sseu.eu_total;

		if (!value)

			return -ENODEV;

		break;
@@ -380,7 +380,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, 
		value = HAS_POOLED_EU(dev_priv);

		break;

	case I915_PARAM_MIN_EU_IN_POOL:

		value = INTEL_INFO(dev_priv)->sseu.min_eu_in_pool;

		value = RUNTIME_INFO(dev_priv)->sseu.min_eu_in_pool;

		break;

	case I915_PARAM_HUC_STATUS:

		value = intel_huc_check_status(&dev_priv->huc);
@@ -430,17 +430,17 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, 
		value = intel_engines_has_context_isolation(dev_priv);

		break;

	case I915_PARAM_SLICE_MASK:

		value = INTEL_INFO(dev_priv)->sseu.slice_mask;

		value = RUNTIME_INFO(dev_priv)->sseu.slice_mask;

		if (!value)

			return -ENODEV;

		break;

	case I915_PARAM_SUBSLICE_MASK:

		value = INTEL_INFO(dev_priv)->sseu.subslice_mask[0];

		value = RUNTIME_INFO(dev_priv)->sseu.subslice_mask[0];

		if (!value)

			return -ENODEV;

		break;

	case I915_PARAM_CS_TIMESTAMP_FREQUENCY:

		value = 1000 * INTEL_INFO(dev_priv)->cs_timestamp_frequency_khz;

		value = 1000 * RUNTIME_INFO(dev_priv)->cs_timestamp_frequency_khz;

		break;

	case I915_PARAM_MMAP_GTT_COHERENT:

		value = INTEL_INFO(dev_priv)->has_coherent_ggtt;
@@ -1637,7 +1637,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv) 
		struct drm_printer p = drm_debug_printer("i915 device info:");



		intel_device_info_dump(&dev_priv->info, &p);

		intel_device_info_dump_runtime(&dev_priv->info, &p);

		intel_device_info_dump_runtime(RUNTIME_INFO(dev_priv), &p);

	}



	if (IS_ENABLED(CONFIG_DRM_I915_DEBUG))
@@ -1674,7 +1674,7 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Setup the write-once "constant" device info */

	device_info = mkwrite_device_info(i915);

	memcpy(device_info, match_info, sizeof(*device_info));

	device_info->device_id = pdev->device;

	RUNTIME_INFO(i915)->device_id = pdev->device;



	BUILD_BUG_ON(INTEL_MAX_PLATFORMS >

		     BITS_PER_TYPE(device_info->platform_mask));

drivers/gpu/drm/i915/i915_drv.h

+3 −1
Original line number Diff line number Diff line
@@ -1432,6 +1432,7 @@ struct drm_i915_private { 
	struct kmem_cache *priorities;



	const struct intel_device_info info;

	struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */

	struct intel_driver_caps caps;



	/**
@@ -2198,10 +2199,11 @@ intel_info(const struct drm_i915_private *dev_priv) 
}



#define INTEL_INFO(dev_priv)	intel_info((dev_priv))

#define RUNTIME_INFO(dev_priv)	(&(dev_priv)->__runtime)

#define DRIVER_CAPS(dev_priv)	(&(dev_priv)->caps)



#define INTEL_GEN(dev_priv)	((dev_priv)->info.gen)

#define INTEL_DEVID(dev_priv)	((dev_priv)->info.device_id)

#define INTEL_DEVID(dev_priv)	(RUNTIME_INFO(dev_priv)->device_id)



#define REVID_FOREVER		0xff

#define INTEL_REVID(dev_priv)	((dev_priv)->drm.pdev->revision)

drivers/gpu/drm/i915/i915_gpu_error.c

+7 −2
Original line number Diff line number Diff line
@@ -594,13 +594,14 @@ static void print_error_obj(struct drm_i915_error_state_buf *m, 


static void err_print_capabilities(struct drm_i915_error_state_buf *m,

				   const struct intel_device_info *info,

				   const struct intel_runtime_info *runtime,

				   const struct intel_driver_caps *caps)

{

	struct drm_printer p = i915_error_printer(m);



	intel_device_info_dump_flags(info, &p);

	intel_driver_caps_print(caps, &p);

	intel_device_info_dump_topology(&info->sseu, &p);

	intel_device_info_dump_topology(&runtime->sseu, &p);

}



static void err_print_params(struct drm_i915_error_state_buf *m,
@@ -844,7 +845,8 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, 
	if (error->display)

		intel_display_print_error_state(m, error->display);



	err_print_capabilities(m, &error->device_info, &error->driver_caps);

	err_print_capabilities(m, &error->device_info, &error->runtime_info,

			       &error->driver_caps);

	err_print_params(m, &error->params);

	err_print_uc(m, &error->uc);

}
@@ -1824,6 +1826,9 @@ static void capture_gen_state(struct i915_gpu_state *error) 
	memcpy(&error->device_info,

	       INTEL_INFO(i915),

	       sizeof(error->device_info));

	memcpy(&error->runtime_info,

	       RUNTIME_INFO(i915),

	       sizeof(error->runtime_info));

	error->driver_caps = i915->caps;

}

drivers/gpu/drm/i915/i915_gpu_error.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct i915_gpu_state { 
	u32 reset_count;

	u32 suspend_count;

	struct intel_device_info device_info;

	struct intel_runtime_info runtime_info;

	struct intel_driver_caps driver_caps;

	struct i915_params params;