* [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
@ 2016-08-15 13:09 Maarten Lankhorst
2016-08-15 13:27 ` Imre Deak
2016-08-15 14:02 ` ✗ Ro.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2016-08-15 13:09 UTC (permalink / raw)
To: intel-gfx; +Cc: drm-intel-fixes
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@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: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.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 fb27d187876c..1ea0e1f43397 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.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-15 13:09 [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
@ 2016-08-15 13:27 ` Imre Deak
2016-08-15 13:46 ` Maarten Lankhorst
2016-08-15 14:02 ` ✗ Ro.CI.BAT: failure for " Patchwork
1 sibling, 1 reply; 7+ messages in thread
From: Imre Deak @ 2016-08-15 13:27 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx; +Cc: drm-intel-fixes
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@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: 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").
> 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@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: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
We may want to backport the SKL version bump part, so I'd have a
separate commit for that. Either way:
Reviewed-by: Imre Deak <imre.deak@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 fb27d187876c..1ea0e1f43397 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)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-15 13:27 ` Imre Deak
@ 2016-08-15 13:46 ` Maarten Lankhorst
2016-08-15 13:55 ` Imre Deak
0 siblings, 1 reply; 7+ messages in thread
From: Maarten Lankhorst @ 2016-08-15 13:46 UTC (permalink / raw)
To: imre.deak, intel-gfx; +Cc: drm-intel-fixes
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@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: 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-15 13:46 ` Maarten Lankhorst
@ 2016-08-15 13:55 ` Imre Deak
0 siblings, 0 replies; 7+ messages in thread
From: Imre Deak @ 2016-08-15 13:55 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx; +Cc: drm-intel-fixes
On ma, 2016-08-15 at 15:46 +0200, Maarten Lankhorst wrote:
> 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@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: 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.
Ah you are right, 5e580523d912 was already wrong.
--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ Ro.CI.BAT: failure for drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-15 13:09 [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-15 13:27 ` Imre Deak
@ 2016-08-15 14:02 ` Patchwork
1 sibling, 0 replies; 7+ messages in thread
From: Patchwork @ 2016-08-15 14:02 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] drm/i915/backlight: handle enabled but zero duty cycle at module load
@ 2016-08-23 8:10 Maarten Lankhorst
2016-08-23 8:10 ` [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
0 siblings, 1 reply; 7+ messages in thread
From: Maarten Lankhorst @ 2016-08-23 8:10 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
From: Jani Nikula <jani.nikula@intel.com>
Don't consider enabled but zero duty cycle backlight disabled. Clamp
level between min and max for sanity.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_panel.c | 40 +++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 96c65d77e886..c10e9b0405e8 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1430,10 +1430,11 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus
panel->backlight.min = get_backlight_min_vbt(connector);
val = lpt_get_backlight(connector);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
- panel->backlight.enabled = (pch_ctl1 & BLM_PCH_PWM_ENABLE) &&
- panel->backlight.level != 0;
+ panel->backlight.enabled = pch_ctl1 & BLM_PCH_PWM_ENABLE;
return 0;
}
@@ -1459,11 +1460,13 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus
panel->backlight.min = get_backlight_min_vbt(connector);
val = pch_get_backlight(connector);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
cpu_ctl2 = I915_READ(BLC_PWM_CPU_CTL2);
panel->backlight.enabled = (cpu_ctl2 & BLM_PWM_ENABLE) &&
- (pch_ctl1 & BLM_PCH_PWM_ENABLE) && panel->backlight.level != 0;
+ (pch_ctl1 & BLM_PCH_PWM_ENABLE);
return 0;
}
@@ -1498,9 +1501,11 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unu
panel->backlight.min = get_backlight_min_vbt(connector);
val = i9xx_get_backlight(connector);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
- panel->backlight.enabled = panel->backlight.level != 0;
+ panel->backlight.enabled = val != 0;
return 0;
}
@@ -1530,10 +1535,11 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unu
panel->backlight.min = get_backlight_min_vbt(connector);
val = i9xx_get_backlight(connector);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
- panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
- panel->backlight.level != 0;
+ panel->backlight.enabled = ctl2 & BLM_PWM_ENABLE;
return 0;
}
@@ -1562,10 +1568,11 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
panel->backlight.min = get_backlight_min_vbt(connector);
val = _vlv_get_backlight(dev_priv, pipe);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
- panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
- panel->backlight.level != 0;
+ panel->backlight.enabled = ctl2 & BLM_PWM_ENABLE;
return 0;
}
@@ -1607,10 +1614,11 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
return -ENODEV;
val = bxt_get_backlight(connector);
- panel->backlight.level = intel_panel_compute_brightness(connector, val);
+ val = intel_panel_compute_brightness(connector, val);
+ panel->backlight.level = clamp(val, panel->backlight.min,
+ panel->backlight.max);
- panel->backlight.enabled = (pwm_ctl & BXT_BLC_PWM_ENABLE) &&
- panel->backlight.level != 0;
+ panel->backlight.enabled = pwm_ctl & BXT_BLC_PWM_ENABLE;
return 0;
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-23 8:10 [PATCH 1/2] drm/i915/backlight: handle enabled but zero duty cycle at module load Maarten Lankhorst
@ 2016-08-23 8:10 ` Maarten Lankhorst
2016-08-25 11:29 ` Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Maarten Lankhorst @ 2016-08-23 8:10 UTC (permalink / raw)
To: intel-gfx; +Cc: drm-intel-fixes
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@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: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.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 fb27d187876c..1ea0e1f43397 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.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
2016-08-23 8:10 ` [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
@ 2016-08-25 11:29 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2016-08-25 11:29 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx; +Cc: drm-intel-fixes
On Tue, 23 Aug 2016, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> 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@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: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This is already in dinq as 536ab3ca19ef ("drm/i915: Fix botched merge
that downgrades CSR versions."), and cherry-picked to fixes as
177d91aaea4b ("drm/i915: Fix botched merge that downgrades CSR
versions."). It's also in my today's pull request to Dave.
BR,
Jani.
> ---
> 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 fb27d187876c..1ea0e1f43397 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)
--
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] 7+ messages in thread
end of thread, other threads:[~2016-08-25 11:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-15 13:09 [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-15 13:27 ` Imre Deak
2016-08-15 13:46 ` Maarten Lankhorst
2016-08-15 13:55 ` Imre Deak
2016-08-15 14:02 ` ✗ Ro.CI.BAT: failure for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-08-23 8:10 [PATCH 1/2] drm/i915/backlight: handle enabled but zero duty cycle at module load Maarten Lankhorst
2016-08-23 8:10 ` [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-25 11:29 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox