evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: kgsl: Log context type in case of GPU faults

Browse source 
Log context type in case of GPU page faults or GPU faults.
Also add Vulkan context type to distinguish it from GL.

Change-Id: I7b93bf645b80abe82f2d6aa379296b2fffceb684
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
This commit is contained in:
Rajesh Kemisetti 2018-09-17 11:34:08 +05:30
parent 3e15f887cf
commit de5400e150
6 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/msm/adreno_dispatch.c
View file

@ -1710,8 +1710,9 @@ static void adreno_fault_header(struct kgsl_device *device,
ib2base, ib2sz, drawctxt->rb->id); ib2base, ib2sz, drawctxt->rb->id);
pr_fault(device, drawobj, pr_fault(device, drawobj,
"gpu fault ctx %d ts %d status %8.8X rb %4.4x/%4.4x ib1 %16.16llX/%4.4x ib2 %16.16llX/%4.4x\n", "gpu fault ctx %d ctx_type %s ts %d status %8.8X rb %4.4x/%4.4x ib1 %16.16llX/%4.4x ib2 %16.16llX/%4.4x\n",
drawobj->context->id, drawobj->timestamp, status, drawobj->context->id, get_api_type_str(drawctxt->type),
drawobj->timestamp, status,
rptr, wptr, ib1base, ib1sz, ib2base, ib2sz); rptr, wptr, ib1base, ib1sz, ib2base, ib2sz);
if (rb != NULL) if (rb != NULL)

14
drivers/gpu/msm/adreno_drawctxt.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2002,2007-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2002,2007-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -138,4 +138,16 @@ void adreno_drawctxt_invalidate(struct kgsl_device *device,
void adreno_drawctxt_dump(struct kgsl_device *device, void adreno_drawctxt_dump(struct kgsl_device *device,
struct kgsl_context *context); struct kgsl_context *context);
static struct adreno_context_type ctxt_type_table[] = {KGSL_CONTEXT_TYPES};
static inline const char *get_api_type_str(unsigned int type)
{
int i;
for (i = 0; i < ARRAY_SIZE(ctxt_type_table); i++) {
if (ctxt_type_table[i].type == type)
return ctxt_type_table[i].str;
}
return "UNKNOWN";
}
#endif /* __ADRENO_DRAWCTXT_H */ #endif /* __ADRENO_DRAWCTXT_H */

14
drivers/gpu/msm/adreno_profile.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2016, 2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -78,18 +78,6 @@
#define SIZE_PIPE_ENTRY(cnt) (50 + (cnt) * 62) #define SIZE_PIPE_ENTRY(cnt) (50 + (cnt) * 62)
#define SIZE_LOG_ENTRY(cnt) (6 + (cnt) * 5) #define SIZE_LOG_ENTRY(cnt) (6 + (cnt) * 5)
static struct adreno_context_type ctxt_type_table[] = {KGSL_CONTEXT_TYPES};
static const char *get_api_type_str(unsigned int type)
{
int i;
for (i = 0; i < ARRAY_SIZE(ctxt_type_table) - 1; i++) {
if (ctxt_type_table[i].type == type)
return ctxt_type_table[i].str;
}
return "UNKNOWN";
}
static inline uint _ib_start(struct adreno_device *adreno_dev, static inline uint _ib_start(struct adreno_device *adreno_dev,
unsigned int *cmds) unsigned int *cmds)
{ {

3
drivers/gpu/msm/kgsl_device.h
View file

@ -87,7 +87,8 @@ enum kgsl_event_results {
{ KGSL_CONTEXT_TYPE_GL, "GL" }, \ { KGSL_CONTEXT_TYPE_GL, "GL" }, \
{ KGSL_CONTEXT_TYPE_CL, "CL" }, \ { KGSL_CONTEXT_TYPE_CL, "CL" }, \
{ KGSL_CONTEXT_TYPE_C2D, "C2D" }, \ { KGSL_CONTEXT_TYPE_C2D, "C2D" }, \
{ KGSL_CONTEXT_TYPE_RS, "RS" } { KGSL_CONTEXT_TYPE_RS, "RS" }, \
{ KGSL_CONTEXT_TYPE_VK, "VK" }
#define KGSL_CONTEXT_ID(_context) \ #define KGSL_CONTEXT_ID(_context) \
((_context != NULL) ? (_context)->id : KGSL_MEMSTORE_GLOBAL) ((_context != NULL) ? (_context)->id : KGSL_MEMSTORE_GLOBAL)

14
drivers/gpu/msm/kgsl_iommu.c
View file

@ -870,11 +870,21 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
no_page_fault_log = kgsl_mmu_log_fault_addr(mmu, ptbase, addr); no_page_fault_log = kgsl_mmu_log_fault_addr(mmu, ptbase, addr);
if (!no_page_fault_log && __ratelimit(&_rs)) { if (!no_page_fault_log && __ratelimit(&_rs)) {
const char *api_str;
if (context != NULL) {
struct adreno_context *drawctxt =
ADRENO_CONTEXT(context);
api_str = get_api_type_str(drawctxt->type);
} else
api_str = "UNKNOWN";
KGSL_MEM_CRIT(ctx->kgsldev, KGSL_MEM_CRIT(ctx->kgsldev,
"GPU PAGE FAULT: addr = %lX pid= %d\n", addr, ptname); "GPU PAGE FAULT: addr = %lX pid= %d\n", addr, ptname);
KGSL_MEM_CRIT(ctx->kgsldev, KGSL_MEM_CRIT(ctx->kgsldev,
"context=%s TTBR0=0x%llx CIDR=0x%x (%s %s fault)\n", "context=%s ctx_type=%s TTBR0=0x%llx CIDR=0x%x (%s %s fault)\n",
ctx->name, ptbase, contextidr, ctx->name, api_str, ptbase, contextidr,
write ? "write" : "read", fault_type); write ? "write" : "read", fault_type);
/* Don't print the debug if this is a permissions fault */ /* Don't print the debug if this is a permissions fault */

1
include/uapi/linux/msm_kgsl.h
View file

@ -65,6 +65,7 @@
#define KGSL_CONTEXT_TYPE_CL 2 #define KGSL_CONTEXT_TYPE_CL 2
#define KGSL_CONTEXT_TYPE_C2D 3 #define KGSL_CONTEXT_TYPE_C2D 3
#define KGSL_CONTEXT_TYPE_RS 4 #define KGSL_CONTEXT_TYPE_RS 4
#define KGSL_CONTEXT_TYPE_VK 5
#define KGSL_CONTEXT_TYPE_UNKNOWN 0x1E #define KGSL_CONTEXT_TYPE_UNKNOWN 0x1E
#define KGSL_CONTEXT_INVALIDATE_ON_FAULT 0x10000000 #define KGSL_CONTEXT_INVALIDATE_ON_FAULT 0x10000000