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

Commit 092c0b96 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: Improve logs for pagefaults on global buffers"

parents 600f380e 507d1378

drivers/gpu/msm/adreno.c

+2 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,8 @@ static int adreno_init(struct kgsl_device *device) 


	if (!adreno_is_a3xx(adreno_dev)) {

		int r = kgsl_allocate_global(device,

			&adreno_dev->cmdbatch_profile_buffer, PAGE_SIZE, 0, 0);

			&adreno_dev->cmdbatch_profile_buffer, PAGE_SIZE,

			0, 0, "alwayson");



		adreno_dev->cmdbatch_profile_index = 0;

drivers/gpu/msm/adreno_a3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int _a3xx_pwron_fixup(struct adreno_device *adreno_dev) 


	ret = kgsl_allocate_global(KGSL_DEVICE(adreno_dev),

		&adreno_dev->pwron_fixup, PAGE_SIZE,

		KGSL_MEMFLAGS_GPUREADONLY, 0);

		KGSL_MEMFLAGS_GPUREADONLY, 0, "pwron_fixup");



	if (ret)

		return ret;

drivers/gpu/msm/adreno_a4xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ static int _a4xx_pwron_fixup(struct adreno_device *adreno_dev) 


	ret = kgsl_allocate_global(KGSL_DEVICE(adreno_dev),

		&adreno_dev->pwron_fixup, PAGE_SIZE,

		KGSL_MEMFLAGS_GPUREADONLY, 0);

		KGSL_MEMFLAGS_GPUREADONLY, 0, "pwron_fixup");



	if (ret)

		return ret;

drivers/gpu/msm/adreno_a5xx.c

+6 −5
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static int a5xx_critical_packet_construct(struct adreno_device *adreno_dev) 


	ret = kgsl_allocate_global(&adreno_dev->dev,

					&crit_pkts, PAGE_SIZE,

					KGSL_MEMFLAGS_GPUREADONLY, 0);

					KGSL_MEMFLAGS_GPUREADONLY,

					0, "crit_pkts");

	if (ret)

		return ret;
@@ -258,19 +259,19 @@ static int a5xx_critical_packet_construct(struct adreno_device *adreno_dev) 


	ret = kgsl_allocate_global(&adreno_dev->dev,

					&crit_pkts_refbuf1,

					PAGE_SIZE, 0, 0);

					PAGE_SIZE, 0, 0, "crit_pkts_refbuf1");

	if (ret)

		return ret;



	ret = kgsl_allocate_global(&adreno_dev->dev,

					&crit_pkts_refbuf2,

					PAGE_SIZE, 0, 0);

					PAGE_SIZE, 0, 0, "crit_pkts_refbuf2");

	if (ret)

		return ret;



	ret = kgsl_allocate_global(&adreno_dev->dev,

					&crit_pkts_refbuf3,

					PAGE_SIZE, 0, 0);

					PAGE_SIZE, 0, 0, "crit_pkts_refbuf3");

	if (ret)

		return ret;
@@ -2484,7 +2485,7 @@ static int _load_firmware(struct kgsl_device *device, const char *fwfile, 
	}



	ret = kgsl_allocate_global(device, ucode, fw->size - 4,

				KGSL_MEMFLAGS_GPUREADONLY, 0);

				KGSL_MEMFLAGS_GPUREADONLY, 0, "ucode");



	if (ret)

		goto done;

drivers/gpu/msm/adreno_a5xx_preempt.c

+6 −3
Original line number Diff line number Diff line
@@ -498,7 +498,8 @@ static int a5xx_preemption_ringbuffer_init(struct adreno_device *adreno_dev, 
	int ret;



	ret = kgsl_allocate_global(device, &rb->preemption_desc,

		A5XX_CP_CTXRECORD_SIZE_IN_BYTES, 0, KGSL_MEMDESC_PRIVILEGED);

		A5XX_CP_CTXRECORD_SIZE_IN_BYTES, 0, KGSL_MEMDESC_PRIVILEGED,

		"preemption_desc");

	if (ret)

		return ret;
@@ -533,7 +534,8 @@ static int a5xx_preemption_iommu_init(struct adreno_device *adreno_dev) 


	/* Allocate mem for storing preemption smmu record */

	return kgsl_allocate_global(device, &iommu->smmu_info, PAGE_SIZE,

		KGSL_MEMFLAGS_GPUREADONLY, KGSL_MEMDESC_PRIVILEGED);

		KGSL_MEMFLAGS_GPUREADONLY, KGSL_MEMDESC_PRIVILEGED,

		"smmu_info");

}

#else

static int a5xx_preemption_iommu_init(struct adreno_device *adreno_dev)
@@ -563,7 +565,8 @@ int a5xx_preemption_init(struct adreno_device *adreno_dev) 
	/* Allocate mem for storing preemption counters */

	ret = kgsl_allocate_global(device, &preempt->counters,

		adreno_dev->num_ringbuffers *

		A5XX_CP_CTXRECORD_PREEMPTION_COUNTER_SIZE, 0, 0);

		A5XX_CP_CTXRECORD_PREEMPTION_COUNTER_SIZE, 0, 0,

		"preemption_counters");

	if (ret)

		return ret;