Merge drm/drm-next into drm-intel-next-queued

[linux-block.git] / drivers / gpu / drm / i915 / i915_query.c

diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
index e75c528ebbe006f5a2712721666222a319e7a108..c1ebda9b5627b2695df6b94e2b0809b802d30021 100644 (file)
--- a/drivers/gpu/drm/i915/i915_query.c
+++ b/drivers/gpu/drm/i915/i915_query.c
@@ -109,8 +109,7 @@ query_engine_info(struct drm_i915_private *i915,
        for_each_uabi_engine(engine, i915)
                num_uabi_engines++;
 
-       len = sizeof(struct drm_i915_query_engine_info) +
-             num_uabi_engines * sizeof(struct drm_i915_engine_info);
+       len = struct_size(query_ptr, engines, num_uabi_engines);
 
        ret = copy_query_item(&query, sizeof(query), len, query_item);
        if (ret != 0)