From nobody Sun Feb 8 19:25:45 2026 Received: from mx07-00376f01.pphosted.com (mx07-00376f01.pphosted.com [185.132.180.163]) (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 CB8673624A6 for ; Fri, 6 Feb 2026 10:12:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.132.180.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770372735; cv=none; b=Btt5JPdCWXleoOJ4erFUW8iw6mXgTC90o01Ydgw7LT5m3sqgFcH8GBlcHC8BbDs1rPt9qOHJKUl6UjtZt5agpzLrb11yOcjzlvcFT4VEsoNZB5eN0OgamIlkSSBwd5xlWsR1z4RaM13L/rOEgpZxYRXrXcjC94iclvSv1vidO4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770372735; c=relaxed/simple; bh=IUjffk5CloNwGZP93xbN7W0kQC8p3fqgc46IQ+Fsn94=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=cvu+RoZfYZmAiTdQunCL7q/9NKzhs/Y3eyEGoDMwJUgwOMRwg3qnSQh76S9feR3JV+jHjRxrFVCMCdEhbICloDe164chc/G8KyL+0l1wrJyxdjlosk8+P6xBwitzaXJ5bmCOvpxMJsvq85/EhJ9b6xOrEzDtbsQ85qLwy/IH1UI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com; spf=pass smtp.mailfrom=imgtec.com; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b=THInFgIF; arc=none smtp.client-ip=185.132.180.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=imgtec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b="THInFgIF" Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61672Psj3430938; Fri, 6 Feb 2026 09:56:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=dk201812; bh=E pOpi4E2fDrwZowzWolNlPQPO9LDUigk9MxGb1DPuMs=; b=THInFgIFzJVi/H9uy 5KwOj9u2mnDkevvmUu9K7OYqsyMoarvkoxgkcRYNOhkw2MMOa8zHqN/wSYOLgHPv OAYhE6pVBzfd6koE7cBjelDBXEIN1TZ6WWEQAqRvlyc7PHWMc60ee4leRK8LhVzq GbmhvGaZugBKfKY/aRiVzhYnjanhlH5nmu2Ua4PFoTD9yI0N7VAaDsWK6tDdgJSe BubScKQW9knbz0nzi7l2DE/auOB3kw/H34JqCuQKC811rl+TWJZnEGATdcXiZmOM Fe0KKKJxPOCJWVvTASc/A+Np7f78vcp0ASDPLw5Zx8J6rAMZYaydqsIPUv5rYJRj LvJOQ== Received: from hhmail01.hh.imgtec.org (83-244-153-141.cust-83.exponential-e.net [83.244.153.141]) by mx07-00376f01.pphosted.com (PPS) with ESMTPS id 4c4je3s2n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Feb 2026 09:56:32 +0000 (GMT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa (172.25.6.240) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.35; Fri, 6 Feb 2026 09:56:31 +0000 From: Matt Coster Date: Fri, 6 Feb 2026 09:56:25 +0000 Subject: [PATCH 1/2] drm/imagination: Define packed BVNCs in the uapi Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260206-bvnc-cleanup-v1-1-f3c818541fbe@imgtec.com> References: <20260206-bvnc-cleanup-v1-0-f3c818541fbe@imgtec.com> In-Reply-To: <20260206-bvnc-cleanup-v1-0-f3c818541fbe@imgtec.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Frank Binns , Brajesh Gupta , Alessio Belle , Alexandru Dadu , , , "Matt Coster" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4474; i=matt.coster@imgtec.com; h=from:subject:message-id; bh=IUjffk5CloNwGZP93xbN7W0kQC8p3fqgc46IQ+Fsn94=; b=owGbwMvMwCFWuUfy8817WRsYT6slMWS27jo3aYFV2e4NCVstdiyuUTE32NEtlJbZ82Kt+d07L 85tNtn4paOUhUGMg0FWTJFlxwrLFWp/1LQkbvwqhpnDygQyhIGLUwAmkmLF8IdPedYnww1GH28o Bbh/nyVfaVQTE5za3lxgG/hw8bnZnL6MDFPeT1HSWORUYV42xTN/U/xT1X9XL1yRFrWLmS/e+Od ZCjMA X-Developer-Key: i=matt.coster@imgtec.com; a=openpgp; fpr=05A40CFCE7269D61D97100A1747F0A9036F90DFA X-Authority-Analysis: v=2.4 cv=TpLrRTXh c=1 sm=1 tr=0 ts=6985bad0 cx=c_pps a=AKOq//PuzOIrVTIF9yBwbA==:117 a=AKOq//PuzOIrVTIF9yBwbA==:17 a=N16aOacbDtMA:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=Mpw57Om8IfrbqaoTuvik:22 a=GgsMoib0sEa3-_RKJdDe:22 a=r_1tXGB3AAAA:8 a=99dQMx_Ko8NUrOUIDhEA:9 a=QEXdDO2ut3YA:10 a=t8nPyN_e6usw4ciXM-Pk:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjA2MDA2NiBTYWx0ZWRfX1wb5M+ainQtb GCcmeeoDZt0VnWAYF4uH+Pkl1PERq5vR1WbQCZbW9U2OuGXKqgPRCRj+lkPGYaLMRI0k3BSVm0q oLPU9cJyoxfceEWW/HU1C2hWtNKcGFOmAH/veoYZ2khxXlVopkZjuxvOaPOljo9V6VzTwvrC3p0 vxTZDWdwlP32YSBlBlqY7wY5+TBlj1P9Nmu0VVUivy2Emrmb41ajJQ8fa8atWgnu34XXCBmUK67 kZZmWNQ2IoNUfcI4sYnO8v+HrUsLbq4ZGyUoAA6eJeS14k7OAR45NfNWvrU7iGgBDTDE+kXSz7A W/CxRoFEFJ7Y2f745LKPRgCEEyjW08WhLSbxYziMsP1ra3BhHUVpD+W0nj4H83O2B8KmLaOXwWc 5iSGnZmrjJsAck/GziijvlozGEvXPWK4PnxQ8esHRvVznrK2xdBlmNUOMJsFs6vi4DKlm8/XWVT LuggGdU5ATkBA2yJJpQ== X-Proofpoint-GUID: Bfm1F5q3x_dH8jrsqNEyjeyvmfRNKhqK X-Proofpoint-ORIG-GUID: Bfm1F5q3x_dH8jrsqNEyjeyvmfRNKhqK Using the uapi-safe __GENMASK_ULL(), we can stably define the layout of 64-bit packed BVNCs. These defs replace the replicated doc comment that appears all over the place. Signed-off-by: Matt Coster --- drivers/gpu/drm/imagination/pvr_device.h | 36 ++++++++++------------------= ---- include/uapi/drm/pvr_drm.h | 14 ++++++------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_device.h b/drivers/gpu/drm/ima= gination/pvr_device.h index cfda215e7428..58f0eae05ad9 100644 --- a/drivers/gpu/drm/imagination/pvr_device.h +++ b/drivers/gpu/drm/imagination/pvr_device.h @@ -14,7 +14,7 @@ #include #include =20 -#include +#include #include #include #include @@ -479,39 +479,25 @@ struct pvr_file { * @n: Number of scalable units. * @c: Config ID. * - * The packed layout is as follows: - * - * +--------+--------+--------+-------+ - * | 63..48 | 47..32 | 31..16 | 15..0 | - * +=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D= =3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D+ - * | B | V | N | C | - * +--------+--------+--------+-------+ + * The packed layout follows the bitfield defined by the DRM_PVR_BVNC_* ma= cros. * * pvr_gpu_id_to_packed_bvnc() should be used instead of this macro when a * &struct pvr_gpu_id is available in order to ensure proper type checking. * * Return: Packed BVNC. */ -/* clang-format off */ #define PVR_PACKED_BVNC(b, v, n, c) \ - ((((u64)(b) & GENMASK_ULL(15, 0)) << 48) | \ - (((u64)(v) & GENMASK_ULL(15, 0)) << 32) | \ - (((u64)(n) & GENMASK_ULL(15, 0)) << 16) | \ - (((u64)(c) & GENMASK_ULL(15, 0)) << 0)) -/* clang-format on */ + (FIELD_PREP(DRM_PVR_BVNC_B, b) | \ + FIELD_PREP(DRM_PVR_BVNC_V, v) | \ + FIELD_PREP(DRM_PVR_BVNC_N, n) | \ + FIELD_PREP(DRM_PVR_BVNC_C, c)) =20 /** * pvr_gpu_id_to_packed_bvnc() - Packs B, V, N and C values into a 64-bit * unsigned integer * @gpu_id: GPU ID. * - * The packed layout is as follows: - * - * +--------+--------+--------+-------+ - * | 63..48 | 47..32 | 31..16 | 15..0 | - * +=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D= =3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D+ - * | B | V | N | C | - * +--------+--------+--------+-------+ + * The packed layout follows the bitfield defined by the DRM_PVR_BVNC_* ma= cros. * * This should be used in preference to PVR_PACKED_BVNC() when a &struct * pvr_gpu_id is available in order to ensure proper type checking. @@ -527,10 +513,10 @@ pvr_gpu_id_to_packed_bvnc(const struct pvr_gpu_id *gp= u_id) static __always_inline void packed_bvnc_to_pvr_gpu_id(u64 bvnc, struct pvr_gpu_id *gpu_id) { - gpu_id->b =3D (bvnc & GENMASK_ULL(63, 48)) >> 48; - gpu_id->v =3D (bvnc & GENMASK_ULL(47, 32)) >> 32; - gpu_id->n =3D (bvnc & GENMASK_ULL(31, 16)) >> 16; - gpu_id->c =3D bvnc & GENMASK_ULL(15, 0); + gpu_id->b =3D FIELD_GET(DRM_PVR_BVNC_B, bvnc); + gpu_id->v =3D FIELD_GET(DRM_PVR_BVNC_V, bvnc); + gpu_id->n =3D FIELD_GET(DRM_PVR_BVNC_N, bvnc); + gpu_id->c =3D FIELD_GET(DRM_PVR_BVNC_C, bvnc); } =20 int pvr_device_init(struct pvr_device *pvr_dev); diff --git a/include/uapi/drm/pvr_drm.h b/include/uapi/drm/pvr_drm.h index ccf6c2112468..72f3f90560cf 100644 --- a/include/uapi/drm/pvr_drm.h +++ b/include/uapi/drm/pvr_drm.h @@ -6,6 +6,7 @@ =20 #include "drm.h" =20 +#include #include #include =20 @@ -113,6 +114,11 @@ struct drm_pvr_obj_array { * DOC: PowerVR IOCTL DEV_QUERY interface */ =20 +#define DRM_PVR_BVNC_B __GENMASK_ULL(63, 48) +#define DRM_PVR_BVNC_V __GENMASK_ULL(47, 32) +#define DRM_PVR_BVNC_N __GENMASK_ULL(31, 16) +#define DRM_PVR_BVNC_C __GENMASK_ULL(15, 0) + /** * struct drm_pvr_dev_query_gpu_info - Container used to fetch information= about * the graphics processor. @@ -125,13 +131,7 @@ struct drm_pvr_dev_query_gpu_info { * @gpu_id: GPU identifier. * * For all currently supported GPUs this is the BVNC encoded as a 64-bit - * value as follows: - * - * +--------+--------+--------+-------+ - * | 63..48 | 47..32 | 31..16 | 15..0 | - * +=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D= =3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D+ - * | B | V | N | C | - * +--------+--------+--------+-------+ + * value using the DRM_PVR_BVNC_* bitmasks. */ __u64 gpu_id; =20 --=20 2.52.0 From nobody Sun Feb 8 19:25:45 2026 Received: from mx07-00376f01.pphosted.com (mx07-00376f01.pphosted.com [185.132.180.163]) (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 CB8F23644BF for ; Fri, 6 Feb 2026 10:12:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.132.180.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770372735; cv=none; b=iSm/DifQIA1SseOe2Lro0m9+TLETQGB8BB5HsSBlRzdinhbypGPRDpMzccSi8TkxcdKKdVtqk5fdWFOQPAGXUxPWQHpEq43HIcyS1+ERrz35qFJSL/LPsrpXfWDKoTb8P52XGwJKCVQyLLPhjEQ9iZQYFY9bjQ6jl+E4g7Jd0lI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770372735; c=relaxed/simple; bh=yJ7P/Wy9o6odDdmjvuxN/nO0tjNOm7u94ehiOkuCuGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=SqKYrhPF8iBWYf1K8mUfpALC1A2ju+Pwef9zVuh3Xn+3dMMeWDme7uGj0lBzjGyAkx9fAPL0LyYDoRjk+3iqteS/b8+lsdQ98j71ntT9hXe0EjqGKs8CqkM55/csqCNImqdJrOwHtvGJPdZca27hI474KwNTQPQjeK7viW4sVNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com; spf=pass smtp.mailfrom=imgtec.com; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b=QbALdKBu; arc=none smtp.client-ip=185.132.180.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=imgtec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b="QbALdKBu" Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61672Psk3430938; Fri, 6 Feb 2026 09:56:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=dk201812; bh=k FtjyrjnTgI2d2/1Rshhag72oRsujxc+LiAFMKwOmMs=; b=QbALdKBuXBh/r6Vc+ KK62IgAssowxbBWq2VxjrkTgfbJTuZmqho7op3bJfkw907wPbBS/w0qscuwQOh5j gBJRxNV78tRdwcB1C7vjglyYLh04lKQVdSK0LR8wz8u3Mos/XzINsUZ2QzyQAKLL 3PA+GDnqAc4TR5lh2xG/zV1Rha7ftiMhD0ZrqAfMIhF5sCBPuG9uafrLxcjLD/9t zNNqMzXo5PtNyAL37z8GHHFkbXO+4eYSVy7rZYLYsZUvj9GHBBh5usG6W2ALwrTY mEO/NOOvjbyhf6k2NpjrGKnpWBwHRtBu2b/LkMsSQV1F3qpR1rjeNG9lFRedL3UE iq1qg== Received: from hhmail01.hh.imgtec.org (83-244-153-141.cust-83.exponential-e.net [83.244.153.141]) by mx07-00376f01.pphosted.com (PPS) with ESMTPS id 4c4je3s2n5-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Feb 2026 09:56:32 +0000 (GMT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa (172.25.6.240) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.35; Fri, 6 Feb 2026 09:56:31 +0000 From: Matt Coster Date: Fri, 6 Feb 2026 09:56:26 +0000 Subject: [PATCH 2/2] drm/imagination: Add PVR_GPU_ID_FMT to format pvr_gpu_id Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260206-bvnc-cleanup-v1-2-f3c818541fbe@imgtec.com> References: <20260206-bvnc-cleanup-v1-0-f3c818541fbe@imgtec.com> In-Reply-To: <20260206-bvnc-cleanup-v1-0-f3c818541fbe@imgtec.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: Frank Binns , Brajesh Gupta , Alessio Belle , Alexandru Dadu , , , "Matt Coster" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3459; i=matt.coster@imgtec.com; h=from:subject:message-id; bh=yJ7P/Wy9o6odDdmjvuxN/nO0tjNOm7u94ehiOkuCuGs=; b=owGbwMvMwCFWuUfy8817WRsYT6slMWS27jpXFvDuqsLGhgDR0Os+2RK5+plnuax5Pa4vVD+kx Xhnw9OAjlIWBjEOBlkxRZYdKyxXqP1R05K48asYZg4rE8gQBi5OAZhIeC8jw1rbDLZIq7XO88Mb SiRbVFlvROUX+m6Imeu+UyHHzfveZ4b/yTEi+fybFLLX55xMXLpHUP5bnfXqxI11JVxtzpuZq71 ZAA== X-Developer-Key: i=matt.coster@imgtec.com; a=openpgp; fpr=05A40CFCE7269D61D97100A1747F0A9036F90DFA X-Authority-Analysis: v=2.4 cv=TpLrRTXh c=1 sm=1 tr=0 ts=6985bad0 cx=c_pps a=AKOq//PuzOIrVTIF9yBwbA==:117 a=AKOq//PuzOIrVTIF9yBwbA==:17 a=N16aOacbDtMA:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=Mpw57Om8IfrbqaoTuvik:22 a=GgsMoib0sEa3-_RKJdDe:22 a=r_1tXGB3AAAA:8 a=SGYt_DqNckTIVf0CK1AA:9 a=QEXdDO2ut3YA:10 a=t8nPyN_e6usw4ciXM-Pk:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjA2MDA2NiBTYWx0ZWRfXyEdSAyxyn//q yG1s/FpkSVOSjmhF4zu29nVhmvLZWOGMd6IUTlGgInQKg0CJs/niDVJKR4ZdRWsNPvBO0TpeVT7 l658ePt1HAWjGmosJxxrFUzNiB5wKlMksZ1KllIrftE1oiYc/WgCuTs53q+8xVbCktjGrrgwYp5 GUae/flA4z1G4VlVrrHv8uaf9O/12YBIDPf/wBV392T/Rlrebhit2iVZuiN9A2jqnEHRWxBCDsJ 3NmH8jfNQX6leLkYeSauBxilLOxSvTBr4P7JEqAgqZWos4Tke7rjx8aMelKul2x9ZxPCh2qDNvZ DeVfDPBpHew6bpizlK1GmHX4r/0wqf7KLwWlEBSIeQcEbExfc+zY7sKDgw2tyWcYgLu+iazOfpq gfnhH9T+QsWROKkPN3Jlpf5awY/C+1FcbyWzShHhD08C/NwvxO22nIjrS8UUkjFFr7drRix4X0K UOu48izDJ1epoaaAJ4Q== X-Proofpoint-GUID: L8Oi0LpbWnTcm2bqG6c8VFFzyueeYsDA X-Proofpoint-ORIG-GUID: L8Oi0LpbWnTcm2bqG6c8VFFzyueeYsDA There are currently two different combinations of format specifiers used to print a struct pvr_gpu_id, one using %i and one using %d. Both of these are technically incorrect since the components are stored as u16. Introduce macros to simplify and correct the formatting of these values: - PVR_GPU_ID_FMT: A pre-constructed format string fragment, in the style of PRIu32. - PVR_GPU_ID_FMT_ARGS(): Accepts a &struct pvr_gpu_id and expands the fields into appropriate format arguments to be used with PVR_GPU_ID_FMT. - PVR_GPU_ID_FMT_ARGS_PACKED(): Accepts a packed GPUID as a u64 and extracts the components directly into appropriate format arguments to be used with PVR_GPU_ID_FMT. Signed-off-by: Matt Coster --- drivers/gpu/drm/imagination/pvr_device.c | 4 ++-- drivers/gpu/drm/imagination/pvr_device.h | 6 ++++++ drivers/gpu/drm/imagination/pvr_fw.c | 12 +++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/ima= gination/pvr_device.c index f58bb66a6327..e032ebe1e505 100644 --- a/drivers/gpu/drm/imagination/pvr_device.c +++ b/drivers/gpu/drm/imagination/pvr_device.c @@ -362,8 +362,8 @@ pvr_build_firmware_filename(struct pvr_device *pvr_dev,= const char *base, { struct pvr_gpu_id *gpu_id =3D &pvr_dev->gpu_id; =20 - return kasprintf(GFP_KERNEL, "%s_%d.%d.%d.%d_v%d.fw", base, gpu_id->b, - gpu_id->v, gpu_id->n, gpu_id->c, major); + return kasprintf(GFP_KERNEL, "%s_" PVR_GPU_ID_FMT "_v%d.fw", base, + PVR_GPU_ID_FMT_ARGS(gpu_id), major); } =20 static void diff --git a/drivers/gpu/drm/imagination/pvr_device.h b/drivers/gpu/drm/ima= gination/pvr_device.h index 58f0eae05ad9..4213eb8dd7cd 100644 --- a/drivers/gpu/drm/imagination/pvr_device.h +++ b/drivers/gpu/drm/imagination/pvr_device.h @@ -53,6 +53,12 @@ struct pvr_gpu_id { u16 b, v, n, c; }; =20 +#define PVR_GPU_ID_FMT "%u.%u.%u.%u" +#define PVR_GPU_ID_FMT_ARGS(gpu_id) (gpu_id)->b, (gpu_id)->v, (gpu_id)->n,= (gpu_id)->c +#define PVR_GPU_ID_FMT_ARGS_PACKED(gpu_id) \ + (u32)FIELD_GET(DRM_PVR_BVNC_B, gpu_id), (u32)FIELD_GET(DRM_PVR_BVNC_V, gp= u_id), \ + (u32)FIELD_GET(DRM_PVR_BVNC_N, gpu_id), (u32)FIELD_GET(DRM_PVR_BVNC_C, gp= u_id) + /** * struct pvr_fw_version - Firmware version information * @major: Major version number. diff --git a/drivers/gpu/drm/imagination/pvr_fw.c b/drivers/gpu/drm/imagina= tion/pvr_fw.c index 779a58fe6ee8..b258c5a4f433 100644 --- a/drivers/gpu/drm/imagination/pvr_fw.c +++ b/drivers/gpu/drm/imagination/pvr_fw.c @@ -125,13 +125,11 @@ pvr_fw_validate(struct pvr_device *pvr_dev) return -EINVAL; } =20 - if (pvr_gpu_id_to_packed_bvnc(&pvr_dev->gpu_id) !=3D header->bvnc) { - struct pvr_gpu_id fw_gpu_id; - - packed_bvnc_to_pvr_gpu_id(header->bvnc, &fw_gpu_id); - drm_err(drm_dev, "FW built for incorrect GPU ID %i.%i.%i.%i (expected %i= .%i.%i.%i)\n", - fw_gpu_id.b, fw_gpu_id.v, fw_gpu_id.n, fw_gpu_id.c, - pvr_dev->gpu_id.b, pvr_dev->gpu_id.v, pvr_dev->gpu_id.n, pvr_dev->gpu_i= d.c); + u64 device_gpu_id_packed =3D pvr_gpu_id_to_packed_bvnc(&pvr_dev->gpu_id); + if (device_gpu_id_packed !=3D header->bvnc) { + drm_err(drm_dev, "FW built for incorrect GPU ID " PVR_GPU_ID_FMT " (expe= cted " PVR_GPU_ID_FMT ")\n", + PVR_GPU_ID_FMT_ARGS_PACKED(header->bvnc), + PVR_GPU_ID_FMT_ARGS_PACKED(device_gpu_id_packed)); return -EINVAL; } =20 --=20 2.52.0