Commit 8135f1c0 authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Lucas De Marchi
Browse files

drm/xe/oa: Don't reset OAC_CONTEXT_ENABLE on OA stream close 

Mesa testing on Xe2+ revealed that when OA metrics are collected for an
exec_queue, after the OA stream is closed, future batch buffers submitted
on that exec_queue do not complete. Not resetting OAC_CONTEXT_ENABLE on OA
stream close resolves these hangs and should not have any adverse effects.

v2: Make the change that we don't reset the bit clearer (Ashutosh)
    Also make the same fix for OAC as OAR (Ashutosh)

Bspec: 60314
Fixes: 2f4a730f ("drm/xe/oa: Add OAR support")
Fixes: 14e077f8 ("drm/xe/oa: Add OAC support")
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2821


Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240924213713.3497992-1-ashutosh.dixit@intel.com


(cherry picked from commit 0c8650b0)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 67801fa6

drivers/gpu/drm/xe/xe_oa.c

+3 −6
Original line number Diff line number Diff line
@@ -709,8 +709,7 @@ static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable) 
		{

			RING_CONTEXT_CONTROL(stream->hwe->mmio_base),

			regs_offset + CTX_CONTEXT_CONTROL,

			_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE,

				      enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0)

			_MASKED_BIT_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE),

		},

	};

	struct xe_oa_reg reg_lri = { OAR_OACONTROL, oacontrol };
@@ -742,10 +741,8 @@ static int xe_oa_configure_oac_context(struct xe_oa_stream *stream, bool enable) 
		{

			RING_CONTEXT_CONTROL(stream->hwe->mmio_base),

			regs_offset + CTX_CONTEXT_CONTROL,

			_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE,

				      enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) |

			_MASKED_FIELD(CTX_CTRL_RUN_ALONE,

				      enable ? CTX_CTRL_RUN_ALONE : 0),

			_MASKED_BIT_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE) |

			_MASKED_FIELD(CTX_CTRL_RUN_ALONE, enable ? CTX_CTRL_RUN_ALONE : 0),

		},

	};

	struct xe_oa_reg reg_lri = { OAC_OACONTROL, oacontrol };