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

Commit 4ef2d895 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 888e38c2 4e62baaa

drivers/gpu/msm/adreno_dispatch.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

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

 *

 * 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
@@ -1422,8 +1422,9 @@ static void adreno_fault_header(struct kgsl_device *device, 
			ib2base, ib2sz, drawctxt->rb->id);



		pr_fault(device, cmdbatch,

			"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",

			cmdbatch->context->id, cmdbatch->timestamp, status,

			"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",

			cmdbatch->context->id, get_api_type_str(drawctxt->type),

			cmdbatch->timestamp, status,

			rptr, wptr, ib1base, ib1sz, ib2base, ib2sz);



		if (rb != NULL)

drivers/gpu/msm/adreno_drawctxt.h

+13 −1
Original line number Diff line number Diff line 
/* 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

 * it under the terms of the GNU General Public License version 2 and
@@ -135,4 +135,16 @@ void adreno_drawctxt_invalidate(struct kgsl_device *device, 
void adreno_drawctxt_dump(struct kgsl_device *device,

		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 */

drivers/gpu/msm/adreno_profile.c

+1 −13
Original line number Diff line number Diff line 
/* 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

 * 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_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,

			 unsigned int *cmds)

{

drivers/gpu/msm/kgsl_device.h

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ enum kgsl_event_results { 
	{ KGSL_CONTEXT_TYPE_GL, "GL" }, \

	{ KGSL_CONTEXT_TYPE_CL, "CL" }, \

	{ 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) \

	((_context != NULL) ? (_context)->id : KGSL_MEMSTORE_GLOBAL)

drivers/gpu/msm/kgsl_iommu.c

+12 −2
Original line number Diff line number Diff line
@@ -813,11 +813,21 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain, 
		no_page_fault_log = kgsl_mmu_log_fault_addr(mmu, ptbase, addr);



	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,

			"GPU PAGE FAULT: addr = %lX pid= %d\n", addr, ptname);

		KGSL_MEM_CRIT(ctx->kgsldev,

			"context=%s TTBR0=0x%llx CIDR=0x%x (%s %s fault)\n",

			ctx->name, ptbase, contextidr,

			"context=%s ctx_type=%s TTBR0=0x%llx CIDR=0x%x (%s %s fault)\n",

			ctx->name, api_str, ptbase, contextidr,

			write ? "write" : "read", fault_type);



		/* Don't print the debug if this is a permissions fault */