[Intel-gfx] [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.

[Maarten Lankhorst]

Op 15-08-16 om 15:27 schreef Imre Deak:
> On ma, 2016-08-15 at 15:09 +0200, Maarten Lankhorst wrote:
>> 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 at linux.intel.com>
>> Cc: Imre Deak <imre.deak at intel.com>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242
>> Cc: drm-intel-fixes at lists.freedesktop.org
>> Fixes: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
> I think it was 94558e265b ("Merge remote-tracking branch 'airlied/drm-
> next' into drm-intel-next-queued").
git checkout 5e580523d912 gets the wrong version,
git checkout c11dea5b0290 (merge parent) the right one.

~Maarten