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

Commit cf53577f 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: Allow draw context to perform only replay on recovery"

parents 22c29693 d689330a

drivers/gpu/msm/adreno_dispatch.c

+7 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,13 @@ static void _set_ft_policy(struct adreno_device *adreno_dev, 
	 */

	if (drawctxt->base.flags & KGSL_CONTEXT_NO_FAULT_TOLERANCE)

		set_bit(KGSL_FT_DISABLE, &cmdobj->fault_policy);

	/*

	 *  Set the fault tolerance policy to FT_REPLAY - As context wants

	 *  to invalidate it after a replay attempt fails. This doesn't

	 *  require to execute the default FT policy.

	 */

	else if (drawctxt->base.flags & KGSL_CONTEXT_INVALIDATE_ON_FAULT)

		set_bit(KGSL_FT_REPLAY, &cmdobj->fault_policy);

	else

		cmdobj->fault_policy = adreno_dev->ft_policy;

}

drivers/gpu/msm/adreno_drawctxt.c

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, 
		KGSL_CONTEXT_PER_CONTEXT_TS |

		KGSL_CONTEXT_USER_GENERATED_TS |

		KGSL_CONTEXT_NO_FAULT_TOLERANCE |

		KGSL_CONTEXT_INVALIDATE_ON_FAULT |

		KGSL_CONTEXT_CTX_SWITCH |

		KGSL_CONTEXT_PRIORITY_MASK |

		KGSL_CONTEXT_TYPE_MASK |

drivers/gpu/msm/kgsl_device.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ enum kgsl_event_results { 
	{ KGSL_CONTEXT_PER_CONTEXT_TS, "PER_CONTEXT_TS" }, \

	{ KGSL_CONTEXT_USER_GENERATED_TS, "USER_TS" }, \

	{ KGSL_CONTEXT_NO_FAULT_TOLERANCE, "NO_FT" }, \

	{ KGSL_CONTEXT_INVALIDATE_ON_FAULT, "INVALIDATE_ON_FAULT" }, \

	{ KGSL_CONTEXT_PWR_CONSTRAINT, "PWR" }, \

	{ KGSL_CONTEXT_SAVE_GMEM, "SAVE_GMEM" }

include/uapi/linux/msm_kgsl.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#define KGSL_CONTEXT_TYPE_RS		4

#define KGSL_CONTEXT_TYPE_UNKNOWN	0x1E



#define KGSL_CONTEXT_INVALIDATE_ON_FAULT 0x10000000



#define KGSL_CONTEXT_INVALID 0xffffffff



/*