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

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

Merge changes I18314977,I43e7d6dc,Ic86779bf into msm-4.14 

* changes:
  msm: kgsl: Fix interrupt mask to match firmware
  msm: kgsl: Update HFI irq mask
  msm: kgsl: Force a vote after CORE_FW_START
parents 2a783a33 4ffa672b

drivers/gpu/msm/kgsl_hfi.c

+16 −0
Original line number Diff line number Diff line
@@ -404,6 +404,17 @@ static int hfi_send_feature_ctrls(struct gmu_device *gmu) 
	return 0;

}



static int hfi_send_init_perf_vote(struct gmu_device *gmu)

{

	struct hfi_gx_bw_perf_vote_cmd req = {

		.ack_type = DCVS_ACK_NONBLOCK,

		.freq = 2,

		.bw = 2,

	};



	return hfi_send_req(gmu, H2F_MSG_GX_BW_PERF_VOTE, &req);

}



static int hfi_send_dcvstbl(struct gmu_device *gmu)

{

	struct hfi_dcvstable_cmd cmd = {
@@ -636,6 +647,11 @@ int hfi_start(struct gmu_device *gmu, uint32_t boot_state) 
		result = hfi_send_core_fw_start(gmu);

		if (result)

			return result;



		/* Force a vote with initial values */

		result = hfi_send_init_perf_vote(gmu);

		if (result)

			return result;

	} else {

		/*

		 * Tell the GMU we are sending no more HFIs

drivers/gpu/msm/kgsl_hfi.h

+4 −5
Original line number Diff line number Diff line
@@ -56,11 +56,10 @@ 
	((hfi_mem)->gmuaddr + HFI_QUEUE_OFFSET(i))



#define HFI_IRQ_MSGQ_MASK		BIT(0)

#define HFI_IRQ_DBGQ_MASK		BIT(1)

#define HFI_IRQ_BLOCKED_MSG_MASK	BIT(2)

#define HFI_IRQ_CM3_FAULT_MASK		BIT(23)

#define HFI_IRQ_GMU_ERR_MASK		GENMASK(22, 16)

#define HFI_IRQ_OOB_MASK		GENMASK(31, 24)

#define HFI_IRQ_SIDEMSGQ_MASK		BIT(1)

#define HFI_IRQ_DBGQ_MASK		BIT(2)

#define HFI_IRQ_CM3_FAULT_MASK		BIT(15)

#define HFI_IRQ_OOB_MASK		GENMASK(31, 16)

#define HFI_IRQ_MASK			(HFI_IRQ_MSGQ_MASK |\

					HFI_IRQ_CM3_FAULT_MASK)