shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '44ee8c59b5db9d4421709a581d30ceea24ad5b87'

Browse Source 
* commit '44ee8c59b5db9d4421709a581d30ceea24ad5b87':
  MALI: bifrost: log: Disable WARNINGs in validate_tracepoint_data()
  Mali: bifrost: Fix: When calling devfreq_add_device(), restore passing of '&ondemand_data'

Change-Id: I85be6940359cb6f4f77ed59189fd9ba65461f300
This commit is contained in:
Tao Huang
2024-01-10 15:34:35 +08:00
parent 9c1fb62faa 44ee8c59b5
commit 14caa4fb96
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c
View File

@@ -597,7 +597,7 @@ int kbase_devfreq_init(struct kbase_device *kbdev)
&ondemand_data.upthreshold);
of_property_read_u32(np, "downdifferential",
&ondemand_data.downdifferential);
kbdev->devfreq = devfreq_add_device(kbdev->dev, dp, "simple_ondemand", NULL);
kbdev->devfreq = devfreq_add_device(kbdev->dev, dp, "simple_ondemand", &ondemand_data);
if (IS_ERR(kbdev->devfreq)) {
err = PTR_ERR(kbdev->devfreq);
kbdev->devfreq = NULL;

2
drivers/gpu/arm/bifrost/mali_kbase_gpu_metrics.c
View File

@@ -67,7 +67,7 @@ static inline void gpu_metrics_ctx_flag_clear(struct kbase_gpu_metrics_ctx *gpu_
static inline void validate_tracepoint_data(struct kbase_gpu_metrics_ctx *gpu_metrics_ctx,
u64 start_time, u64 end_time, u64 total_active)
{
#ifdef CONFIG_MALI_BIFROST_DEBUG
#if 0
WARN(total_active > NSEC_PER_SEC, "total_active %llu > 1 second for aid %u active_cnt %u",
total_active, gpu_metrics_ctx->aid, gpu_metrics_ctx->active_cnt);