Skip to content

Commit 657e8f9

Browse files
zhanjungregkh
authored andcommitted
drm/i915/guc: Skip communication warning on reset in progress
[ Upstream commit 1696b0c ] GuC IRQ and tasklet handler receive just single G2H message, and let other messages to be received from next tasklet. During this chained tasklet process, if reset process started, communication will be disabled. Skip warning for this condition. Fixes: 65dd4ed ("drm/i915/guc: Don't receive all G2H messages in irq handler") Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15018 Signed-off-by: Zhanjun Dong <[email protected]> Reviewed-by: Vinay Belgaumkar <[email protected]> Signed-off-by: Daniele Ceraolo Spurio <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 604b5ee4a653a70979ce689dbd6a5d942eb016bf) Signed-off-by: Rodrigo Vivi <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent af66058 commit 657e8f9

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,9 +1324,16 @@ static int ct_receive(struct intel_guc_ct *ct)
13241324

13251325
static void ct_try_receive_message(struct intel_guc_ct *ct)
13261326
{
1327+
struct intel_guc *guc = ct_to_guc(ct);
13271328
int ret;
13281329

1329-
if (GEM_WARN_ON(!ct->enabled))
1330+
if (!ct->enabled) {
1331+
GEM_WARN_ON(!guc_to_gt(guc)->uc.reset_in_progress);
1332+
return;
1333+
}
1334+
1335+
/* When interrupt disabled, message handling is not expected */
1336+
if (!guc->interrupts.enabled)
13301337
return;
13311338

13321339
ret = ct_receive(ct);

0 commit comments

Comments
 (0)