Merge "msm: kgsl: Add new packet types for A4XX while parsing IB" (276cc985) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno_cp_parser.c

+59 −15

Original line number	Diff line number	Diff line
		@@ -424,19 +424,58 @@ static int ib_parse_draw_indx(struct kgsl_device device, unsigned int pkt,
		{
		int ret = 0;
		int i;
		int opcode = cp_type3_opcode(pkt[0]);

		if (type3_pkt_size(pkt[0]) < 3)
		return 0;

		/* DRAW_IDX may have a index buffer pointer */

		switch (opcode) {
		case CP_DRAW_INDX:
		if (type3_pkt_size(pkt[0]) > 3) {
		ret = adreno_ib_add_range(device, ptbase, pkt[4], pkt[5],
		ret = adreno_ib_add_range(device, ptbase,
		pkt[4], pkt[5],
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		}
		break;
		case CP_DRAW_INDX_OFFSET:
		if (type3_pkt_size(pkt[0]) == 6) {
		ret = adreno_ib_add_range(device, ptbase,
		pkt[5], pkt[6],
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		}
		break;
		case CP_DRAW_INDIRECT:
		if (type3_pkt_size(pkt[0]) == 2) {
		ret = adreno_ib_add_range(device, ptbase,
		pkt[2], 0,
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		if (ret < 0)
		return ret;
		}
		break;
		case CP_DRAW_INDX_INDIRECT:
		if (type3_pkt_size(pkt[0]) == 4) {
		ret = adreno_ib_add_range(device, ptbase,
		pkt[2], pkt[3],
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		if (ret)
		break;
		ret = adreno_ib_add_range(device, ptbase,
		pkt[4], 0,
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		}
		break;
		case CP_DRAW_AUTO:
		if (type3_pkt_size(pkt[0]) == 6) {
		ret = adreno_ib_add_range(device, ptbase,
		pkt[3], 0, SNAPSHOT_GPU_OBJECT_GENERIC,
		ib_obj_list);
		if (ret)
		break;
		ret = adreno_ib_add_range(device, ptbase,
		pkt[4], 0,
		SNAPSHOT_GPU_OBJECT_GENERIC, ib_obj_list);
		}
		break;
		}

		if (ret)
		return ret;
		/*
		* All of the type0 writes are valid at a draw initiator, so freeze
		* the various buffers that we are tracking
		@@ -470,21 +509,26 @@ static int ib_parse_type3(struct kgsl_device device, unsigned int ptr,
		{
		int opcode = cp_type3_opcode(*ptr);

		if (opcode == CP_LOAD_STATE)
		switch (opcode) {
		case CP_LOAD_STATE:
		return ib_parse_load_state(device, ptr, ptbase, ib_obj_list,
		ib_parse_vars);
		else if (opcode == CP_SET_BIN_DATA)
		case CP_SET_BIN_DATA:
		return ib_parse_set_bin_data(device, ptr, ptbase, ib_obj_list,
		ib_parse_vars);
		else if (opcode == CP_MEM_WRITE)
		case CP_MEM_WRITE:
		return ib_parse_mem_write(device, ptr, ptbase, ib_obj_list,
		ib_parse_vars);
		else if (opcode == CP_DRAW_INDX)
		case CP_DRAW_INDX:
		case CP_DRAW_INDX_OFFSET:
		case CP_DRAW_INDIRECT:
		case CP_DRAW_INDX_INDIRECT:
		return ib_parse_draw_indx(device, ptr, ptbase, ib_obj_list,
		ib_parse_vars);
		else if (opcode == CP_SET_DRAW_STATE)
		case CP_SET_DRAW_STATE:
		return ib_parse_set_draw_state(device, ptr, ptbase,
		ib_obj_list, ib_parse_vars);
		}

		return 0;
		}

drivers/gpu/msm/adreno_pm4types.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,11 @@
		/* initiate fetch of bin IDs and draw using supplied indices */
		#define CP_DRAW_INDX_2_BIN 0x35

		/* New draw packets defined for A4XX */
		#define CP_DRAW_INDX_OFFSET 0x38
		#define CP_DRAW_INDIRECT 0x28
		#define CP_DRAW_INDX_INDIRECT 0x29
		#define CP_DRAW_AUTO 0x24

		/* begin/end initiator for viz query extent processing */
		#define CP_VIZ_QUERY 0x23