* [PATCH 0/1] Icelake DMC v1.07
@ 2018-08-14 4:45 Anusha Srivatsa
2018-08-14 4:45 ` [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake Anusha Srivatsa
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Anusha Srivatsa @ 2018-08-14 4:45 UTC (permalink / raw)
To: intel-gfx
Adding The pull request in the Cover leteer:
The following changes since commit fdd34681195afa70a63a9a6cf352513cf3b53896:
linux-firmware: add firmware for mt76x0 (2018-08-14 10:35:03 -0400)
are available in the git repository at:
git://anongit.freedesktop.org/git/drm/drm-firmware.git/ master
for you to fetch changes up to d79b57351cda7cb91e79c61175f53946937f0bcd:
Merge remote-tracking branch 'official/master' (2018-08-13 21:25:53 -0500)
----------------------------------------------------------------
Anusha Srivatsa (9):
Merge remote-tracking branch 'official/master' into drm-firmware
linux-firmware: Add GuC v11.98 for geminilake
linux-firmware: Add HuC v3.00.2225 for geminilake
Merge remote-tracking branch 'official/master'
Merge remote-tracking branch 'official/master'
firmware/icl/dmc: Add DMC v1.05 for Icelake.
Merge remote-tracking branch 'official/master'
firmware/icl/dmc: Add DMC v1.07 for Icelake.
Merge remote-tracking branch 'official/master'
WHENCE | 12 ++++++++++++
i915/glk_guc_ver11_98.bin | Bin 0 -> 154240 bytes
i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
i915/icl_dmc_ver1_05.bin | Bin 0 -> 25836 bytes
i915/icl_dmc_ver1_07.bin | Bin 0 -> 25716 bytes
5 files changed, 12 insertions(+)
create mode 100644 i915/glk_guc_ver11_98.bin
create mode 100644 i915/glk_huc_ver03_00_2225.bin
create mode 100644 i915/icl_dmc_ver1_05.bin
create mode 100644 i915/icl_dmc_ver1_07.bin
Anusha Srivatsa (1):
firmware/dmc/icl: load v1.07 on icelake.
drivers/gpu/drm/i915/i915_pci.c | 2 +-
drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
3 files changed, 11 insertions(+), 1 deletion(-)
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake.
2018-08-14 4:45 [PATCH 0/1] Icelake DMC v1.07 Anusha Srivatsa
@ 2018-08-14 4:45 ` Anusha Srivatsa
2018-08-15 11:34 ` Imre Deak
2018-08-14 21:15 ` ✓ Fi.CI.BAT: success for Icelake DMC v1.07 Patchwork
2018-08-15 6:12 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Anusha Srivatsa @ 2018-08-14 4:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni, Rodrigo Vivi
Add Support to load DMC on Icelake.
While at it, also add support to load the firmware
during system resume.
v2: load firmware during system resume.(Imre)
v3: enable has_csr for icelake.(Jyoti)
Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/i915_pci.c | 2 +-
drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index e931b48369dd..bbd331f1d5d9 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -600,7 +600,7 @@ static const struct intel_device_info intel_cannonlake_info = {
GEN10_FEATURES, \
GEN(11), \
.ddb_size = 2048, \
- .has_csr = 0, \
+ .has_csr = 1, \
.has_logical_ring_elsq = 1
static const struct intel_device_info intel_icelake_11_info = {
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index cf9b600cca79..393d419afb91 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,9 @@
* low-power state and comes back to normal.
*/
+#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
+#define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
+
#define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
MODULE_FIRMWARE(I915_CSR_GLK);
#define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4)
@@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
if (csr->fw_path == i915_modparams.dmc_firmware_path) {
/* Bypass version check for firmware override. */
required_version = csr->version;
+ } else if (IS_ICELAKE(dev_priv)) {
+ required_version = ICL_CSR_VERSION_REQUIRED;
} else if (IS_CANNONLAKE(dev_priv)) {
required_version = CNL_CSR_VERSION_REQUIRED;
} else if (IS_GEMINILAKE(dev_priv)) {
@@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
if (i915_modparams.dmc_firmware_path)
csr->fw_path = i915_modparams.dmc_firmware_path;
+ else if (IS_ICELAKE(dev_priv))
+ csr->fw_path = I915_CSR_ICL;
else if (IS_CANNONLAKE(dev_priv))
csr->fw_path = I915_CSR_CNL;
else if (IS_GEMINILAKE(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index e209edbc561d..7686f4d32533 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3588,6 +3588,9 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,
/* 7. Setup MBUS. */
icl_mbus_init(dev_priv);
+
+ if (resume && dev_priv->csr.dmc_payload)
+ intel_csr_load_program(dev_priv);
}
static void icl_display_core_uninit(struct drm_i915_private *dev_priv)
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for Icelake DMC v1.07
2018-08-14 4:45 [PATCH 0/1] Icelake DMC v1.07 Anusha Srivatsa
2018-08-14 4:45 ` [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake Anusha Srivatsa
@ 2018-08-14 21:15 ` Patchwork
2018-08-15 6:12 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-08-14 21:15 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: Icelake DMC v1.07
URL : https://patchwork.freedesktop.org/series/48218/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4668 -> Patchwork_9946 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/48218/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9946 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_coherency:
fi-gdg-551: PASS -> DMESG-FAIL (fdo#107164)
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: PASS -> DMESG-FAIL (fdo#106947, fdo#106560)
igt@drv_selftest@live_workarounds:
fi-skl-6700k2: PASS -> DMESG-FAIL (fdo#107292)
igt@kms_frontbuffer_tracking@basic:
{fi-byt-clapper}: PASS -> FAIL (fdo#103167)
==== Possible fixes ====
igt@drv_module_reload@basic-reload-inject:
fi-hsw-4770r: DMESG-WARN (fdo#107425) -> PASS
igt@drv_selftest@live_workarounds:
{fi-cfl-8109u}: DMESG-FAIL (fdo#107292) -> PASS
fi-skl-6700hq: DMESG-FAIL (fdo#107292) -> PASS
fi-kbl-7560u: DMESG-FAIL (fdo#107292) -> PASS
{igt@kms_psr@primary_mmap_gtt}:
fi-cnl-psr: DMESG-WARN (fdo#107372) -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
fdo#107425 https://bugs.freedesktop.org/show_bug.cgi?id=107425
== Participating hosts (54 -> 47) ==
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-glk-j4005 fi-icl-u
== Build changes ==
* Linux: CI_DRM_4668 -> Patchwork_9946
CI_DRM_4668: 8bae517a4dd2ab6ba57b880835fd253e169779f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4596: d8e78990aa2bbb45574e31b3d7a3e1c40baaa372 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9946: 0ace8c3539260f155828970dd7836ad665e41ffb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0ace8c353926 firmware/dmc/icl: load v1.07 on icelake.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9946/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for Icelake DMC v1.07
2018-08-14 4:45 [PATCH 0/1] Icelake DMC v1.07 Anusha Srivatsa
2018-08-14 4:45 ` [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake Anusha Srivatsa
2018-08-14 21:15 ` ✓ Fi.CI.BAT: success for Icelake DMC v1.07 Patchwork
@ 2018-08-15 6:12 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-08-15 6:12 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: Icelake DMC v1.07
URL : https://patchwork.freedesktop.org/series/48218/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4668_full -> Patchwork_9946_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9946_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9946_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9946_full:
=== IGT changes ===
==== Warnings ====
igt@kms_vblank@pipe-a-wait-idle-hang:
shard-snb: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_9946_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-render:
shard-glk: PASS -> FAIL (fdo#103167)
==== Possible fixes ====
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4668 -> Patchwork_9946
CI_DRM_4668: 8bae517a4dd2ab6ba57b880835fd253e169779f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4596: d8e78990aa2bbb45574e31b3d7a3e1c40baaa372 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9946: 0ace8c3539260f155828970dd7836ad665e41ffb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9946/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake.
2018-08-14 4:45 ` [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake Anusha Srivatsa
@ 2018-08-15 11:34 ` Imre Deak
2018-08-15 18:13 ` Srivatsa, Anusha
0 siblings, 1 reply; 6+ messages in thread
From: Imre Deak @ 2018-08-15 11:34 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, Paulo Zanoni, Rodrigo Vivi
On Mon, Aug 13, 2018 at 11:45:32PM -0500, Anusha Srivatsa wrote:
> Add Support to load DMC on Icelake.
>
> While at it, also add support to load the firmware
> during system resume.
>
> v2: load firmware during system resume.(Imre)
>
> v3: enable has_csr for icelake.(Jyoti)
>
> Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/i915_pci.c | 2 +-
> drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
> drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index e931b48369dd..bbd331f1d5d9 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -600,7 +600,7 @@ static const struct intel_device_info intel_cannonlake_info = {
> GEN10_FEATURES, \
> GEN(11), \
> .ddb_size = 2048, \
> - .has_csr = 0, \
> + .has_csr = 1, \
The default is correct already, so it's enough not to reinit this field.
Also could you send this one change separately after the following patch
is merged:
https://patchwork.freedesktop.org/patch/244656/
That way we could see if not specifying the firmware doesn't break
things. (This scenario is valid for a new platform.)
Thanks,
Imre
> .has_logical_ring_elsq = 1
>
> static const struct intel_device_info intel_icelake_11_info = {
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index cf9b600cca79..393d419afb91 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -34,6 +34,9 @@
> * low-power state and comes back to normal.
> */
>
> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
> +#define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
> +
> #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
> MODULE_FIRMWARE(I915_CSR_GLK);
> #define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4)
> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
> if (csr->fw_path == i915_modparams.dmc_firmware_path) {
> /* Bypass version check for firmware override. */
> required_version = csr->version;
> + } else if (IS_ICELAKE(dev_priv)) {
> + required_version = ICL_CSR_VERSION_REQUIRED;
> } else if (IS_CANNONLAKE(dev_priv)) {
> required_version = CNL_CSR_VERSION_REQUIRED;
> } else if (IS_GEMINILAKE(dev_priv)) {
> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
>
> if (i915_modparams.dmc_firmware_path)
> csr->fw_path = i915_modparams.dmc_firmware_path;
> + else if (IS_ICELAKE(dev_priv))
> + csr->fw_path = I915_CSR_ICL;
> else if (IS_CANNONLAKE(dev_priv))
> csr->fw_path = I915_CSR_CNL;
> else if (IS_GEMINILAKE(dev_priv))
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index e209edbc561d..7686f4d32533 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -3588,6 +3588,9 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,
>
> /* 7. Setup MBUS. */
> icl_mbus_init(dev_priv);
> +
> + if (resume && dev_priv->csr.dmc_payload)
> + intel_csr_load_program(dev_priv);
> }
>
> static void icl_display_core_uninit(struct drm_i915_private *dev_priv)
> --
> 2.14.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake.
2018-08-15 11:34 ` Imre Deak
@ 2018-08-15 18:13 ` Srivatsa, Anusha
0 siblings, 0 replies; 6+ messages in thread
From: Srivatsa, Anusha @ 2018-08-15 18:13 UTC (permalink / raw)
To: Deak, Imre; +Cc: intel-gfx, Zanoni, Paulo R, Vivi, Rodrigo
>-----Original Message-----
>From: Deak, Imre
>Sent: Wednesday, August 15, 2018 4:35 AM
>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; Yadav, Jyoti R <jyoti.r.yadav@intel.com>;
>Vivi, Rodrigo <rodrigo.vivi@intel.com>; Zanoni, Paulo R
><paulo.r.zanoni@intel.com>
>Subject: Re: [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake.
>
>On Mon, Aug 13, 2018 at 11:45:32PM -0500, Anusha Srivatsa wrote:
>> Add Support to load DMC on Icelake.
>>
>> While at it, also add support to load the firmware during system
>> resume.
>>
>> v2: load firmware during system resume.(Imre)
>>
>> v3: enable has_csr for icelake.(Jyoti)
>>
>> Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
>> Cc: Imre Deak <imre.deak@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_pci.c | 2 +-
>> drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
>> drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>> 3 files changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c
>> b/drivers/gpu/drm/i915/i915_pci.c index e931b48369dd..bbd331f1d5d9
>> 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -600,7 +600,7 @@ static const struct intel_device_info
>intel_cannonlake_info = {
>> GEN10_FEATURES, \
>> GEN(11), \
>> .ddb_size = 2048, \
>> - .has_csr = 0, \
>> + .has_csr = 1, \
>
>The default is correct already, so it's enough not to reinit this field.
>Also could you send this one change separately after the following patch is
>merged:
>https://patchwork.freedesktop.org/patch/244656/
>
>That way we could see if not specifying the firmware doesn't break things. (This
>scenario is valid for a new platform.)
>
Sure. Thanks Imre.
Anusha
>Thanks,
>Imre
>
>> .has_logical_ring_elsq = 1
>>
>> static const struct intel_device_info intel_icelake_11_info = { diff
>> --git a/drivers/gpu/drm/i915/intel_csr.c
>> b/drivers/gpu/drm/i915/intel_csr.c
>> index cf9b600cca79..393d419afb91 100644
>> --- a/drivers/gpu/drm/i915/intel_csr.c
>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>> @@ -34,6 +34,9 @@
>> * low-power state and comes back to normal.
>> */
>>
>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>> +#define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
>> +
>> #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>> MODULE_FIRMWARE(I915_CSR_GLK);
>> #define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4)
>> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private
>*dev_priv,
>> if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>> /* Bypass version check for firmware override. */
>> required_version = csr->version;
>> + } else if (IS_ICELAKE(dev_priv)) {
>> + required_version = ICL_CSR_VERSION_REQUIRED;
>> } else if (IS_CANNONLAKE(dev_priv)) {
>> required_version = CNL_CSR_VERSION_REQUIRED;
>> } else if (IS_GEMINILAKE(dev_priv)) { @@ -458,6 +463,8 @@ void
>> intel_csr_ucode_init(struct drm_i915_private *dev_priv)
>>
>> if (i915_modparams.dmc_firmware_path)
>> csr->fw_path = i915_modparams.dmc_firmware_path;
>> + else if (IS_ICELAKE(dev_priv))
>> + csr->fw_path = I915_CSR_ICL;
>> else if (IS_CANNONLAKE(dev_priv))
>> csr->fw_path = I915_CSR_CNL;
>> else if (IS_GEMINILAKE(dev_priv))
>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>> index e209edbc561d..7686f4d32533 100644
>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>> @@ -3588,6 +3588,9 @@ static void icl_display_core_init(struct
>> drm_i915_private *dev_priv,
>>
>> /* 7. Setup MBUS. */
>> icl_mbus_init(dev_priv);
>> +
>> + if (resume && dev_priv->csr.dmc_payload)
>> + intel_csr_load_program(dev_priv);
>> }
>>
>> static void icl_display_core_uninit(struct drm_i915_private
>> *dev_priv)
>> --
>> 2.14.1
>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-15 18:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-14 4:45 [PATCH 0/1] Icelake DMC v1.07 Anusha Srivatsa
2018-08-14 4:45 ` [PATCH 1/1] firmware/dmc/icl: load v1.07 on icelake Anusha Srivatsa
2018-08-15 11:34 ` Imre Deak
2018-08-15 18:13 ` Srivatsa, Anusha
2018-08-14 21:15 ` ✓ Fi.CI.BAT: success for Icelake DMC v1.07 Patchwork
2018-08-15 6:12 ` ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.