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

Commit db97984e authored by Sushmita Susheelendra's avatar Sushmita Susheelendra
Browse files

msm: kgsl: Add sysfs node to enable GMU log streaming 



GMU log entries are not streamed out to the host by default.
The log_stream_enable sysfs node allows that.

Change-Id: I8e532cbb059f98652d2bf72842245625549002f1
Signed-off-by: default avatarSushmita Susheelendra <ssusheel@codeaurora.org>
parent 8543fd31

drivers/gpu/msm/adreno_a6xx_gmu.h

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ struct a6xx_gmu_device { 
	void __iomem *rdpm_cx_virt;

	/** @rdpm_mx_virt: Pointer where the RDPM MX block is mapped */

	void __iomem *rdpm_mx_virt;

	/** @log_stream_enable: GMU log streaming enable */

	bool log_stream_enable;

};



/* Helper function to get to a6xx gmu device from adreno device */

drivers/gpu/msm/adreno_a6xx_hfi.c

+21 −0
Original line number Diff line number Diff line
@@ -439,6 +439,27 @@ int a6xx_hfi_send_feature_ctrl(struct adreno_device *adreno_dev, 
	return ret;

}



int a6xx_hfi_send_set_value(struct adreno_device *adreno_dev,

		u32 type, u32 subtype, u32 data)

{

	struct a6xx_gmu_device *gmu = to_a6xx_gmu(adreno_dev);

	struct hfi_set_value_cmd cmd = {

		.type = type,

		.subtype = subtype,

		.data = data,

	};

	int ret;



	CMD_MSG_HDR(cmd, H2F_MSG_SET_VALUE);



	ret = a6xx_hfi_send_generic_req(adreno_dev, &cmd);

	if (ret)

		dev_err(&gmu->pdev->dev,

			"Unable to set HFI Value %d, %d to %d, error = %d\n",

			type, subtype, data, ret);

	return ret;

}



static int a6xx_hfi_send_dcvstbl_v1(struct adreno_device *adreno_dev)

{

	struct a6xx_gmu_device *gmu = to_a6xx_gmu(adreno_dev);

drivers/gpu/msm/adreno_a6xx_hfi.h

+13 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#define HFI_VALUE_LOG_EVENT_OFF		113

#define HFI_VALUE_DCVS_OBJ		114

#define HFI_VALUE_LM_CS0		115

#define HFI_VALUE_LOG_STREAM_ENABLE	119

#define HFI_VALUE_PREEMPT_COUNT         120



#define HFI_VALUE_GLOBAL_TOKEN		0xFFFFFFFF
@@ -664,6 +665,18 @@ int a6xx_receive_ack_cmd(struct a6xx_gmu_device *gmu, void *rcvd, 
int a6xx_hfi_send_feature_ctrl(struct adreno_device *adreno_dev,

	u32 feature, u32 enable, u32 data);



/**

 * a6xx_hfi_send_set_value - Send gmu set_values via hfi

 * @adreno_dev: Pointer to the adreno device

 * @type: GMU set_value type

 * @subtype: GMU set_value subtype

 * @data: Value to set

 *

 * Return: 0 on success or negative error on failure

 */

int a6xx_hfi_send_set_value(struct adreno_device *adreno_dev,

		u32 type, u32 subtype, u32 data);



/**

 * a6xx_hfi_send_core_fw_start - Send the core fw start hfi

 * @adreno_dev: Pointer to the adreno device

drivers/gpu/msm/adreno_a6xx_hwsched_hfi.c

+4 −0
Original line number Diff line number Diff line
@@ -807,6 +807,10 @@ int a6xx_hwsched_hfi_start(struct adreno_device *adreno_dev) 
	if (ret)

		goto err;



	if (gmu->log_stream_enable)

		a6xx_hfi_send_set_value(adreno_dev,

			HFI_VALUE_LOG_STREAM_ENABLE, 0, 1);



	ret = a6xx_hfi_send_core_fw_start(adreno_dev);

	if (ret)

		goto err;

drivers/gpu/msm/adreno_hwsched.c

+23 −3
Original line number Diff line number Diff line
@@ -1070,18 +1070,38 @@ static unsigned int _preempt_count_show(struct adreno_device *adreno_dev) 
	return count < 0 ? 0 : count;

}



static int _gmu_log_stream_enable_store(struct adreno_device *adreno_dev,

		bool val)

{

	struct a6xx_gmu_device *gmu = to_a6xx_gmu(adreno_dev);



	if (gmu->log_stream_enable == val)

		return 0;



	return adreno_power_cycle_bool(adreno_dev, &gmu->log_stream_enable, val);

}



static bool _gmu_log_stream_enable_show(struct adreno_device *adreno_dev)

{

	struct a6xx_gmu_device *gmu = to_a6xx_gmu(adreno_dev);



	return gmu->log_stream_enable;

}



static ADRENO_SYSFS_BOOL(preemption);

static ADRENO_SYSFS_U32(preempt_level);

static ADRENO_SYSFS_BOOL(usesgmem);

static ADRENO_SYSFS_BOOL(skipsaverestore);

static ADRENO_SYSFS_RO_U32(preempt_count);

static ADRENO_SYSFS_BOOL(gmu_log_stream_enable);



static const struct attribute *_preempt_attr_list[] = {

static const struct attribute *_hwsched_attr_list[] = {

	&adreno_attr_preemption.attr.attr,

	&adreno_attr_preempt_level.attr.attr,

	&adreno_attr_usesgmem.attr.attr,

	&adreno_attr_skipsaverestore.attr.attr,

	&adreno_attr_preempt_count.attr.attr,

	&adreno_attr_gmu_log_stream_enable.attr.attr,

	NULL,

};
@@ -1092,7 +1112,7 @@ void adreno_hwsched_dispatcher_close(struct adreno_device *adreno_dev) 
	kmem_cache_destroy(jobs_cache);

	kmem_cache_destroy(obj_cache);



	sysfs_remove_files(&device->dev->kobj, _preempt_attr_list);

	sysfs_remove_files(&device->dev->kobj, _hwsched_attr_list);

}



static void adreno_hwsched_init_replay(struct adreno_hwsched *hwsched)
@@ -1336,7 +1356,7 @@ void adreno_hwsched_init(struct adreno_device *adreno_dev) 
		init_llist_head(&hwsched->requeue[i]);

	}



	sysfs_create_files(&device->dev->kobj, _preempt_attr_list);

	sysfs_create_files(&device->dev->kobj, _hwsched_attr_list);

}



void adreno_hwsched_mark_drawobj(struct adreno_device *adreno_dev,