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

Commit 7faae93a authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: kgsl: Use sysfs functions to batch create and destroy files 



Use the existing sysfs functions to create lists of files instead
of using badly defined wrappers.

Change-Id: Ic0dedbade0699ecb19ef893c0234cfa75b9713f8
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 8597343a

drivers/gpu/msm/adreno_sysfs.c

+24 −24
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/sysfs.h>
@@ -420,27 +420,27 @@ static ADRENO_SYSFS_RO_U32(ifpc_count); 
static ADRENO_SYSFS_BOOL(acd);





static const struct device_attribute *_attr_list[] = {

	&adreno_attr_ft_policy.attr,

	&adreno_attr_ft_pagefault_policy.attr,

	&adreno_attr_ft_long_ib_detect.attr,

	&adreno_attr_ft_hang_intr_status.attr,

	&dev_attr_wake_nice.attr,

	&dev_attr_wake_timeout.attr,

	&adreno_attr_sptp_pc.attr,

	&adreno_attr_lm.attr,

	&adreno_attr_preemption.attr,

	&adreno_attr_hwcg.attr,

	&adreno_attr_throttling.attr,

	&adreno_attr_gpu_llc_slice_enable.attr,

	&adreno_attr_gpuhtw_llc_slice_enable.attr,

	&adreno_attr_preempt_level.attr,

	&adreno_attr_usesgmem.attr,

	&adreno_attr_skipsaverestore.attr,

	&adreno_attr_ifpc.attr,

	&adreno_attr_ifpc_count.attr,

	&adreno_attr_preempt_count.attr,

	&adreno_attr_acd.attr,

static const struct attribute *_attr_list[] = {

	&adreno_attr_ft_policy.attr.attr,

	&adreno_attr_ft_pagefault_policy.attr.attr,

	&adreno_attr_ft_long_ib_detect.attr.attr,

	&adreno_attr_ft_hang_intr_status.attr.attr,

	&dev_attr_wake_nice.attr.attr,

	&dev_attr_wake_timeout.attr.attr,

	&adreno_attr_sptp_pc.attr.attr,

	&adreno_attr_lm.attr.attr,

	&adreno_attr_preemption.attr.attr,

	&adreno_attr_hwcg.attr.attr,

	&adreno_attr_throttling.attr.attr,

	&adreno_attr_gpu_llc_slice_enable.attr.attr,

	&adreno_attr_gpuhtw_llc_slice_enable.attr.attr,

	&adreno_attr_preempt_level.attr.attr,

	&adreno_attr_usesgmem.attr.attr,

	&adreno_attr_skipsaverestore.attr.attr,

	&adreno_attr_ifpc.attr.attr,

	&adreno_attr_ifpc_count.attr.attr,

	&adreno_attr_preempt_count.attr.attr,

	&adreno_attr_acd.attr.attr,

	NULL,

};
@@ -580,7 +580,7 @@ void adreno_sysfs_close(struct adreno_device *adreno_dev) 
	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);



	ppd_sysfs_close(adreno_dev);

	kgsl_remove_device_sysfs_files(device->dev, _attr_list);

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

}



/**
@@ -595,7 +595,7 @@ int adreno_sysfs_init(struct adreno_device *adreno_dev) 
	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	int ret;



	ret = kgsl_create_device_sysfs_files(device->dev, _attr_list);

	ret = sysfs_create_files(&device->dev->kobj, _attr_list);



	/* Add the PPD directory and files */

	if (ret == 0)

drivers/gpu/msm/kgsl_device.h

+1 −20
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.

 */
@@ -608,25 +608,6 @@ static inline unsigned int kgsl_gpuid(struct kgsl_device *device, 
	return device->ftbl->gpuid(device, chipid);

}



static inline int kgsl_create_device_sysfs_files(struct device *root,

	const struct device_attribute **list)

{

	int ret = 0, i;



	for (i = 0; list[i] != NULL; i++)

		ret |= device_create_file(root, list[i]);

	return ret;

}



static inline void kgsl_remove_device_sysfs_files(struct device *root,

	const struct device_attribute **list)

{

	int i;



	for (i = 0; list[i] != NULL; i++)

		device_remove_file(root, list[i]);

}



static inline int kgsl_state_is_awake(struct kgsl_device *device)

{

	if (device->state == KGSL_STATE_ACTIVE ||

drivers/gpu/msm/kgsl_pwrctrl.c

+31 −31
Original line number Diff line number Diff line
@@ -1391,35 +1391,35 @@ static DEVICE_ATTR_RO(clock_mhz); 
static DEVICE_ATTR_RO(freq_table_mhz);

static DEVICE_ATTR_RW(pwrscale);



static const struct device_attribute *pwrctrl_attr_list[] = {

	&dev_attr_gpuclk,

	&dev_attr_max_gpuclk,

	&dev_attr_idle_timer,

	&dev_attr_gpubusy,

	&dev_attr_gpu_available_frequencies,

	&dev_attr_gpu_clock_stats,

	&dev_attr_max_pwrlevel,

	&dev_attr_min_pwrlevel,

	&dev_attr_thermal_pwrlevel,

	&dev_attr_num_pwrlevels,

	&dev_attr_pmqos_active_latency,

	&dev_attr_reset_count,

	&dev_attr_force_clk_on,

	&dev_attr_force_bus_on,

	&dev_attr_force_rail_on,

	&dev_attr_force_no_nap,

	&dev_attr_bus_split,

	&dev_attr_default_pwrlevel,

	&dev_attr_popp,

	&dev_attr_gpu_model,

	&dev_attr_gpu_busy_percentage,

	&dev_attr_min_clock_mhz,

	&dev_attr_max_clock_mhz,

	&dev_attr_clock_mhz,

	&dev_attr_freq_table_mhz,

	&dev_attr_temp,

	&dev_attr_pwrscale,

	NULL

static const struct attribute *pwrctrl_attr_list[] = {

	&dev_attr_gpuclk.attr,

	&dev_attr_max_gpuclk.attr,

	&dev_attr_idle_timer.attr,

	&dev_attr_gpubusy.attr,

	&dev_attr_gpu_available_frequencies.attr,

	&dev_attr_gpu_clock_stats.attr,

	&dev_attr_max_pwrlevel.attr,

	&dev_attr_min_pwrlevel.attr,

	&dev_attr_thermal_pwrlevel.attr,

	&dev_attr_num_pwrlevels.attr,

	&dev_attr_pmqos_active_latency.attr,

	&dev_attr_reset_count.attr,

	&dev_attr_force_clk_on.attr,

	&dev_attr_force_bus_on.attr,

	&dev_attr_force_rail_on.attr,

	&dev_attr_force_no_nap.attr,

	&dev_attr_bus_split.attr,

	&dev_attr_default_pwrlevel.attr,

	&dev_attr_popp.attr,

	&dev_attr_gpu_model.attr,

	&dev_attr_gpu_busy_percentage.attr,

	&dev_attr_min_clock_mhz.attr,

	&dev_attr_max_clock_mhz.attr,

	&dev_attr_clock_mhz.attr,

	&dev_attr_freq_table_mhz.attr,

	&dev_attr_temp.attr,

	&dev_attr_pwrscale.attr,

	NULL,

};



struct sysfs_link {
@@ -1441,7 +1441,7 @@ int kgsl_pwrctrl_init_sysfs(struct kgsl_device *device) 
{

	int i, ret;



	ret = kgsl_create_device_sysfs_files(device->dev, pwrctrl_attr_list);

	ret = sysfs_create_files(&device->dev->kobj, pwrctrl_attr_list);

	if (ret)

		return ret;
@@ -1460,7 +1460,7 @@ int kgsl_pwrctrl_init_sysfs(struct kgsl_device *device) 


void kgsl_pwrctrl_uninit_sysfs(struct kgsl_device *device)

{

	kgsl_remove_device_sysfs_files(device->dev, pwrctrl_attr_list);

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

}



/*

drivers/gpu/msm/kgsl_sharedmem.c

+16 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2002,2007-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/export.h>
@@ -353,32 +353,31 @@ static DEVICE_ATTR(mapped, 0444, memstat_show, NULL); 
static DEVICE_ATTR(mapped_max, 0444, memstat_show, NULL);

static DEVICE_ATTR_RW(full_cache_threshold);



static const struct device_attribute *drv_attr_list[] = {

	&dev_attr_vmalloc,

	&dev_attr_vmalloc_max,

	&dev_attr_page_alloc,

	&dev_attr_page_alloc_max,

	&dev_attr_coherent,

	&dev_attr_coherent_max,

	&dev_attr_secure,

	&dev_attr_secure_max,

	&dev_attr_mapped,

	&dev_attr_mapped_max,

	&dev_attr_full_cache_threshold,

	NULL

static const struct attribute *drv_attr_list[] = {

	&dev_attr_vmalloc.attr,

	&dev_attr_vmalloc_max.attr,

	&dev_attr_page_alloc.attr,

	&dev_attr_page_alloc_max.attr,

	&dev_attr_coherent.attr,

	&dev_attr_coherent_max.attr,

	&dev_attr_secure.attr,

	&dev_attr_secure_max.attr,

	&dev_attr_mapped.attr,

	&dev_attr_mapped_max.attr,

	&dev_attr_full_cache_threshold.attr,

	NULL,

};



void

kgsl_sharedmem_uninit_sysfs(void)

{

	kgsl_remove_device_sysfs_files(&kgsl_driver.virtdev, drv_attr_list);

	sysfs_remove_files(&kgsl_driver.virtdev.kobj, drv_attr_list);

}



int

kgsl_sharedmem_init_sysfs(void)

{

	return kgsl_create_device_sysfs_files(&kgsl_driver.virtdev,

		drv_attr_list);

	return sysfs_create_files(&kgsl_driver.virtdev.kobj, drv_attr_list);

}



static int kgsl_cma_alloc_secure(struct kgsl_device *device,