From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87AA23D6CA2; Wed, 8 Apr 2026 18:33:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673225; cv=none; b=EQHrAbh19CGRbMkyDz6yK2/hvYbXHga7TyamKU7D4m0002j/Uc5LjVSqm30OZhzOU1JAp12nnvVtMys+Pjnz80au/ktB1oO4JadJqdwleeJflV8+GvYpbVvEGUuIxQCYh/wKd2pAxWhCgiTNi3hunqCmv6Ld3UL0WIBq1KrSiXE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673225; c=relaxed/simple; bh=XZjZp9/Eyb0fWSX4GfsYbqCFIN8KYeHLS0HHmuJaTZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XEJkMYEV78XJsLHtQOZYu6QWkEdAjTrWwRVfUC15/XZrPQ6QmRsjrM1We0Ix3OUTCAJo4QTmbF3SyKbMHrUrImaeJJaYZ3/6kQH80UfkHVcAKufem8LG16DMT+95AiYCcrZhp6GP2V85oM7TiGMXeBg8QioCSImlWc2VTGsCJ38= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ssXqaoUU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ssXqaoUU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA361C19421; Wed, 8 Apr 2026 18:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775673225; bh=XZjZp9/Eyb0fWSX4GfsYbqCFIN8KYeHLS0HHmuJaTZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssXqaoUU/3IP0qulzkC7SNup6j2/A9Du6KFj3xbZ5JWJdgbwqfCuE3JoA1+GieEMe ANimPfXG2V+Zsw7/qqsQrP5KDxSBBbRj9XPtcpEh+8sxE9+VzTsStB+599rTIfBjfm FUkzw4F7oQYi0Uedp1bepAUEvTX2BVxcG7AfiaXk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniele Ceraolo Spurio , Alan Previn Teres Alexis , Julia Filipchuk , Rodrigo Vivi , Sasha Levin Subject: [PATCH 6.18 116/277] drm/xe/pxp: Remove incorrect handling of impossible state during suspend Date: Wed, 8 Apr 2026 20:01:41 +0200 Message-ID: <20260408175938.204064740@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.836769063@linuxfoundation.org> References: <20260408175933.836769063@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniele Ceraolo Spurio [ Upstream commit 4fed244954c2dc9aafa333d08f66b14345225e03 ] The default case of the PXP suspend switch is incorrectly exiting without releasing the lock. However, this case is impossible to hit because we're switching on an enum and all the valid enum values have their own cases. Therefore, we can just get rid of the default case and rely on the compiler to warn us if a new enum value is added and we forget to add it to the switch. Fixes: 51462211f4a9 ("drm/xe/pxp: add PXP PM support") Signed-off-by: Daniele Ceraolo Spurio Cc: Alan Previn Teres Alexis Cc: Julia Filipchuk Reviewed-by: Julia Filipchuk Link: https://patch.msgid.link/20260324153718.3155504-8-daniele.ceraolospurio@intel.com (cherry picked from commit f1b5a77fc9b6a90cd9a5e3db9d4c73ae1edfcfac) Signed-off-by: Rodrigo Vivi Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_pxp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_pxp.c b/drivers/gpu/drm/xe/xe_pxp.c index ba4d52001b853..fdcecc026e937 100644 --- a/drivers/gpu/drm/xe/xe_pxp.c +++ b/drivers/gpu/drm/xe/xe_pxp.c @@ -891,11 +891,6 @@ int xe_pxp_pm_suspend(struct xe_pxp *pxp) pxp->key_instance++; needs_queue_inval = true; break; - default: - drm_err(&pxp->xe->drm, "unexpected state during PXP suspend: %u", - pxp->status); - ret = -EIO; - goto out; } /* @@ -920,7 +915,6 @@ int xe_pxp_pm_suspend(struct xe_pxp *pxp) pxp->last_suspend_key_instance = pxp->key_instance; -out: return ret; } -- 2.53.0