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

Commit c96ea64e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: dump the device info 



Handy for lazy people like me, or when people forget to add the output
of lspci -nn.

v2: Chris Wilson noticed that we have this duplicated already in the
i915_capabilites debugfs file. But there \n as separator looks better,
which would be a bit verbose in dmesg. Abuse the preprocessor to
extract this all.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 65bccb5c

drivers/gpu/drm/i915/i915_debugfs.c

+5 −22
Original line number Diff line number Diff line
@@ -61,28 +61,11 @@ static int i915_capabilities(struct seq_file *m, void *data) 


	seq_printf(m, "gen: %d\n", info->gen);

	seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev));

#define B(x) seq_printf(m, #x ": %s\n", yesno(info->x))

	B(is_mobile);

	B(is_i85x);

	B(is_i915g);

	B(is_i945gm);

	B(is_g33);

	B(need_gfx_hws);

	B(is_g4x);

	B(is_pineview);

	B(is_broadwater);

	B(is_crestline);

	B(has_fbc);

	B(has_pipe_cxsr);

	B(has_hotplug);

	B(cursor_needs_physical);

	B(has_overlay);

	B(overlay_needs_physical);

	B(supports_tv);

	B(has_bsd_ring);

	B(has_blt_ring);

	B(has_llc);

#undef B

#define DEV_INFO_FLAG(x) seq_printf(m, #x ": %s\n", yesno(info->x))

#define DEV_INFO_SEP ;

	DEV_INFO_FLAGS;

#undef DEV_INFO_FLAG

#undef DEV_INFO_SEP



	return 0;

}

drivers/gpu/drm/i915/i915_dma.c

+17 −1
Original line number Diff line number Diff line
@@ -1428,6 +1428,21 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 
	kfree(ap);

}



static void i915_dump_device_info(struct drm_i915_private *dev_priv)

{

	const struct intel_device_info *info = dev_priv->info;



#define DEV_INFO_FLAG(name) info->name ? #name "," : ""

#define DEV_INFO_SEP ,

	DRM_DEBUG_DRIVER("i915 device info: gen=%i, pciid=0x%04x flags="

			 "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",

			 info->gen,

			 dev_priv->dev->pdev->device,

			 DEV_INFO_FLAGS);

#undef DEV_INFO_FLAG

#undef DEV_INFO_SEP

}



/**

 * i915_driver_load - setup chip and create an initial config

 * @dev: DRM device
@@ -1452,7 +1467,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;





	/* i915 has 4 more counters */

	dev->counters += 4;

	dev->types[6] = _DRM_STAT_IRQ;
@@ -1468,6 +1482,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	dev_priv->dev = dev;

	dev_priv->info = info;



	i915_dump_device_info(dev_priv);



	if (i915_get_bridge_dev(dev)) {

		ret = -EIO;

		goto free_priv;

drivers/gpu/drm/i915/i915_drv.h

+26 −0
Original line number Diff line number Diff line
@@ -279,6 +279,32 @@ struct drm_i915_gt_funcs { 
	void (*force_wake_put)(struct drm_i915_private *dev_priv);

};



#define DEV_INFO_FLAGS \

	DEV_INFO_FLAG(is_mobile) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_i85x) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_i915g) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_i945gm) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_g33) DEV_INFO_SEP \

	DEV_INFO_FLAG(need_gfx_hws) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_g4x) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_pineview) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_broadwater) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_crestline) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_ivybridge) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_valleyview) DEV_INFO_SEP \

	DEV_INFO_FLAG(is_haswell) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_force_wake) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_fbc) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_pipe_cxsr) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_hotplug) DEV_INFO_SEP \

	DEV_INFO_FLAG(cursor_needs_physical) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_overlay) DEV_INFO_SEP \

	DEV_INFO_FLAG(overlay_needs_physical) DEV_INFO_SEP \

	DEV_INFO_FLAG(supports_tv) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_bsd_ring) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_blt_ring) DEV_INFO_SEP \

	DEV_INFO_FLAG(has_llc)



struct intel_device_info {

	u8 gen;

	u8 is_mobile:1;