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

Commit 6a383855 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 A5x support for CONTEXT_SWITCH_YIELD preemption"

parents ec2576df 336e0720

drivers/gpu/msm/adreno_a5xx.c

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -337,6 +337,10 @@ static int a5xx_preemption_pre_ibsubmit( 
		*cmds++ = 0;

	}



	/* Enable CP_CONTEXT_SWITCH_YIELD packets in the IB2s */

	*cmds++ = cp_type7_packet(CP_YIELD_ENABLE, 1);

	*cmds++ = 2;



	return cmds - cmds_orig;

}

drivers/gpu/msm/adreno_ringbuffer.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2007-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2002,2007-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -575,7 +575,7 @@ adreno_ringbuffer_addcmds(struct adreno_ringbuffer *rb, 


	if (gpudev->preemption_pre_ibsubmit &&

				adreno_is_preemption_enabled(adreno_dev))

		total_sizedwords += 20;

		total_sizedwords += 22;



	if (gpudev->preemption_post_ibsubmit &&

				adreno_is_preemption_enabled(adreno_dev))