Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 536ab3ca authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Fix botched merge that downgrades CSR versions. 

Merge commit 5e580523 reverts the version bumping parts of
commit 4aa7fb9c. 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: 5e580523 ("Backmerge tag 'v4.7' into drm-next")
Signed-off-by: default avatarMaarten 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: default avatarImre Deak <imre.deak@intel.com>
parent 05a76d3d

drivers/gpu/drm/i915/intel_csr.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -34,15 +34,15 @@ 
 * low-power state and comes back to normal.

 * low-power state and comes back to normal.

 */

 */





#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"

#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"

MODULE_FIRMWARE(I915_CSR_KBL);

MODULE_FIRMWARE(I915_CSR_KBL);

#define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)

#define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)





#define I915_CSR_SKL "i915/skl_dmc_ver1.bin"

#define I915_CSR_SKL "i915/skl_dmc_ver1_26.bin"

MODULE_FIRMWARE(I915_CSR_SKL);

MODULE_FIRMWARE(I915_CSR_SKL);

#define SKL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 23)

#define SKL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 26)





#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"

#define I915_CSR_BXT "i915/bxt_dmc_ver1_07.bin"

MODULE_FIRMWARE(I915_CSR_BXT);

MODULE_FIRMWARE(I915_CSR_BXT);

#define BXT_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)

#define BXT_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)