]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/i915/query: fix subslice length
authorDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Fri, 9 Nov 2018 00:40:13 +0000 (16:40 -0800)
committerDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Fri, 9 Nov 2018 19:42:00 +0000 (11:42 -0800)
We dump the info as an array of u8, so we want to know the length
in number of bytes. Current code is still safe because the
variable we use BITS_PER_TYPE on is a u8.

Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181109004013.34394-1-daniele.ceraolospurio@intel.com
drivers/gpu/drm/i915/i915_query.c

index 5821002cad42e2b32a221dabe7febdc164ad6742..6fc4b8eeab428f7b10bf56ba5c07eba5789b59a7 100644 (file)
@@ -27,8 +27,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv,
 
        slice_length = sizeof(sseu->slice_mask);
        subslice_length = sseu->max_slices *
-               DIV_ROUND_UP(sseu->max_subslices,
-                            BITS_PER_TYPE(sseu->subslice_mask[0]));
+               DIV_ROUND_UP(sseu->max_subslices, BITS_PER_BYTE);
        eu_length = sseu->max_slices * sseu->max_subslices *
                DIV_ROUND_UP(sseu->max_eus_per_subslice, BITS_PER_BYTE);