| commit | 536ab3ca19ef856e84389a155c5832c68559a28a | [log] [tgz] |
|---|---|---|
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | Mon Aug 15 15:09:27 2016 +0200 |
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | Mon Aug 22 12:54:50 2016 +0200 |
| tree | a4eda2dc3412c41e222309ac849d03f25e1461fe | |
| parent | 05a76d3d6ad1ee9f9814f88949cc9305fc165460 [diff] |
drm/i915: Fix botched merge that downgrades CSR versions. Merge commit 5e580523d9128a4d8 reverts the version bumping parts of commit 4aa7fb9c3c4fa0. Bump the versions again and request the specific firmware version. The currently recommended versions are: SKL 1.26, KBL 1.01 and BXT 1.07. Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Cc: Imre Deak <imre.deak@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242 Cc: drm-intel-fixes@lists.freedesktop.org Fixes: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next") Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1471266567-22443-1-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com>