]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe/topology: Use register array size instead magic number
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Wed, 4 Jun 2025 20:29:07 +0000 (22:29 +0200)
committerMatt Roper <matthew.d.roper@intel.com>
Fri, 6 Jun 2025 18:47:05 +0000 (11:47 -0700)
Since we keep registers in the array we can simply count them and
stop relying on magic number when checking if didn't make mistake.

Also we can switch to use xe_gt_assert() since it could be just
our programming mistake during platform bringup, no need to keep
drm_WARN() in the production driver.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20250604202908.769-3-michal.wajdeczko@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
drivers/gpu/drm/xe/xe_gt_topology.c

index 62bfb6e1a1661249f9dba2ee4a85a23a1e1ff496..048743913b368d11954a5319d664713090fb549f 100644 (file)
@@ -236,8 +236,8 @@ xe_gt_topology_init(struct xe_gt *gt)
         * Register counts returned shouldn't exceed the number of registers
         * passed as parameters below.
         */
-       drm_WARN_ON(&xe->drm, num_geometry_regs > 3);
-       drm_WARN_ON(&xe->drm, num_compute_regs > 3);
+       xe_gt_assert(gt, num_geometry_regs <= ARRAY_SIZE(geometry_regs));
+       xe_gt_assert(gt, num_compute_regs <= ARRAY_SIZE(compute_regs));
 
        load_dss_mask(gt, gt->fuse_topo.g_dss_mask,
                      num_geometry_regs, geometry_regs);