drm/i915: make array hw_engine_mask static, makes object smaller

Don't populate the array hw_engine_mask on the stack but instead make it
static. Makes the object code smaller by 316 bytes.

Before:
   text	   data	    bss	    dec	    hex	filename
  34004	   4388	    320	  38712	   9738	gpu/drm/i915/gt/intel_reset.o

After:
   text	   data	    bss	    dec	    hex	filename
  33528	   4548	    320	  38396	   95fc	gpu/drm/i915/gt/intel_reset.o

(gcc version 9.2.1, amd64)

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191007154151.23245-1-colin.king@canonical.com

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 7b3d9d4517a03c017943ecb948bae2e97e9ee58b..ae8f9cef6b132828f461d7a75378031297d37b25 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -282,14 +282,14 @@ static int gen6_reset_engines(struct intel_gt *gt,
                              intel_engine_mask_t engine_mask,
                              unsigned int retry)
 {
-       struct intel_engine_cs *engine;
-       const u32 hw_engine_mask[] = {
+       static const u32 hw_engine_mask[] = {
                [RCS0]  = GEN6_GRDOM_RENDER,
                [BCS0]  = GEN6_GRDOM_BLT,
                [VCS0]  = GEN6_GRDOM_MEDIA,
                [VCS1]  = GEN8_GRDOM_MEDIA2,
                [VECS0] = GEN6_GRDOM_VECS,
        };
+       struct intel_engine_cs *engine;
        u32 hw_mask;
 
        if (engine_mask == ALL_ENGINES) {
@@ -413,7 +413,7 @@ static int gen11_reset_engines(struct intel_gt *gt,
                               intel_engine_mask_t engine_mask,
                               unsigned int retry)
 {
-       const u32 hw_engine_mask[] = {
+       static const u32 hw_engine_mask[] = {
                [RCS0]  = GEN11_GRDOM_RENDER,
                [BCS0]  = GEN11_GRDOM_BLT,
                [VCS0]  = GEN11_GRDOM_MEDIA,