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

Commit 7a7d1269 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: Add options to enable/disable preemption"

parents b2dd185a caddd61e

drivers/gpu/msm/adreno.c

+10 −2
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ 
/* Include the master list of GPU cores that are supported */

#include "adreno-gpulist.h"



#undef MODULE_PARAM_PREFIX

#define MODULE_PARAM_PREFIX "adreno."



static bool nopreempt;

module_param(nopreempt, bool, 0444);

MODULE_PARM_DESC(nopreempt, "Disable GPU preemption");



#define DRIVER_VERSION_MAJOR   3

#define DRIVER_VERSION_MINOR   1
@@ -1109,7 +1116,7 @@ static int adreno_probe(struct platform_device *pdev) 
	if (!ADRENO_FEATURE(adreno_dev, ADRENO_CONTENT_PROTECTION))

		device->mmu.secured = false;



	status = adreno_ringbuffer_init(device);

	status = adreno_ringbuffer_init(adreno_dev, nopreempt);

	if (status)

		goto out;
@@ -1352,7 +1359,8 @@ static int adreno_init(struct kgsl_device *device) 


	}



	if (ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION)) {

	if (nopreempt == false &&

		ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION)) {

		int r = 0;



		if (gpudev->preemption_init)

drivers/gpu/msm/adreno_drawctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, 
	/* Check for errors before trying to initialize */



	/* If preemption is not supported, ignore preemption request */

	if (!ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))

	if (!test_bit(ADRENO_DEVICE_PREEMPTION, &adreno_dev->priv))

		local &= ~KGSL_CONTEXT_PREEMPT_STYLE_MASK;



	/* We no longer support legacy context switching */

drivers/gpu/msm/adreno_ringbuffer.c

+2 −3
Original line number Diff line number Diff line
@@ -398,15 +398,14 @@ static int _adreno_ringbuffer_init(struct adreno_device *adreno_dev, 
	return ret;

}



int adreno_ringbuffer_init(struct kgsl_device *device)

int adreno_ringbuffer_init(struct adreno_device *adreno_dev, bool nopreempt)

{

	int status = 0;

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	struct adreno_ringbuffer *rb;

	int i;



	if (ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))

	if (nopreempt == false && ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))

		adreno_dev->num_ringbuffers = gpudev->num_prio_levels;

	else

		adreno_dev->num_ringbuffers = 1;

drivers/gpu/msm/adreno_ringbuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
		struct kgsl_cmdbatch *cmdbatch,

		struct adreno_submit_time *time);



int adreno_ringbuffer_init(struct kgsl_device *device);

int adreno_ringbuffer_init(struct adreno_device *adreno_dev, bool nopreempt);



int adreno_ringbuffer_start(struct adreno_device *adreno_dev,

		unsigned int start_type);

drivers/gpu/msm/adreno_snapshot.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ void adreno_snapshot(struct kgsl_device *device, struct kgsl_snapshot *snapshot, 
			snapshot, snapshot_global,

			&adreno_dev->pwron_fixup);



	if (ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION)) {

	if (test_bit(ADRENO_DEVICE_PREEMPTION, &adreno_dev->priv)) {

		FOR_EACH_RINGBUFFER(adreno_dev, rb, i) {

			kgsl_snapshot_add_section(device,

				KGSL_SNAPSHOT_SECTION_GPU_OBJECT_V2,