drm/i915: Move calculation of subslices per slice to new function

Add a new function to return the number of subslices per slice to
consolidate code usage.

v2: rebase on changes to move sseu struct to intel_sseu.h
v3: add intel_* prefix to sseu_subslices_per_slice

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190524154022.13575-4-stuart.summers@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_sseu.h b/drivers/gpu/drm/i915/gt/intel_sseu.h
index d20b7f96907d29513f62b96f96877e73a93d2a4b..9618dff46d83a77b4b4ba0d29c80d8aae6d36d00 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_sseu.h
+++ b/drivers/gpu/drm/i915/gt/intel_sseu.h
@@ -63,6 +63,12 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)
        return value;
 }
 
+static inline unsigned int
+intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice)
+{
+       return hweight8(sseu->subslice_mask[slice]);
+}
+
 u32 intel_sseu_make_rpcs(struct drm_i915_private *i915,
                         const struct intel_sseu *req_sseu);
 

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 7ab8340af991dec6066e47bd45f4e7af751a573e..293c3e3e465c488f11650bf2a3375198b0c50cfe 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4203,7 +4203,7 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info,
                   sseu_subslice_total(sseu));
        for (s = 0; s < fls(sseu->slice_mask); s++) {
                seq_printf(m, "  %s Slice%i subslices: %u\n", type,
-                          s, hweight8(sseu->subslice_mask[s]));
+                          s, intel_sseu_subslices_per_slice(sseu, s));
        }
        seq_printf(m, "  %s EU Total: %u\n", type,
                   sseu->eu_total);

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 6af480b95bc67ac55d39d51323d346f4af2fcb4f..9d6b9c45bc5ea20b1069a523445405a931b070a1 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -93,7 +93,7 @@ static void sseu_dump(const struct sseu_dev_info *sseu, struct drm_printer *p)
        drm_printf(p, "subslice total: %u\n", sseu_subslice_total(sseu));
        for (s = 0; s < sseu->max_slices; s++) {
                drm_printf(p, "slice%d: %u subslices, mask=%04x\n",
-                          s, hweight8(sseu->subslice_mask[s]),
+                          s, intel_sseu_subslices_per_slice(sseu, s),
                           sseu->subslice_mask[s]);
        }
        drm_printf(p, "EU total: %u\n", sseu->eu_total);
@@ -126,7 +126,7 @@ void intel_device_info_dump_topology(const struct sseu_dev_info *sseu,
 
        for (s = 0; s < sseu->max_slices; s++) {
                drm_printf(p, "slice%d: %u subslice(s) (0x%hhx):\n",
-                          s, hweight8(sseu->subslice_mask[s]),
+                          s, intel_sseu_subslices_per_slice(sseu, s),
                           sseu->subslice_mask[s]);
 
                for (ss = 0; ss < sseu->max_subslices; ss++) {