diff options
| author | Rafael Antognolli <rafael.antognolli@intel.com> | 2019-08-19 12:28:55 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-07 09:20:49 -0800 |
| commit | 10a0b602b488d76a70f5792749457ee655d1e8a8 (patch) | |
| tree | 59b7c3a1508b5a1dbb31241f58f1d8ec13e2b13d | |
| parent | 4656d2d30a8c176d81f31827302cd082eff59de3 (diff) | |
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@intel.com>
Cc: Mark Janes <mark.a.janes@intel.com>
Fixes: 96e1c945f2b ("i965: Move device info initialization to common
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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) { |