drm/i915: Skip logging impossible slices

Log up to sseu->max_slices instead basing on ARRAY_SIZE since to avoid
printing impossible and empty slices for a platform.

Also compact slice total and slice mask into one log line.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180321103228.32205-1-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index a504281..0d1509e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -83,11 +83,11 @@ static void sseu_dump(const struct sseu_dev_info *sseu, struct drm_printer *p)
 {
        int s;
 
-       drm_printf(p, "slice mask: %04x\n", sseu->slice_mask);
-       drm_printf(p, "slice total: %u\n", hweight8(sseu->slice_mask));
+       drm_printf(p, "slice total: %u, mask=%04x\n",
+                  hweight8(sseu->slice_mask), sseu->slice_mask);
        drm_printf(p, "subslice total: %u\n", sseu_subslice_total(sseu));
-       for (s = 0; s < ARRAY_SIZE(sseu->subslice_mask); s++) {
-               drm_printf(p, "slice%d %u subslices mask=%04x\n",
+       for (s = 0; s < sseu->max_slices; s++) {
+               drm_printf(p, "slice%d: %u subslices, mask=%04x\n",
                           s, hweight8(sseu->subslice_mask[s]),
                           sseu->subslice_mask[s]);
        }