]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix botched merge that downgrades CSR versions.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 15 Aug 2016 13:09:27 +0000 (15:09 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 22 Aug 2016 10:54:50 +0000 (12:54 +0200)
commit48015f5aaab45340d8f6dbd49c906542a51626ce
treea4eda2dc3412c41e222309ac849d03f25e1461fe
parente1c76521c9010e25d121cd2b80d1459d4bf31645
drm/i915: Fix botched merge that downgrades CSR versions.

Merge commit 6ddb2cdee43fa2b79 reverts the version bumping parts of
commit 557f1175aab808. 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: 6ddb2cdee43f ("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>
drivers/gpu/drm/i915/intel_csr.c