[1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
diff mbox

Message ID 1496424704-18013-1-git-send-email-anusha.srivatsa@intel.com
State New
Headers show

Commit Message

Srivatsa, Anusha June 2, 2017, 5:31 p.m. UTC
Add PCI Ids for U Skus of Coffeelake.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c |  1 +
 include/drm/i915_pciids.h       | 10 ++++++++++
 2 files changed, 11 insertions(+)

Comments

Rodrigo Vivi June 2, 2017, 8:49 p.m. UTC | #1
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Fri, Jun 2, 2017 at 10:31 AM, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Add PCI Ids for U Skus of Coffeelake.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c |  1 +
>  include/drm/i915_pciids.h       | 10 ++++++++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 31ea988..4d25193 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -477,6 +477,7 @@ static const struct pci_device_id pciidlist[] = {
>         INTEL_KBL_GT2_IDS(&intel_kabylake_info),
>         INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
>         INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
> +       INTEL_CFL_U_IDS(&intel_coffeelake_info),
>         {0, 0, 0}
>  };
>  MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 27e0dba..132dd04 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -334,4 +334,14 @@
>         INTEL_KBL_GT3_IDS(info), \
>         INTEL_KBL_GT4_IDS(info)
>
> +#define INTEL_CFL_U_IDS(info) \
> +       INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
> +
> +
> +#define INTEL_CFL_IDS(info) \
> +       INTEL_CFL_U_IDS(info)
> +
>  #endif /* _I915_PCIIDS_H */
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi June 2, 2017, 8:51 p.m. UTC | #2
ops, actually I take the rv-b back, sorry....

On Fri, Jun 2, 2017 at 10:31 AM, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Add PCI Ids for U Skus of Coffeelake.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c |  1 +
>  include/drm/i915_pciids.h       | 10 ++++++++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 31ea988..4d25193 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -477,6 +477,7 @@ static const struct pci_device_id pciidlist[] = {
>         INTEL_KBL_GT2_IDS(&intel_kabylake_info),
>         INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
>         INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
> +       INTEL_CFL_U_IDS(&intel_coffeelake_info),

it should be better with INTEL_CFL_IDS(info) here

>         {0, 0, 0}
>  };
>  MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 27e0dba..132dd04 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -334,4 +334,14 @@
>         INTEL_KBL_GT3_IDS(info), \
>         INTEL_KBL_GT4_IDS(info)
>
> +#define INTEL_CFL_U_IDS(info) \
> +       INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
> +       INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
> +
> +
> +#define INTEL_CFL_IDS(info) \
> +       INTEL_CFL_U_IDS(info)

if not used better not to define ;)
but I prefer using it up there...

> +
>  #endif /* _I915_PCIIDS_H */
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot June 3, 2017, 3:33 a.m. UTC | #3
Hi Anusha,

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on v4.12-rc3 next-20170602]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/drm-i915-cfl-Add-Coffee-Lake-PCI-IDs-for-U-Sku/20170603-101317
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x014-201722 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All error/warnings (new ones prefixed by >>):

   In file included from include/drm/i915_drm.h:29:0,
                    from drivers/gpu/drm/i915/i915_gem_object.h:34,
                    from drivers/gpu/drm/i915/i915_vma.h:34,
                    from drivers/gpu/drm/i915/intel_uc.h:31,
                    from drivers/gpu/drm/i915/i915_drv.h:61,
                    from drivers/gpu/drm/i915/i915_pci.c:29:
>> drivers/gpu/drm/i915/i915_pci.c:472:19: error: 'intel_coffeelake_info' undeclared here (not in a function)
     INTEL_CFL_U_IDS(&intel_coffeelake_info),
                      ^
   include/drm/i915_pciids.h:42:18: note: in definition of macro 'INTEL_VGA_DEVICE'
     (unsigned long) info }
                     ^~~~
>> drivers/gpu/drm/i915/i915_pci.c:472:2: note: in expansion of macro 'INTEL_CFL_U_IDS'
     INTEL_CFL_U_IDS(&intel_coffeelake_info),
     ^~~~~~~~~~~~~~~

vim +/intel_coffeelake_info +472 drivers/gpu/drm/i915/i915_pci.c

   466		INTEL_BXT_IDS(&intel_broxton_info),
   467		INTEL_GLK_IDS(&intel_geminilake_info),
   468		INTEL_KBL_GT1_IDS(&intel_kabylake_info),
   469		INTEL_KBL_GT2_IDS(&intel_kabylake_info),
   470		INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
   471		INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
 > 472		INTEL_CFL_U_IDS(&intel_coffeelake_info),
   473		{0, 0, 0}
   474	};
   475	MODULE_DEVICE_TABLE(pci, pciidlist);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 31ea988..4d25193 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -477,6 +477,7 @@  static const struct pci_device_id pciidlist[] = {
 	INTEL_KBL_GT2_IDS(&intel_kabylake_info),
 	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
+	INTEL_CFL_U_IDS(&intel_coffeelake_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 27e0dba..132dd04 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -334,4 +334,14 @@ 
 	INTEL_KBL_GT3_IDS(info), \
 	INTEL_KBL_GT4_IDS(info)
 
+#define INTEL_CFL_U_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
+
+
+#define INTEL_CFL_IDS(info) \
+	INTEL_CFL_U_IDS(info)
+
 #endif /* _I915_PCIIDS_H */