drm/i915: Fix botched merge that downgrades CSR versions.
Subsystems (2)
PATCH 1/1 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 <[email protected]>
Cc: Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242
--- drivers/gpu/drm/i915/intel_csr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +4 -4
@@ -34,15 +34,15 @@* 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 );#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 ); -#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 );#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Maarten Lankhorst
Merge commit
5e580523d9128a4d8reverts the version bumping parts of commit4aa7fb9c3c4fa0. 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 <[email protected]>
Cc: Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242Fixes 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").
Quoted 4 lines
Merge commit
5e580523d9128a4d8reverts the version bumping parts of commit4aa7fb9c3c4fa0. Bump the versions again and request the specific firmware version.
Quoted 8 lines
The currently recommended versions are: SKL 1.26, KBL 1.01 and BXT 1.07.
Cc: Patrik Jakobsson <[email protected]>
Cc: Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242Fixes 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")Signed-off-by Maarten Lankhorst <[email protected]>
We may want to backport the SKL version bump part, so I'd have a separate commit for that. Either way:
Quoted 25 lines
---
drivers/gpu/drm/i915/intel_csr.c | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_csr.c +0
-0@@ -34,15 +34,15 @@* low-power state and comes back to normal. */ drivers/gpu/drm/i915/intel_csr.c +1
-1-#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" +#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"MODULE_FIRMWARE(I915_CSR_KBL);
#defineKBL_CSR_VERSION_REQUIREDCSR_VERSION(1, 1)drivers/gpu/drm/i915/intel_csr.c +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);
drivers/gpu/drm/i915/intel_csr.c +1
-1-#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 26)drivers/gpu/drm/i915/intel_csr.c +1
-1-#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +#define I915_CSR_BXT "i915/bxt_dmc_ver1_07.bin"
Quoted 3 lines
MODULE_FIRMWARE(I915_CSR_BXT);
#defineBXT_CSR_VERSION_REQUIREDCSR_VERSION(1, 7)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 15-08-16 om 15:27 schreef Imre Deak:
Quoted 7 lines · Maarten Lankhorst
Quoted 6 lines
Merge commit
5e580523d9128a4d8reverts the version bumping parts of commit4aa7fb9c3c4fa0. 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.
Quoted 7 lines
Quoted 5 lines
Cc: Patrik Jakobsson <[email protected]>
Cc: Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242Fixes 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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Maarten Lankhorst
Op 15-08-16 om 15:27 schreef Imre Deak:
Quoted 15 lines · Maarten Lankhorst
Quoted 14 lines
Merge commit
5e580523d9128a4d8reverts the version bumping parts of
commit4aa7fb9c3c4fa0. 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 <[email protected]>
Cc: Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242Fixes 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
Quoted 5 lines
Quoted 3 lines
I think it was
94558e265b("Merge remote-tracking branch 'airlied/drm-
next' into drm-intel-next-queued").git checkout
5e580523d912gets the wrong version, git checkoutc11dea5b0290(merge parent) the right one.
Ah you are right, 5e580523d912 was already wrong.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: Fix botched merge that downgrades CSR versions.
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Fix botched merge that downgrades CSR versions.
URL : https://patchwork.freedesktop.org/series/11108/
State : failure
== Summary ==
Series 11108v1 drm/i915: Fix botched merge that downgrades CSR versions.
http://patchwork.freedesktop.org/api/1.0/series/11108/revisions/1/mbox
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-varying-size:
fail -> PASS (ro-ilk1-i5-650)
Subgroup basic-flip-vs-cursor-legacy:
pass -> FAIL (fi-hsw-i7-4770k)
fail -> PASS (ro-bdw-i5-5250u)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (fi-hsw-i7-4770k)
pass -> FAIL (ro-bdw-i5-5250u)
pass -> FAIL (ro-skl3-i5-6260u)
Test kms_frontbuffer_tracking:
Subgroup basic:
dmesg-fail -> PASS (ro-byt-n2820)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (fi-hsw-i7-4770k)
dmesg-warn -> SKIP (ro-bdw-i5-5250u)
pass -> DMESG-WARN (ro-bdw-i7-5600u)
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (ro-bdw-i7-5600u)
Test pm_rpm:
Subgroup basic-pci-d3-state:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)
Subgroup basic-rte:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)fi-hsw-i7-4770k total:201 pass:179 dwarn:0 dfail:0 fail:1 skip:20 fi-kbl-qkkr total:244 pass:185 dwarn:30 dfail:0 fail:2 skip:27 fi-skl-i7-6700k total:244 pass:210 dwarn:4 dfail:2 fail:0 skip:28 fi-snb-i7-2600 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 ro-bdw-i5-5250u total:240 pass:219 dwarn:1 dfail:0 fail:1 skip:19 ro-bdw-i7-5600u total:240 pass:205 dwarn:2 dfail:0 fail:1 skip:32 ro-byt-n2820 total:240 pass:198 dwarn:0 dfail:0 fail:2 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:185 dwarn:0 dfail:0 fail:0 skip:55 ro-ilk1-i5-650 total:235 pass:174 dwarn:0 dfail:0 fail:1 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:224 dwarn:0 dfail:0 fail:2 skip:14
ro-bsw-n3050 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1873/
79cf2f7 drm-intel-nightly: 2016y-08m-15d-13h-03m-14s UTC integration manifest e40093c drm/i915: Fix botched merge that downgrades CSR versions.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx