Evolution-X-Devices/kernel_oneplus_8750-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ffcabb6293 on remote branch

Browse Source 
Change-Id: Ib29d4c4129bc60a33cf27f67da48bfee5e5cb7e5
This commit is contained in:
Linux Build Service Account
2025-03-08 11:54:20 -08:00
parent 6ab9851d0f ffcabb6293
commit e7ffd260ac
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adreno-gpulist.h
View File

@@ -2633,7 +2633,7 @@ static const struct adreno_gen7_core adreno_gpu_core_gen7_17_0 = {
.uche_gmem_alignment = SZ_16M,
.gmem_size = SZ_1M,
.bus_width = 32,
.snapshot_size = SZ_4M,
.snapshot_size = SZ_2M,
},
.sqefw_name = "gen70e00_sqe.fw",
.gmufw_name = "gen71700_gmu.bin",

2
adreno.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2002,2007-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/component.h>
#include <linux/delay.h>

2
adreno.h
View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2008-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef __ADRENO_H
#define __ADRENO_H

18
adreno_gen8_snapshot.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include "adreno.h"
@@ -247,7 +247,7 @@ size_t gen8_legacy_snapshot_registers(struct kgsl_device *device,
header->location_id = UINT_MAX;
header->sp_id = UINT_MAX;
header->usptp_id = UINT_MAX;
header->slice_id = info->slice_id;
header->slice_id = info->regs->slice_region ? info->slice_id : UINT_MAX;
if (info->regs->sel)
kgsl_regwrite(device, info->regs->sel->host_reg, info->regs->sel->val);
@@ -298,7 +298,7 @@ static size_t gen8_snapshot_registers(struct kgsl_device *device, u8 *buf,
header->location_id = UINT_MAX;
header->sp_id = UINT_MAX;
header->usptp_id = UINT_MAX;
header->slice_id = info->slice_id;
header->slice_id = info->regs->slice_region ? info->slice_id : UINT_MAX;
src = gen8_crashdump_registers->hostptr + info->offset;
@@ -336,7 +336,7 @@ static size_t gen8_legacy_snapshot_shader(struct kgsl_device *device,
}
header->type = block->statetype;
header->slice_id = info->slice_id;
header->slice_id = block->slice_region ? info->slice_id : UINT_MAX;
header->sp_index = info->sp_id;
header->usptp = info->usptp;
header->pipe_id = block->pipeid;
@@ -376,7 +376,7 @@ static size_t gen8_snapshot_shader_memory(struct kgsl_device *device,
}
header->type = block->statetype;
header->slice_id = info->slice_id;
header->slice_id = block->slice_region ? info->slice_id : UINT_MAX;
header->sp_index = info->sp_id;
header->usptp = info->usptp;
header->pipe_id = block->pipeid;
@@ -820,7 +820,7 @@ static size_t gen8_legacy_snapshot_cluster_dbgahb(struct kgsl_device *device,
header->location_id = info->location_id;
header->sp_id = info->sp_id;
header->usptp_id = info->usptp_id;
header->slice_id = info->slice_id;
header->slice_id = info->cluster->slice_region ? info->slice_id : UINT_MAX;
read_sel = GEN8_SP_READ_SEL_VAL(info->slice_id, info->location_id,
info->pipe_id, info->statetype_id, info->usptp_id, info->sp_id);
@@ -872,7 +872,7 @@ static size_t gen8_snapshot_cluster_dbgahb(struct kgsl_device *device, u8 *buf,
header->location_id = info->location_id;
header->sp_id = info->sp_id;
header->usptp_id = info->usptp_id;
header->slice_id = info->slice_id;
header->slice_id = info->cluster->slice_region ? info->slice_id : UINT_MAX;
src = gen8_crashdump_registers->hostptr + info->offset;
@@ -1009,7 +1009,7 @@ static size_t gen8_legacy_snapshot_mvc(struct kgsl_device *device, u8 *buf,
header->location_id = UINT_MAX;
header->sp_id = UINT_MAX;
header->usptp_id = UINT_MAX;
header->slice_id = info->slice_id;
header->slice_id = info->cluster->slice_region ? info->slice_id : UINT_MAX;
/*
* Set the AHB control for the Host to read from the
@@ -1064,7 +1064,7 @@ static size_t gen8_snapshot_mvc(struct kgsl_device *device, u8 *buf,
header->location_id = UINT_MAX;
header->sp_id = UINT_MAX;
header->usptp_id = UINT_MAX;
header->slice_id = info->slice_id;
header->slice_id = info->cluster->slice_region ? info->slice_id : UINT_MAX;
src = gen8_crashdump_registers->hostptr + info->offset;

2
adreno_sysfs.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/sysfs.h>

2
adreno_trace.h
View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#if !defined(_ADRENO_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)

2
governor_msm_adreno_tz.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2010-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/errno.h>
#include <linux/devfreq.h>

2
kgsl.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2008-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <uapi/linux/sched/types.h>

22
kgsl_sharedmem.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2002,2007-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <asm/cacheflush.h>
@@ -256,19 +256,19 @@ imported_mem_show(struct kgsl_process_private *priv,
m = &entry->memdesc;
if (kgsl_memdesc_usermem_type(m) == KGSL_MEM_ENTRY_ION) {
u64 size = m->size;
int total_egl_count;
kgsl_get_egl_counts(entry, &egl_surface_count,
&egl_image_count);
total_egl_count = egl_surface_count + egl_image_count;
if ((kgsl_memdesc_get_memtype(m) == KGSL_MEMTYPE_EGL_SURFACE) ||
(kgsl_memdesc_get_memtype(m) == KGSL_MEMTYPE_SURFACE))
imported_mem += m->size;
else if (egl_surface_count == 0) {
uint64_t size = m->size;
do_div(size, (egl_image_count ?
egl_image_count : 1));
imported_mem += size;
}
/*
* Divide the total buffer size uniformly across all the
* processes that imported the buffer.
*/
do_div(size, (total_egl_count ? total_egl_count : 1));
imported_mem += size;
}
kgsl_mem_entry_put(entry);