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

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

Merge "msm: kgsl: Get kgsl device from the hfi_start() caller"

parents 113b76e8 c8838f26

drivers/gpu/msm/kgsl_gmu.c

+4 −4
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ static int gmu_start(struct kgsl_device *device) 
		if (ret)

			goto error_gmu;



		ret = hfi_start(gmu, GMU_COLD_BOOT);

		ret = hfi_start(device, gmu, GMU_COLD_BOOT);

		if (ret)

			goto error_gmu;
@@ -1698,7 +1698,7 @@ static int gmu_start(struct kgsl_device *device) 
		if (ret)

			goto error_gmu;



		ret = hfi_start(gmu, GMU_COLD_BOOT);

		ret = hfi_start(device, gmu, GMU_COLD_BOOT);

		if (ret)

			goto error_gmu;
@@ -1719,7 +1719,7 @@ static int gmu_start(struct kgsl_device *device) 
				goto error_gmu;





			ret = hfi_start(gmu, GMU_COLD_BOOT);

			ret = hfi_start(device, gmu, GMU_COLD_BOOT);

			if (ret)

				goto error_gmu;
@@ -1735,7 +1735,7 @@ static int gmu_start(struct kgsl_device *device) 
			if (ret)

				goto error_gmu;



			ret = hfi_start(gmu, GMU_COLD_BOOT);

			ret = hfi_start(device, gmu, GMU_COLD_BOOT);

			if (ret)

				goto error_gmu;

		}

drivers/gpu/msm/kgsl_hfi.c

+2 −2
Original line number Diff line number Diff line
@@ -601,9 +601,9 @@ static int hfi_verify_fw_version(struct kgsl_device *device, 
	return 0;

}



int hfi_start(struct gmu_device *gmu, uint32_t boot_state)

int hfi_start(struct kgsl_device *device,

		struct gmu_device *gmu, uint32_t boot_state)

{

	struct kgsl_device *device = kgsl_get_device(KGSL_DEVICE_3D0);

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	int result;

drivers/gpu/msm/kgsl_hfi.h

+2 −1
Original line number Diff line number Diff line
@@ -613,7 +613,8 @@ struct kgsl_hfi { 
struct gmu_device;

struct gmu_memdesc;



int hfi_start(struct gmu_device *gmu, uint32_t boot_state);

int hfi_start(struct kgsl_device *device, struct gmu_device *gmu,

		uint32_t boot_state);

void hfi_stop(struct gmu_device *gmu);

void hfi_receiver(unsigned long data);

void hfi_init(struct kgsl_hfi *hfi, struct gmu_memdesc *mem_addr,