From: Imre Deak <imre.deak@intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Cc: drm-intel-fixes@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
Date: Mon, 15 Aug 2016 16:27:16 +0300 [thread overview]
Message-ID: <1471267636.15863.10.camel@intel.com> (raw)
In-Reply-To: <1471266567-22443-1-git-send-email-maarten.lankhorst@linux.intel.com>
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
next prev parent reply other threads:[~2016-08-15 13:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 13:09 [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-15 13:27 ` Imre Deak [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471267636.15863.10.camel@intel.com \
--to=imre.deak@intel.com \
--cc=drm-intel-fixes@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox