diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-08-15 15:09:27 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-08-22 16:08:32 +0300 |
| commit | 177d91aaea4bcafb29232336bafaa521b85286aa (patch) | |
| tree | c7f6fc52b0adb7c271b29e6692bbe127e59716e6 /drivers/gpu/drm/vc4/vc4_drv.c | |
| parent | 762c60ab0257d25eea8db3e3fec85ed53b5330fe (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>
(cherry picked from commit 536ab3ca19ef856e84389a155c5832c68559a28a)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_drv.c')
0 files changed, 0 insertions, 0 deletions