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

Commit 5348fdd3 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix null pointer dereference in hfi"

parents 6e3f4b1a a034cd26

drivers/gpu/msm/adreno_drawctxt.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static inline const char *get_api_type_str(unsigned int type) 
{

	int i;



	for (i = 0; i < ARRAY_SIZE(ctxt_type_table) - 1; i++) {

	for (i = 0; i < ARRAY_SIZE(ctxt_type_table); i++) {

		if (ctxt_type_table[i].type == type)

			return ctxt_type_table[i].str;

	}

drivers/gpu/msm/kgsl_hfi.c

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ static void receive_ack_cmd(struct gmu_device *gmu, void *rcvd, 
	uint32_t req_hdr = ack[1];

	struct kgsl_hfi *hfi = &gmu->hfi;



	if (ret_cmd == NULL)

		return;



	trace_kgsl_hfi_receive(MSG_HDR_GET_ID(req_hdr),

		MSG_HDR_GET_SIZE(req_hdr),

		MSG_HDR_GET_SEQNUM(req_hdr));