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 0EFFB224F6; Tue, 8 Apr 2025 11:18:42 +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=1744111122; cv=none; b=uilLbFjO4hk9+wbErHvtlsl83H3BxLNAQiUeHz9DZDx1CxbzANZkx/1wvUoQXg0nArwBpf7BhQoiKBEap1TYnsyJZVHZY3GNR/hGUjlQ7dImD2t618c0id7b6I32kXvoiKtW58L20Eoh6pcDkGM5Fs/U8R/Tw5Ap/ToWrFEdIYY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111122; c=relaxed/simple; bh=XI+R9ROo6UaAdRkHxRpBsLdV931z259N/qV/AdV2aQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NPsHsxlH0fZIjJLxqAGm0tz8FasRvUvQB+jpp1JsrZwAlt8TTfxtLB0tbg404mDYC79iRLMR6A7K9J8zGX5Ufna/nY8A68bFiq0lqSeCgi0yNFfef1pk/EkrV+8EFhMgYNO8kghxVJsg0TtW6o62IQxwc5gTmuv7VrFc0YHME5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RuQC4zaI; 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="RuQC4zaI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89FD0C4CEE5; Tue, 8 Apr 2025 11:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744111121; bh=XI+R9ROo6UaAdRkHxRpBsLdV931z259N/qV/AdV2aQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RuQC4zaI+fJrloT7Irwb7hdcE1KbvtKg3VqZ2sngmoLiMr3edgBTfu2+0RxtcPKvk A7PUpN9DHtJrRkgeerl4ok0qXXt9IylA4z+An4/wFo5v94bCag/zuwBqarsXHCA4ki UTzjVwevnmK1iRyeZcOnHgy455SQcdccivK+nYgc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ashley Smith , Liviu Dudau , =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Boris Brezillon , Steven Price , Sasha Levin Subject: [PATCH 6.14 316/731] drm/panthor: Update CS_STATUS_ defines to correct values Date: Tue, 8 Apr 2025 12:43:33 +0200 Message-ID: <20250408104921.627870068@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ashley Smith [ Upstream commit c82734fbdc50dc9e568e8686622eaa4498acb81e ] Values for SC_STATUS_BLOCKED_REASON_ are documented in the G610 "Odin" GPU specification (CS_STATUS_BLOCKED_REASON register). This change updates the defines to the correct values. Fixes: 2718d91816ee ("drm/panthor: Add the FW logical block") Signed-off-by: Ashley Smith Reviewed-by: Liviu Dudau Reviewed-by: Adrián Larumbe Reviewed-by: Boris Brezillon Reviewed-by: Steven Price Signed-off-by: Steven Price Link: https://patchwork.freedesktop.org/patch/msgid/20250303180444.3768993-1-ashley.smith@collabora.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/panthor/panthor_fw.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_fw.h b/drivers/gpu/drm/panthor/panthor_fw.h index 22448abde9923..6598d96c6d2aa 100644 --- a/drivers/gpu/drm/panthor/panthor_fw.h +++ b/drivers/gpu/drm/panthor/panthor_fw.h @@ -102,9 +102,9 @@ struct panthor_fw_cs_output_iface { #define CS_STATUS_BLOCKED_REASON_SB_WAIT 1 #define CS_STATUS_BLOCKED_REASON_PROGRESS_WAIT 2 #define CS_STATUS_BLOCKED_REASON_SYNC_WAIT 3 -#define CS_STATUS_BLOCKED_REASON_DEFERRED 5 -#define CS_STATUS_BLOCKED_REASON_RES 6 -#define CS_STATUS_BLOCKED_REASON_FLUSH 7 +#define CS_STATUS_BLOCKED_REASON_DEFERRED 4 +#define CS_STATUS_BLOCKED_REASON_RESOURCE 5 +#define CS_STATUS_BLOCKED_REASON_FLUSH 6 #define CS_STATUS_BLOCKED_REASON_MASK GENMASK(3, 0) u32 status_blocked_reason; u32 status_wait_sync_value_hi; -- 2.39.5