* [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)
@ 2016-08-10 5:57 Rodrigo Vivi
2016-08-10 7:55 ` Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2016-08-10 5:57 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Daniel Vetter, stable, Rodrigo Vivi
With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
links") we started loading the firmware version directly
instead of symbolic links.
With this VERSION_REQUIRED variables changed the meaning
from minimal required to exact version required. Along
with this change we started using the latest stable
DMC firmware as the required one 1.26.
This patch is correct. However in some merge this
change got missed and it was overwritten by the old
version.
1.23 is unstable and can cause blank screens so let's
avoid it.
Cc: stable@vger.kernel.org
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Cc: Matthew Atwood <matthew.s.atwood@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_csr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index fb27d18..0efce3f 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
#define I915_CSR_SKL "i915/skl_dmc_ver1.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"
MODULE_FIRMWARE(I915_CSR_BXT);
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)
2016-08-10 5:57 [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Rodrigo Vivi
@ 2016-08-10 7:55 ` Jani Nikula
2016-08-11 15:48 ` Vivi, Rodrigo
2016-08-10 11:24 ` ✗ Ro.CI.BAT: failure for " Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2016-08-10 7:55 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter, stable, Rodrigo Vivi
On Wed, 10 Aug 2016, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> links") we started loading the firmware version directly
> instead of symbolic links.
>
> With this VERSION_REQUIRED variables changed the meaning
> from minimal required to exact version required. Along
> with this change we started using the latest stable
> DMC firmware as the required one 1.26.
>
> This patch is correct. However in some merge this
> change got missed and it was overwritten by the old
> version.
>
> 1.23 is unstable and can cause blank screens so let's
> avoid it.
>
> Cc: stable@vger.kernel.org
No. 4aa7fb9c is not in a stable released kernel. Please try 'dim fixes
4aa7fb9c'.
I guess 4aa7fb9c *not* having been released saves us from restoring 1.23
to linux-firmware. However, v4.8-rc1 will still be busted if 1.23 isn't
restored to linux-firmware.
BR,
Jani.
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_csr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index fb27d18..0efce3f 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
>
> #define I915_CSR_SKL "i915/skl_dmc_ver1.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"
> MODULE_FIRMWARE(I915_CSR_BXT);
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)
2016-08-10 7:55 ` Jani Nikula
@ 2016-08-11 15:48 ` Vivi, Rodrigo
0 siblings, 0 replies; 9+ messages in thread
From: Vivi, Rodrigo @ 2016-08-11 15:48 UTC (permalink / raw)
To: intel-gfx@lists.freedesktop.org, Nikula, Jani
Cc: daniel.vetter@ffwll.ch, stable@vger.kernel.org
On Wed, 2016-08-10 at 10:55 +0300, Jani Nikula wrote:
> On Wed, 10 Aug 2016, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> >
> > With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> > links") we started loading the firmware version directly
> > instead of symbolic links.
> >
> > With this VERSION_REQUIRED variables changed the meaning
> > from minimal required to exact version required. Along
> > with this change we started using the latest stable
> > DMC firmware as the required one 1.26.
> >
> > This patch is correct. However in some merge this
> > change got missed and it was overwritten by the old
> > version.
> >
> > 1.23 is unstable and can cause blank screens so let's
> > avoid it.
> >
> > Cc: stable@vger.kernel.org
> No. 4aa7fb9c is not in a stable released kernel. Please try 'dim
> fixes
> 4aa7fb9c'.
>
> I guess 4aa7fb9c *not* having been released saves us from restoring
> 1.23
> to linux-firmware. However, v4.8-rc1 will still be busted if 1.23
> isn't
> restored to linux-firmware.
ok, I'm restoring per maintainers request, but I'm trying to warn that
it might be busted with 1.23 in place. Without it users will only have
warning and not the ideal power consumption.
>
> BR,
> Jani.
>
>
>
> >
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> > Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_csr.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c
> > b/drivers/gpu/drm/i915/intel_csr.c
> > index fb27d18..0efce3f 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
> >
> > #define I915_CSR_SKL "i915/skl_dmc_ver1.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"
> > MODULE_FIRMWARE(I915_CSR_BXT);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Ro.CI.BAT: failure for drm/i915: Restore DMC required version for Skylake (1.26)
2016-08-10 5:57 [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Rodrigo Vivi
2016-08-10 7:55 ` Jani Nikula
@ 2016-08-10 11:24 ` Patchwork
2016-08-10 11:26 ` [PATCH] " Dave Gordon
2016-08-10 16:05 ` ✗ Ro.CI.BAT: failure for drm/i915: Restore DMC required version for Skylake (1.26) (rev2) Patchwork
3 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2016-08-10 11:24 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Restore DMC required version for Skylake (1.26)
URL : https://patchwork.freedesktop.org/series/10889/
State : failure
== Summary ==
Series 10889v1 drm/i915: Restore DMC required version for Skylake (1.26)
http://patchwork.freedesktop.org/api/1.0/series/10889/revisions/1/mbox
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> INCOMPLETE (fi-hsw-i7-4770k)
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
pass -> FAIL (ro-hsw-i7-4770r)
pass -> FAIL (ro-skl3-i5-6260u)
pass -> FAIL (ro-bdw-i5-5250u)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-bdw-i5-5250u)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (ro-byt-n2820)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (ro-bdw-i7-5600u)
skip -> DMESG-WARN (ro-bdw-i5-5250u)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (ro-bdw-i7-5600u)
Test pm_rpm:
Subgroup basic-pci-d3-state:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (fi-skl-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)
Subgroup basic-rte:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (fi-skl-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)
fi-hsw-i7-4770k total:107 pass:91 dwarn:0 dfail:0 fail:0 skip:15
fi-kbl-qkkr total:244 pass:187 dwarn:28 dfail:0 fail:3 skip:26
fi-skl-i5-6260u total:244 pass:226 dwarn:4 dfail:0 fail:0 skip:14
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:2 dfail:0 fail:1 skip:18
ro-bdw-i7-5557U total:240 pass:220 dwarn:1 dfail:0 fail:0 skip:19
ro-bdw-i7-5600u total:240 pass:207 dwarn:0 dfail:0 fail:1 skip:32
ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42
ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 skip:40
ro-hsw-i7-4770r total:240 pass:213 dwarn:0 dfail:0 fail:1 skip:26
ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 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
Results at /archive/results/CI_IGT_test/RO_Patchwork_1809/
fa68dcb drm-intel-nightly: 2016y-08m-10d-09h-40m-37s UTC integration manifest
e18e301 drm/i915: Restore DMC required version for Skylake (1.26)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)
2016-08-10 5:57 [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Rodrigo Vivi
2016-08-10 7:55 ` Jani Nikula
2016-08-10 11:24 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-08-10 11:26 ` Dave Gordon
2016-08-10 12:41 ` Imre Deak
2016-08-10 14:41 ` [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL Rodrigo Vivi
2016-08-10 16:05 ` ✗ Ro.CI.BAT: failure for drm/i915: Restore DMC required version for Skylake (1.26) (rev2) Patchwork
3 siblings, 2 replies; 9+ messages in thread
From: Dave Gordon @ 2016-08-10 11:26 UTC (permalink / raw)
To: Rodrigo Vivi, intel-gfx; +Cc: Jani Nikula, Daniel Vetter, stable
On 10/08/16 06:57, Rodrigo Vivi wrote:
> With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> links") we started loading the firmware version directly
> instead of symbolic links.
However the pathnames in the patch context below are still the symlink
names -- is this correct? Or did some merge effectively revert Patrik's
changes by accident?
> With this VERSION_REQUIRED variables changed the meaning
> from minimal required to exact version required. Along
> with this change we started using the latest stable
> DMC firmware as the required one 1.26.
>
> This patch is correct. However in some merge this
> change got missed and it was overwritten by the old
> version.
>
> 1.23 is unstable and can cause blank screens so let's
> avoid it.
>
> Cc: stable@vger.kernel.org
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_csr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index fb27d18..0efce3f 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
>
> #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
Major version only here?
> 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"
And here too.
> MODULE_FIRMWARE(I915_CSR_BXT);
.Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)
2016-08-10 11:26 ` [PATCH] " Dave Gordon
@ 2016-08-10 12:41 ` Imre Deak
2016-08-10 14:41 ` [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL Rodrigo Vivi
1 sibling, 0 replies; 9+ messages in thread
From: Imre Deak @ 2016-08-10 12:41 UTC (permalink / raw)
To: Dave Gordon, Rodrigo Vivi, intel-gfx; +Cc: Jani Nikula, Daniel Vetter, stable
On ke, 2016-08-10 at 12:26 +0100, Dave Gordon wrote:
> On 10/08/16 06:57, Rodrigo Vivi wrote:
> > With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> > links") we started loading the firmware version directly
> > instead of symbolic links.
>
> However the pathnames in the patch context below are still the
> symlink
> names -- is this correct? Or did some merge effectively revert
> Patrik's
> changes by accident?
Yes, looks like 94558e265b95 reverted partially his changes.
>
> > With this VERSION_REQUIRED variables changed the meaning
> > from minimal required to exact version required. Along
> > with this change we started using the latest stable
> > DMC firmware as the required one 1.26.
> >
> > This patch is correct. However in some merge this
> > change got missed and it was overwritten by the old
> > version.
> >
> > 1.23 is unstable and can cause blank screens so let's
> > avoid it.
> >
> > Cc: stable@vger.kernel.org
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> > Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_csr.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c
> > b/drivers/gpu/drm/i915/intel_csr.c
> > index fb27d18..0efce3f 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
> >
> > #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
>
> Major version only here?
>
> > 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"
>
> And here too.
>
> > MODULE_FIRMWARE(I915_CSR_BXT);
>
> .Dave.
>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL.
2016-08-10 11:26 ` [PATCH] " Dave Gordon
2016-08-10 12:41 ` Imre Deak
@ 2016-08-10 14:41 ` Rodrigo Vivi
2016-08-10 15:23 ` Dave Gordon
1 sibling, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2016-08-10 14:41 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Daniel Vetter, stable, Rodrigo Vivi
With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
links") we started loading the firmware version directly
instead of symbolic links.
With this VERSION_REQUIRED variables changed the meaning
from minimal required to exact version required. Along
with this change we started using the latest stable
DMC firmware as the required one 1.26.
That patch is correct. However in some merge this
change got missed and it was overwritten by the old
version.
1.23 is unstable and can cause blank screens so let's
avoid it.
v2: Also restore the file names instead keeping the
symbolic links (Dave).
Cc: stable@vger.kernel.org
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Cc: Matthew Atwood <matthew.s.atwood@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_csr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index fb27d18..1ea0e1f 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -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)
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL.
2016-08-10 14:41 ` [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL Rodrigo Vivi
@ 2016-08-10 15:23 ` Dave Gordon
0 siblings, 0 replies; 9+ messages in thread
From: Dave Gordon @ 2016-08-10 15:23 UTC (permalink / raw)
To: Rodrigo Vivi, intel-gfx; +Cc: Jani Nikula, Daniel Vetter, stable
On 10/08/16 15:41, Rodrigo Vivi wrote:
> With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> links") we started loading the firmware version directly
> instead of symbolic links.
>
> With this VERSION_REQUIRED variables changed the meaning
> from minimal required to exact version required. Along
> with this change we started using the latest stable
> DMC firmware as the required one 1.26.
>
> That patch is correct. However in some merge this
> change got missed and it was overwritten by the old
> version.
>
> 1.23 is unstable and can cause blank screens so let's
> avoid it.
>
> v2: Also restore the file names instead keeping the
> symbolic links (Dave).
>
> Cc: stable@vger.kernel.org
> Cc: Dave Gordon <david.s.gordon@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_csr.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index fb27d18..1ea0e1f 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -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"
Does this really have to have a two-digit minor number? That makes
it more difficult to autogenerate the string from the major+minor
(see Tvrtko's patch "Consolidate firmware major-minor to one place").
.Dave.
> 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)
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Ro.CI.BAT: failure for drm/i915: Restore DMC required version for Skylake (1.26) (rev2)
2016-08-10 5:57 [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Rodrigo Vivi
` (2 preceding siblings ...)
2016-08-10 11:26 ` [PATCH] " Dave Gordon
@ 2016-08-10 16:05 ` Patchwork
3 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2016-08-10 16:05 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Restore DMC required version for Skylake (1.26) (rev2)
URL : https://patchwork.freedesktop.org/series/10889/
State : failure
== Summary ==
Series 10889v2 drm/i915: Restore DMC required version for Skylake (1.26)
http://patchwork.freedesktop.org/api/1.0/series/10889/revisions/2/mbox
Test drv_module_reload_basic:
skip -> PASS (fi-skl-i5-6260u)
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (fi-hsw-i7-4770k)
fail -> PASS (ro-bdw-i7-5557U)
fail -> PASS (ro-bdw-i5-5250u)
Subgroup basic-flip-vs-cursor-varying-size:
pass -> FAIL (fi-hsw-i7-4770k)
fail -> PASS (ro-bdw-i5-5250u)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (ro-ivb-i7-3770)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
skip -> DMESG-WARN (ro-bdw-i5-5250u)
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> SKIP (ro-bdw-i7-5557U)
Subgroup suspend-read-crc-pipe-c:
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-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)
Subgroup basic-rte:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (fi-skl-i5-6260u)
fail -> PASS (fi-skl-i7-6700k)
fi-hsw-i7-4770k total:244 pass:221 dwarn:0 dfail:0 fail:1 skip:22
fi-skl-i5-6260u total:244 pass:226 dwarn:4 dfail:0 fail:0 skip:14
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:220 dwarn:2 dfail:0 fail:0 skip:18
ro-bdw-i7-5557U total:240 pass:220 dwarn:1 dfail:0 fail:0 skip:19
ro-bdw-i7-5600u total:240 pass:206 dwarn:1 dfail:0 fail:1 skip:32
ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42
ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 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:214 dwarn:0 dfail:0 fail:0 skip:26
ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 skip:60
ro-ivb-i7-3770 total:240 pass:204 dwarn:0 dfail:0 fail:1 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
Results at /archive/results/CI_IGT_test/RO_Patchwork_1822/
3aec82c drm-intel-nightly: 2016y-08m-10d-15h-08m-03s UTC integration manifest
1cf52aa drm/i915: Restore DMC file names and the proper 1.26 for SKL.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-08-11 15:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-10 5:57 [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Rodrigo Vivi
2016-08-10 7:55 ` Jani Nikula
2016-08-11 15:48 ` Vivi, Rodrigo
2016-08-10 11:24 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-08-10 11:26 ` [PATCH] " Dave Gordon
2016-08-10 12:41 ` Imre Deak
2016-08-10 14:41 ` [PATCH] drm/i915: Restore DMC file names and the proper 1.26 for SKL Rodrigo Vivi
2016-08-10 15:23 ` Dave Gordon
2016-08-10 16:05 ` ✗ Ro.CI.BAT: failure for drm/i915: Restore DMC required version for Skylake (1.26) (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox