Commit 8825f596 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/adreno: Add helper for formating chip-id 



This is used in a few places, including one that is parsed by userspace
tools.  So let's standardize it a bit better.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/549774/
parent 67133dc0

drivers/gpu/drm/msm/adreno/adreno_device.c

+3 −5
Original line number Diff line number Diff line
@@ -661,14 +661,12 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) 
	info = adreno_info(config.rev);



	if (!info) {

		dev_warn(drm->dev, "Unknown GPU revision: %u.%u.%u.%u\n",

			config.rev.core, config.rev.major,

			config.rev.minor, config.rev.patchid);

		dev_warn(drm->dev, "Unknown GPU revision: %"ADRENO_CHIPID_FMT"\n",

			ADRENO_CHIPID_ARGS(config.rev));

		return -ENXIO;

	}



	DBG("Found GPU: %u.%u.%u.%u", config.rev.core, config.rev.major,

		config.rev.minor, config.rev.patchid);

	DBG("Found GPU: %"ADRENO_CHIPID_FMT, ADRENO_CHIPID_ARGS(config.rev));



	priv->is_a2xx = info->family < ADRENO_3XX;

	priv->has_cached_coherent =

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+8 −11
Original line number Diff line number Diff line
@@ -847,10 +847,9 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, 
	if (IS_ERR_OR_NULL(state))

		return;



	drm_printf(p, "revision: %d (%d.%d.%d.%d)\n",

			adreno_gpu->info->revn, adreno_gpu->rev.core,

			adreno_gpu->rev.major, adreno_gpu->rev.minor,

			adreno_gpu->rev.patchid);

	drm_printf(p, "revision: %u (%"ADRENO_CHIPID_FMT")\n",

			adreno_gpu->info->revn,

			ADRENO_CHIPID_ARGS(adreno_gpu->rev));

	/*

	 * If this is state collected due to iova fault, so fault related info

	 *
@@ -921,10 +920,9 @@ void adreno_dump_info(struct msm_gpu *gpu) 
	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	int i;



	printk("revision: %d (%d.%d.%d.%d)\n",

			adreno_gpu->info->revn, adreno_gpu->rev.core,

			adreno_gpu->rev.major, adreno_gpu->rev.minor,

			adreno_gpu->rev.patchid);

	printk("revision: %u (%"ADRENO_CHIPID_FMT")\n",

			adreno_gpu->info->revn,

			ADRENO_CHIPID_ARGS(adreno_gpu->rev));



	for (i = 0; i < gpu->nr_rings; i++) {

		struct msm_ringbuffer *ring = gpu->rb[i];
@@ -1106,9 +1104,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
		speedbin = 0xffff;

	adreno_gpu->speedbin = (uint16_t) (0xffff & speedbin);



	gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",

			rev->core, rev->major, rev->minor,

			rev->patchid);

	gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%"ADRENO_CHIPID_FMT,

			ADRENO_CHIPID_ARGS(config->rev));

	if (!gpu_name)

		return -ENOMEM;

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ struct adreno_rev { 
#define ADRENO_REV(core, major, minor, patchid) \

	((struct adreno_rev){ core, major, minor, patchid })



/* Helper for formating the chip_id in the way that userspace tools like

 * crashdec expect.

 */

#define ADRENO_CHIPID_FMT "u.%u.%u.%u"

#define ADRENO_CHIPID_ARGS(_r) (_r).core, (_r).major, (_r).minor, (_r).patchid



struct adreno_gpu_funcs {

	struct msm_gpu_funcs base;

	int (*get_timestamp)(struct msm_gpu *gpu, uint64_t *value);