drm/i915/kbl: Introduce the first official DMC for Kabylake.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/kbl: Introduce the first official DMC for Kabylake.
Version 1.01.
This firmware is made for Kabylake platform so it doesn't need the stepping workaround that we had before.
v2: Rebased on top of latest nightly with min version
required change.
--- drivers/gpu/drm/i915/intel_csr.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +19 -11
@@ -41,16 +41,22 @@* be moved to FW_FAILED. */ +#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_KBL ); +#define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_SKL ); +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_BXT ); +#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)#define FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" -MODULE_FIRMWARE (I915_CSR_SKL ); -MODULE_FIRMWARE (I915_CSR_BXT ); -#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) -#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) +#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF
@@ -169,12 +175,10 @@ struct stepping_info {char substepping; }; -/* -* Kabylake derivated from Skylake H0, so SKL H0 -* is the right firmware for KBL A0 (revid 0). -*/ static const struct stepping_info kbl_stepping_info[] = { - {'H' ,'0' }, {'I' ,'0' } + {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, + {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, + {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, };static const struct stepping_info skl_stepping_info[] = {
@@ -298,7 +302,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, csr->version = css_header->version; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_KABYLAKE (dev_priv)) { + required_min_version =KBL_CSR_VERSION_REQUIRED ; + }else if (IS_SKYLAKE (dev_priv)) { required_min_version =SKL_CSR_VERSION_REQUIRED ; }else if (IS_BROXTON (dev_priv)) { required_min_version =BXT_CSR_VERSION_REQUIRED ;
@@ -446,7 +452,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)if (!HAS_CSR (dev_priv))return ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv)) + csr->fw_path =I915_CSR_KBL ; +else if (IS_SKYLAKE (dev_priv)) csr->fw_path =I915_CSR_SKL ;else if (IS_BROXTON (dev_priv)) csr->fw_path =I915_CSR_BXT ;
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Rodrigo Vivi
Version 1.01.
This firmware is made for Kabylake platform so it doesn't need the stepping workaround that we had before.
v2: Rebased on top of latest nightly with min version
required change.Cc Christophe Prigent <[email protected]>Cc Patrik Jakobsson <[email protected]>Reviewed-by Ben Widawsky <[email protected]> (v1)Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_csr.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_csr.c +0
-0
drivers/gpu/drm/i915/intel_csr.c line 46
Quoted 6 lines
drivers/gpu/drm/i915/intel_csr.c +3
-0@@ -41,16 +41,22 @@* be moved to FW_FAILED. */ +#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_KBL ); +#define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23)
Shouldn't this be CSR_VERSION(1,1) now that you've released the KBL DMC firmware?
Quoted 59 lines
drivers/gpu/drm/i915/intel_csr.c +16
-12+#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_SKL ); +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_BXT ); +#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)#define FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" -MODULE_FIRMWARE (I915_CSR_SKL ); -MODULE_FIRMWARE (I915_CSR_BXT ); -#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) -#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) +#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF@@ -169,12 +175,10 @@ struct stepping_info {char substepping; }; -/* -* Kabylake derivated from Skylake H0, so SKL H0 -* is the right firmware for KBL A0 (revid 0). -*/ static const struct stepping_info kbl_stepping_info[] = { - {'H' ,'0' }, {'I' ,'0' } + {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, + {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, + {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, };static const struct stepping_info skl_stepping_info[] = {@@ -298,7 +302,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, csr->version = css_header->version; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_KABYLAKE (dev_priv)) { + required_min_version =KBL_CSR_VERSION_REQUIRED ; + }else if (IS_SKYLAKE (dev_priv)) { required_min_version =SKL_CSR_VERSION_REQUIRED ; }else if (IS_BROXTON (dev_priv)) { required_min_version =BXT_CSR_VERSION_REQUIRED ;@@ -446,7 +452,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)if (!HAS_CSR (dev_priv))return ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv)) + csr->fw_path =I915_CSR_KBL ; +else if (IS_SKYLAKE (dev_priv)) csr->fw_path =I915_CSR_SKL ;else if (IS_BROXTON (dev_priv)) csr->fw_path =I915_CSR_BXT ; --
Quoted 2 lines
2.4.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/kbl: Introduce the first official DMC for Kabylake.
Version 1.01.
This firmware is made for Kabylake platform so it doesn't need the stepping workaround that we had before.
v2: Rebased on top of latest nightly with min version
required change.
v3: With right CSR_VERSION (Patrik).
--- drivers/gpu/drm/i915/intel_csr.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +19 -11
@@ -41,16 +41,22 @@* be moved to FW_FAILED. */ +#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_KBL ); +#define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 1) +#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_SKL ); +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_BXT ); +#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)#define FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" -MODULE_FIRMWARE (I915_CSR_SKL ); -MODULE_FIRMWARE (I915_CSR_BXT ); -#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) -#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) +#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF
@@ -169,12 +175,10 @@ struct stepping_info {char substepping; }; -/* -* Kabylake derivated from Skylake H0, so SKL H0 -* is the right firmware for KBL A0 (revid 0). -*/ static const struct stepping_info kbl_stepping_info[] = { - {'H' ,'0' }, {'I' ,'0' } + {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, + {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, + {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, };static const struct stepping_info skl_stepping_info[] = {
@@ -298,7 +302,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, csr->version = css_header->version; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_KABYLAKE (dev_priv)) { + required_min_version =KBL_CSR_VERSION_REQUIRED ; + }else if (IS_SKYLAKE (dev_priv)) { required_min_version =SKL_CSR_VERSION_REQUIRED ; }else if (IS_BROXTON (dev_priv)) { required_min_version =BXT_CSR_VERSION_REQUIRED ;
@@ -446,7 +452,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)if (!HAS_CSR (dev_priv))return ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv)) + csr->fw_path =I915_CSR_KBL ; +else if (IS_SKYLAKE (dev_priv)) csr->fw_path =I915_CSR_SKL ;else if (IS_BROXTON (dev_priv)) csr->fw_path =I915_CSR_BXT ;
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Rodrigo Vivi
Version 1.01.
This firmware is made for Kabylake platform so it doesn't need the stepping workaround that we had before.
Quoted 8 lines
v2: Rebased on top of latest nightly with min version
required change.
v3: With rightCSR_VERSION(Patrik).Cc Christophe Prigent <[email protected]>Cc Patrik Jakobsson <[email protected]>Reviewed-by Ben Widawsky <[email protected]> (v1)Signed-off-by Rodrigo Vivi <[email protected]>
As discussed on IRC, feel free to push this when satisfied with testing.
Quoted 74 lines
--- drivers/gpu/drm/i915/intel_csr.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_csr.c +19
-12@@ -41,16 +41,22 @@* be moved to FW_FAILED. */ +#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_KBL ); +#define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 1) +#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_SKL ); +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) +#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" +MODULE_FIRMWARE (I915_CSR_BXT ); +#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)#define FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" -MODULE_FIRMWARE (I915_CSR_SKL ); -MODULE_FIRMWARE (I915_CSR_BXT ); -#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) -#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) +#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF@@ -169,12 +175,10 @@ struct stepping_info {char substepping; }; -/* -* Kabylake derivated from Skylake H0, so SKL H0 -* is the right firmware for KBL A0 (revid 0). -*/ static const struct stepping_info kbl_stepping_info[] = { - {'H' ,'0' }, {'I' ,'0' } + {'A' ,'0' }, {'B' ,'0' }, {'C' ,'0' }, + {'D' ,'0' }, {'E' ,'0' }, {'F' ,'0' }, + {'G' ,'0' }, {'H' ,'0' }, {'I' ,'0' }, };static const struct stepping_info skl_stepping_info[] = {@@ -298,7 +302,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, csr->version = css_header->version; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_KABYLAKE (dev_priv)) { + required_min_version =KBL_CSR_VERSION_REQUIRED ; + }else if (IS_SKYLAKE (dev_priv)) { required_min_version =SKL_CSR_VERSION_REQUIRED ; }else if (IS_BROXTON (dev_priv)) { required_min_version =BXT_CSR_VERSION_REQUIRED ;@@ -446,7 +452,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)if (!HAS_CSR (dev_priv))return ; -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv)) + csr->fw_path =I915_CSR_KBL ; +else if (IS_SKYLAKE (dev_priv)) csr->fw_path =I915_CSR_SKL ;else if (IS_BROXTON (dev_priv)) csr->fw_path =I915_CSR_BXT ; --
Quoted 2 lines
2.4.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/kbl: Introduce the first official DMC for Kabylake. (rev2)
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: drm/i915/kbl: Introduce the first official DMC for Kabylake. (rev2)
URL : https://patchwork.freedesktop.org/series/6353/
State : failure
== Summary ==
Series 6353v2 drm/i915/kbl: Introduce the first official DMC for Kabylake.
http://patchwork.freedesktop.org/api/1.0/series/6353/revisions/2/mbox/
Test kms_force_connector_basic:
Subgroup force-load-detect:
skip -> PASS (snb-x220t)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
incomplete -> PASS (snb-dellxps)
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (skl-nuci5)bdw-nuci7 total:200 pass:188 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:200 pass:175 dwarn:0 dfail:0 fail:0 skip:25 bsw-nuc-2 total:199 pass:158 dwarn:0 dfail:0 fail:0 skip:41 byt-nuc total:199 pass:158 dwarn:0 dfail:0 fail:0 skip:41 hsw-brixbox total:200 pass:174 dwarn:0 dfail:0 fail:0 skip:26 skl-i7k-2 total:200 pass:173 dwarn:0 dfail:0 fail:0 skip:27 skl-nuci5 total:192 pass:181 dwarn:0 dfail:0 fail:0 skip:10 snb-dellxps total:200 pass:158 dwarn:0 dfail:0 fail:0 skip:42 snb-x220t total:200 pass:158 dwarn:0 dfail:0 fail:1 skip:41
Results at /archive/results/CI_IGT_test/Patchwork_2083/
87028af983d7f8561daf31389675a36b863b0652 drm-intel-nightly: 2016y-04m-27d-07h-06m-46s UTC integration manifest 86a7fbf drm/i915/kbl: Introduce the first official DMC for Kabylake.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx