diff mbox

[1/3] drm/i915/DMC/GLK: Load DMC on GLK

Message ID 1481902946-18593-1-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ander Conselvan de Oliveira Dec. 16, 2016, 3:42 p.m. UTC 
From: Anusha Srivatsa <anusha.srivatsa@intel.com>

This patch loads the DMC on GLK. There is a single
firmware image for all steppings on a GLK.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Ander Conselvan de Oliveira Dec. 20, 2016, 2:34 p.m. UTC | #1 
On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> URL   : https://patchwork.freedesktop.org/series/16926/
> State : failure
> 
> == Summary ==
> 
> Series 16926v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> 
> Test drv_module_reload:
>         Subgroup basic-reload-inject:
>                 pass       -> DMESG-WARN (fi-kbl-7500u)

[   33.108496] WARNING: CPU: 2 PID: 6400 at drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
[   33.108498] WARN_ON(dev_priv->gt.awake)
[   33.108499] Modules linked in:
[   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded: snd_hda_intel]
[   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted: G     U          4.9.0-CI-Patchwork_3338+ #1
[   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1 07/27/2016
[   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68 0000000000000000
[   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000 ffff88025c620000
[   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0 0000000000000000
[   33.108534] Call Trace:
[   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
[   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
[   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
[   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
[   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
[   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
[   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
[   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
[   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
[   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
[   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
[   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
[   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
[   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
[   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
[   33.108660] ---[ end trace 247dfc1ad299c432 ]---

https://bugs.freedesktop.org/show_bug.cgi?id=98670

> Test pm_rpm:
>         Subgroup basic-pci-d3-state:
>                 pass       -> FAIL       (fi-kbl-7500u)
>         Subgroup basic-rte:
>                 pass       -> FAIL       (fi-kbl-7500u)

Out	
IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
Runtime PM support: 1
PC8 residency support: 0
Stack trace:
  #0 [__igt_fail_assert+0x101]
  #1 [main+0x2514]
  #2 [__libc_start_main+0xf0]
  #3 [_start+0x29]
  #4 [<unknown>+0x29]
Subtest basic-rte: FAIL (10.053s)
Err	
(pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
(pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
Subtest basic-rte failed.
**** DEBUG ****
(pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
(pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()

Is this related to the gt.awake WARN? Looking at CI history, it seems the three
tests always fail together.


Thanks,
Ander

> 
> fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
> fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
> fi-bxt-j4205     total:247  pass:225  dwarn:1   dfail:0   fail:0   skip:21 
> fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
> fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
> fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
> fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
> fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
> fi-kbl-7500u     total:247  pass:223  dwarn:1   dfail:0   fail:2   skip:21 
> fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
> fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
> fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
> fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
> fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
> fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 
> 
> c0d7a4455b44d48ede0a38af3a1469d28dee10c9 drm-tip: 2016y-12m-20d-10h-01m-56s
> UTC integration manifest
> 09486c1 drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
> 2ba792e drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
> 630af86 drm/i915/DMC/GLK: Load DMC on GLK
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3338/
Chris Wilson Dec. 20, 2016, 2:46 p.m. UTC | #2 
On Tue, Dec 20, 2016 at 04:34:20PM +0200, Ander Conselvan De Oliveira wrote:
> On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> > URL   : https://patchwork.freedesktop.org/series/16926/
> > State : failure
> > 
> > == Summary ==
> > 
> > Series 16926v1 Series without cover letter
> > https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> > 
> > Test drv_module_reload:
> >         Subgroup basic-reload-inject:
> >                 pass       -> DMESG-WARN (fi-kbl-7500u)
> 
> [   33.108496] WARNING: CPU: 2 PID: 6400 at drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
> [   33.108498] WARN_ON(dev_priv->gt.awake)
> [   33.108499] Modules linked in:
> [   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded: snd_hda_intel]
> [   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted: G     U          4.9.0-CI-Patchwork_3338+ #1
> [   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1 07/27/2016
> [   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68 0000000000000000
> [   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000 ffff88025c620000
> [   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0 0000000000000000
> [   33.108534] Call Trace:
> [   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
> [   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
> [   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
> [   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
> [   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
> [   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
> [   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
> [   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
> [   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
> [   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
> [   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
> [   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
> [   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
> [   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
> [   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
> [   33.108660] ---[ end trace 247dfc1ad299c432 ]---
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=98670
> 
> > Test pm_rpm:
> >         Subgroup basic-pci-d3-state:
> >                 pass       -> FAIL       (fi-kbl-7500u)
> >         Subgroup basic-rte:
> >                 pass       -> FAIL       (fi-kbl-7500u)
> 
> Out	
> IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
> Runtime PM support: 1
> PC8 residency support: 0
> Stack trace:
>   #0 [__igt_fail_assert+0x101]
>   #1 [main+0x2514]
>   #2 [__libc_start_main+0xf0]
>   #3 [_start+0x29]
>   #4 [<unknown>+0x29]
> Subtest basic-rte: FAIL (10.053s)
> Err	
> (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
> (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> Subtest basic-rte failed.
> **** DEBUG ****
> (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file pm_rpm.c:705:
> (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> 
> Is this related to the gt.awake WARN? Looking at CI history, it seems the three
> tests always fail together.

No. The message is from an earlier incarnation of the module (i.e. if it
does correlates, it is a bug in module loading not sanitizing hw state),
and https://intel-gfx-ci.01.org/CI/fi-kbl-7500u.html disagrees with you.
-Chris
Ander Conselvan de Oliveira Dec. 20, 2016, 3:10 p.m. UTC | #3 
On Tue, 2016-12-20 at 14:46 +0000, Chris Wilson wrote:
> On Tue, Dec 20, 2016 at 04:34:20PM +0200, Ander Conselvan De Oliveira wrote:
> > 
> > On Tue, 2016-12-20 at 12:53 +0000, Patchwork wrote:
> > > 
> > > == Series Details ==
> > > 
> > > Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK
> > > URL   : https://patchwork.freedesktop.org/series/16926/
> > > State : failure
> > > 
> > > == Summary ==
> > > 
> > > Series 16926v1 Series without cover letter
> > > https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/1/mbox/
> > > 
> > > Test drv_module_reload:
> > >         Subgroup basic-reload-inject:
> > >                 pass       -> DMESG-WARN (fi-kbl-7500u)
> > [   33.108496] WARNING: CPU: 2 PID: 6400 at
> > drivers/gpu/drm/i915/i915_gem.c:4254 i915_gem_suspend+0x181/0x190 [i915]
> > [   33.108498] WARN_ON(dev_priv->gt.awake)
> > [   33.108499] Modules linked in:
> > [   33.108501]  i915(-) x86_pkg_temp_thermal intel_powerclamp coretemp
> > crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_hdmi
> > snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep mei_me
> > snd_hda_core mei snd_pcm e1000e ptp pps_core i2c_hid [last unloaded:
> > snd_hda_intel]
> > [   33.108519] CPU: 2 PID: 6400 Comm: drv_module_relo Tainted:
> > G     U          4.9.0-CI-Patchwork_3338+ #1
> > [   33.108521] Hardware name: GIGABYTE GB-BKi7A-7500/MFLP7AP-00, BIOS F1
> > 07/27/2016
> > [   33.108522]  ffffc90000547d18 ffffffff81435b05 ffffc90000547d68
> > 0000000000000000
> > [   33.108527]  ffffc90000547d58 ffffffff8107e4d6 0000109e00000000
> > ffff88025c620000
> > [   33.108530]  0000000000000000 ffff88025c620068 ffffffffa013f4c0
> > 0000000000000000
> > [   33.108534] Call Trace:
> > [   33.108540]  [<ffffffff81435b05>] dump_stack+0x67/0x92
> > [   33.108543]  [<ffffffff8107e4d6>] __warn+0xc6/0xe0
> > [   33.108547]  [<ffffffff8107e53a>] warn_slowpath_fmt+0x4a/0x50
> > [   33.108572]  [<ffffffffa0051601>] i915_gem_suspend+0x181/0x190 [i915]
> > [   33.108589]  [<ffffffffa000ef4e>] i915_driver_unload+0x1e/0x190 [i915]
> > [   33.108608]  [<ffffffffa0018b24>] i915_pci_remove+0x14/0x20 [i915]
> > [   33.108611]  [<ffffffff81489aa4>] pci_device_remove+0x34/0xb0
> > [   33.108614]  [<ffffffff81588eec>] __device_release_driver+0x9c/0x150
> > [   33.108617]  [<ffffffff81589a66>] driver_detach+0xb6/0xc0
> > [   33.108619]  [<ffffffff81588983>] bus_remove_driver+0x53/0xd0
> > [   33.108621]  [<ffffffff8158a527>] driver_unregister+0x27/0x50
> > [   33.108623]  [<ffffffff81488445>] pci_unregister_driver+0x25/0x70
> > [   33.108652]  [<ffffffffa00fd8a4>] i915_exit+0x1a/0x71 [i915]
> > [   33.108655]  [<ffffffff8111a813>] SyS_delete_module+0x193/0x1e0
> > [   33.108658]  [<ffffffff81827c6e>] entry_SYSCALL_64_fastpath+0x1c/0xb1
> > [   33.108660] ---[ end trace 247dfc1ad299c432 ]---
> > 
> > https://bugs.freedesktop.org/show_bug.cgi?id=98670
> > 
> > > 
> > > Test pm_rpm:
> > >         Subgroup basic-pci-d3-state:
> > >                 pass       -> FAIL       (fi-kbl-7500u)
> > >         Subgroup basic-rte:
> > >                 pass       -> FAIL       (fi-kbl-7500u)
> > Out	
> > IGT-Version: 1.17-g38bffd9 (x86_64) (Linux: 4.9.0-CI-Patchwork_3338+ x86_64)
> > Runtime PM support: 1
> > PC8 residency support: 0
> > Stack trace:
> >   #0 [__igt_fail_assert+0x101]
> >   #1 [main+0x2514]
> >   #2 [__libc_start_main+0xf0]
> >   #3 [_start+0x29]
> >   #4 [<unknown>+0x29]
> > Subtest basic-rte: FAIL (10.053s)
> > Err	
> > (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file
> > pm_rpm.c:705:
> > (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> > Subtest basic-rte failed.
> > **** DEBUG ****
> > (pm_rpm:9532) CRITICAL: Test assertion failure function basic_subtest, file
> > pm_rpm.c:705:
> > (pm_rpm:9532) CRITICAL: Failed assertion: wait_for_suspended()
> > 
> > Is this related to the gt.awake WARN? Looking at CI history, it seems the
> > three
> > tests always fail together.
> No. The message is from an earlier incarnation of the module (i.e. if it
> does correlates, it is a bug in module loading not sanitizing hw state),
> and https://intel-gfx-ci.01.org/CI/fi-kbl-7500u.html disagrees with you.

I shouldn't have said always. I was looking at that page, but only considered
the fails of basic-reload-inject that had a dmesg-warn type of fail. And that is
very small sample of 2. Anyway, thanks for the explanation.

Ander
Ander Conselvan de Oliveira Jan. 10, 2017, 9:09 a.m. UTC | #4 
On Mon, 2017-01-09 at 15:53 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/3] drm/i915/DMC/GLK: Load DMC on GLK (rev2)
> URL   : https://patchwork.freedesktop.org/series/16926/
> State : warning
> 
> == Summary ==
> 
> Series 16926v2 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/16926/revisions/2/mbox/
> 
> Test kms_force_connector_basic:
>         Subgroup force-edid:
>                 pass       -> DMESG-WARN (fi-snb-2520m)

[drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 115

https://bugs.freedesktop.org/show_bug.cgi?id=98625


All three pushed. Thanks for the patches and reviews.

Ander


> 
> fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
> fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
> fi-bxt-j4205     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
> fi-bxt-t5700     total:82   pass:69   dwarn:0   dfail:0   fail:0   skip:12 
> fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
> fi-byt-n2820     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
> fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
> fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
> fi-ivb-3520m     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
> fi-kbl-7500u     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
> fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
> fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
> fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
> fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
> fi-snb-2520m     total:246  pass:214  dwarn:1   dfail:0   fail:0   skip:31 
> fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 
> 
> ea7e3e5c99e316fb6876399f9b32b2372e45c4af drm-tip: 2017y-01m-09d-14h-45m-54s
> UTC integration manifest
> 914ba9b drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP()
> 32dc09b drm/i915/glk: Add missing bits to allow runtime pm suspend on GLK.
> aa47b07 drm/i915/DMC/GLK: Load DMC on GLK
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3454/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 9cbb8d8..0085bc7 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,10 @@ 
  * low-power state and comes back to normal.
  */
 
+#define I915_CSR_GLK "i915/glk_dmc_ver1_01.bin"
+MODULE_FIRMWARE(I915_CSR_GLK);
+#define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
+
 #define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
 MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
@@ -286,7 +290,9 @@  static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_KABYLAKE(dev_priv)) {
+	if (IS_GEMINILAKE(dev_priv)) {
+		required_version = GLK_CSR_VERSION_REQUIRED;
+	} else if (IS_KABYLAKE(dev_priv)) {
 		required_version = KBL_CSR_VERSION_REQUIRED;
 	} else if (IS_SKYLAKE(dev_priv)) {
 		required_version = SKL_CSR_VERSION_REQUIRED;
@@ -435,7 +441,9 @@  void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_KABYLAKE(dev_priv))
+	if (IS_GEMINILAKE(dev_priv))
+		csr->fw_path = I915_CSR_GLK;
+	else if (IS_KABYLAKE(dev_priv))
 		csr->fw_path = I915_CSR_KBL;
 	else if (IS_SKYLAKE(dev_priv))
 		csr->fw_path = I915_CSR_SKL;