Mesa (staging/19.3): intel: Load the driver even if I915_PARAM_REVISION is not found.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: 10a0b602b488d76a70f5792749457ee655d1e8a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=10a0b602b488d76a70f5792749457ee655d1e8a8

Author: Rafael Antognolli <rafael.antognolli at intel.com>
Date:   Mon Aug 19 12:28:55 2019 -0700

intel: Load the driver even if I915_PARAM_REVISION is not found.

This param is only available starting on kernel 4.1. Use a default
value of 0 if it is not found instead.

v2: Update commit message (Lionel)

Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: Mark Janes <mark.a.janes at intel.com>
Fixes: 96e1c945f2b ("i965: Move device info initialization to common
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3727>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3727>
(cherry picked from commit 4aa7af9e9a4c19e10afaf4a3c756e62cf4d352c3)

---

 .pick_status.json               | 2 +-
 src/intel/dev/gen_device_info.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index af4f23fb12f..19484bb9de3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -292,7 +292,7 @@
         "description": "intel: Load the driver even if I915_PARAM_REVISION is not found.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "96e1c945f2bc4047a603753ae10fc4f27754361c"
     },
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index db9381611a6..de16db7aa70 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -1421,7 +1421,7 @@ gen_get_device_info_from_fd(int fd, struct gen_device_info *devinfo)
       return false;
 
    if (!getparam(fd, I915_PARAM_REVISION, &devinfo->revision))
-       return false;
+      devinfo->revision = 0;
 
    if (!query_topology(devinfo, fd)) {
       if (devinfo->gen >= 10) {