Mesa (staging/21.3): intel/stub: Silence "initialized field overwritten" warning

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 9c597b74937e373fbe4c495f6fd27f0280026ab5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c597b74937e373fbe4c495f6fd27f0280026ab5

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Dec  9 12:06:39 2021 -0800

intel/stub: Silence "initialized field overwritten" warning

src/intel/tools/intel_noop_drm_shim.c:459:36: warning: initialized field overwritten [-Woverride-init]
  459 |    [DRM_I915_GEM_EXECBUFFER2_WR] = i915_ioctl_noop,
      |                                    ^~~~~~~~~~~~~~~

Fixes: 0f4f1d70bfe ("intel: add stub_gpu tool")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14218>
(cherry picked from commit 2dc7c24b80147709e00cc47a2d1da1ca6058e9d2)

---

 .pick_status.json                     | 2 +-
 src/intel/tools/intel_noop_drm_shim.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 57869491358..2069841a596 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -229,7 +229,7 @@
         "description": "intel/stub: Silence \"initialized field overwritten\" warning",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0f4f1d70bfe96fc9e218ef5c2196bb677aaa251b"
     },
diff --git a/src/intel/tools/intel_noop_drm_shim.c b/src/intel/tools/intel_noop_drm_shim.c
index 3c1d7a21dbe..9e490c5ea30 100644
--- a/src/intel/tools/intel_noop_drm_shim.c
+++ b/src/intel/tools/intel_noop_drm_shim.c
@@ -344,7 +344,8 @@ static ioctl_fn_t driver_ioctls[] = {
    [DRM_I915_GEM_CONTEXT_GETPARAM] = i915_ioctl_gem_context_getparam,
    [DRM_I915_GEM_CONTEXT_SETPARAM] = i915_ioctl_noop,
    [DRM_I915_GEM_EXECBUFFER2] = i915_ioctl_noop,
-   [DRM_I915_GEM_EXECBUFFER2_WR] = i915_ioctl_noop,
+   /* [DRM_I915_GEM_EXECBUFFER2_WR] = i915_ioctl_noop,
+       same value as DRM_I915_GEM_EXECBUFFER2. */
 
    [DRM_I915_GEM_USERPTR] = i915_ioctl_gem_userptr,