On Thu, Aug 15, 2024 at 08:26:16PM +0200, Antonino Maniscalco wrote:
> Some userspace changes are necessary so add a flag for userspace to
> advertise support for preemption.
So the intention is to fallback to level 0 preemption until user moves
to Mesa libs with level 1 support for each new GPU? Please elaborate a bit.
-Akhil.
>
> Signed-off-by: Antonino Maniscalco <antomani103@xxxxxxxxx>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 ++++++++----
> include/uapi/drm/msm_drm.h | 5 ++++-
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index 1a90db5759b8..86357016db8d 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -453,8 +453,10 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
> OUT_PKT7(ring, CP_SET_MARKER, 1);
> OUT_RING(ring, 0x101); /* IFPC disable */
>
> - OUT_PKT7(ring, CP_SET_MARKER, 1);
> - OUT_RING(ring, 0x00d); /* IB1LIST start */
> + if (submit->queue->flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT) {
> + OUT_PKT7(ring, CP_SET_MARKER, 1);
> + OUT_RING(ring, 0x00d); /* IB1LIST start */
> + }
>
> /* Submit the commands */
> for (i = 0; i < submit->nr_cmds; i++) {
> @@ -485,8 +487,10 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
> update_shadow_rptr(gpu, ring);
> }
>
> - OUT_PKT7(ring, CP_SET_MARKER, 1);
> - OUT_RING(ring, 0x00e); /* IB1LIST end */
> + if (submit->queue->flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT) {
> + OUT_PKT7(ring, CP_SET_MARKER, 1);
> + OUT_RING(ring, 0x00e); /* IB1LIST end */
> + }
>
> get_stats_counter(ring, REG_A7XX_RBBM_PERFCTR_CP(0),
> rbmemptr_stats(ring, index, cpcycles_end));
> diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
> index 3fca72f73861..f37858db34e6 100644
> --- a/include/uapi/drm/msm_drm.h
> +++ b/include/uapi/drm/msm_drm.h
> @@ -345,7 +345,10 @@ struct drm_msm_gem_madvise {
> * backwards compatibility as a "default" submitqueue
> */
>
> -#define MSM_SUBMITQUEUE_FLAGS (0)
> +#define MSM_SUBMITQUEUE_ALLOW_PREEMPT 0x00000001
> +#define MSM_SUBMITQUEUE_FLAGS ( \
> + MSM_SUBMITQUEUE_ALLOW_PREEMPT | \
> + 0)
>
> /*
> * The submitqueue priority should be between 0 and MSM_PARAM_PRIORITIES-1,
>
> --
> 2.46.0
>
>
