diff mbox series

[v3,03/28] drm/i915/dg1: Add DG1 PCI IDs

Message ID 20200701235339.32608-4-lucas.demarchi@intel.com (mailing list archive)
State New, archived
Headers show
Series Introduce DG1 | expand

Commit Message

Lucas De Marchi July 1, 2020, 11:53 p.m. UTC 
From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>

Add the PCI ID for DG1, but keep it out of the table we use to register
the driver. At this point we can't consider the driver ready to bind to
the device since we basically miss support for everything. When more
support is merged we can enable it to work partially for example as a
display-only driver.

v2: remove DG1 from the pci table and reword commit message (Lucas)

Bspec: 44463

Cc: Matthew Auld <matthew.auld@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com> # v1
---
 drivers/gpu/drm/i915/i915_pci.c | 2 +-
 include/drm/i915_pciids.h       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

kernel test robot July 2, 2020, 6 a.m. UTC | #1 
Hi Lucas,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20200701]
[cannot apply to v5.8-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use  as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Lucas-De-Marchi/Introduce-DG1/20200702-075819
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-m021-20200701 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/gpu/drm/i915/i915_pci.c:903:39: error: 'dg1_info' defined but not used [-Werror=unused-const-variable=]
     903 | static const struct intel_device_info dg1_info = {
         |                                       ^~~~~~~~
   cc1: all warnings being treated as errors

vim +/dg1_info +903 drivers/gpu/drm/i915/i915_pci.c

   896	
   897	#define GEN12_DGFX_FEATURES \
   898		GEN12_FEATURES, \
   899		.memory_regions = REGION_SMEM | REGION_LMEM, \
   900		.has_master_unit_irq = 1, \
   901		.is_dgfx = 1
   902	
 > 903	static const struct intel_device_info dg1_info = {
   904		GEN12_DGFX_FEATURES,
   905		PLATFORM(INTEL_DG1),
   906		.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
   907		.require_force_probe = 1,
   908		.engine_mask =
   909			BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
   910			BIT(VCS0) | BIT(VCS2),
   911	};
   912	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot July 2, 2020, 12:37 p.m. UTC | #2 
Hi Lucas,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip next-20200702]
[cannot apply to v5.8-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use  as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Lucas-De-Marchi/Introduce-DG1/20200702-075819
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-r025-20200702 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 003a086ffc0d1affbb8300b36225fb8150a2d40a)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install x86_64 cross compiling tool for clang build
        # apt-get install binutils-x86-64-linux-gnu
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/gpu/drm/i915/i915_pci.c:903:39: warning: unused variable 'dg1_info' [-Wunused-const-variable]
   static const struct intel_device_info dg1_info = {
                                         ^
   1 warning generated.

vim +/dg1_info +903 drivers/gpu/drm/i915/i915_pci.c

   896	
   897	#define GEN12_DGFX_FEATURES \
   898		GEN12_FEATURES, \
   899		.memory_regions = REGION_SMEM | REGION_LMEM, \
   900		.has_master_unit_irq = 1, \
   901		.is_dgfx = 1
   902	
 > 903	static const struct intel_device_info dg1_info = {
   904		GEN12_DGFX_FEATURES,
   905		PLATFORM(INTEL_DG1),
   906		.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
   907		.require_force_probe = 1,
   908		.engine_mask =
   909			BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
   910			BIT(VCS0) | BIT(VCS2),
   911	};
   912	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Daniel Vetter July 8, 2020, 5:08 p.m. UTC | #3 
On Thu, Jul 2, 2020 at 1:55 AM Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>
> From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
>
> Add the PCI ID for DG1, but keep it out of the table we use to register
> the driver. At this point we can't consider the driver ready to bind to
> the device since we basically miss support for everything. When more
> support is merged we can enable it to work partially for example as a
> display-only driver.
>
> v2: remove DG1 from the pci table and reword commit message (Lucas)
>
> Bspec: 44463
>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: James Ausmus <james.ausmus@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> # v1
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 2 +-
>  include/drm/i915_pciids.h       | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 58cceeaa0ffa..8cae64adbb23 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -900,7 +900,7 @@ static const struct intel_device_info rkl_info = {
>         .has_master_unit_irq = 1, \
>         .is_dgfx = 1
>
> -static const struct intel_device_info intel_dg1_info = {
> +static const struct intel_device_info dg1_info = {

Looks like a misplaced hunk here, but aside from that, on the "let's
just not add the pci id":

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Also adding Dave just as fyi.
-Daniel

>         GEN12_DGFX_FEATURES,
>         PLATFORM(INTEL_DG1),
>         .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index bc989de2aac2..f44fe822880d 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -614,4 +614,8 @@
>         INTEL_VGA_DEVICE(0x4C90, info), \
>         INTEL_VGA_DEVICE(0x4C9A, info)
>
> +/* DG1 */
> +#define INTEL_DG1_IDS(info) \
> +       INTEL_VGA_DEVICE(0x4905, info)
> +
>  #endif /* _I915_PCIIDS_H */
> --
> 2.26.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Lucas De Marchi July 9, 2020, 8:01 p.m. UTC | #4 
On Wed, Jul 1, 2020 at 11:01 PM kernel test robot <lkp@intel.com> wrote:
>
> Hi Lucas,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on drm-intel/for-linux-next]
> [also build test ERROR on drm-tip/drm-tip next-20200701]
> [cannot apply to v5.8-rc3]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use  as documented in
> https://git-scm.com/docs/git-format-patch]
>
> url:    https://github.com/0day-ci/linux/commits/Lucas-De-Marchi/Introduce-DG1/20200702-075819
> base:   git://anongit.freedesktop.org/drm-intel for-linux-next
> config: i386-randconfig-m021-20200701 (attached as .config)
> compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> >> drivers/gpu/drm/i915/i915_pci.c:903:39: error: 'dg1_info' defined but not used [-Werror=unused-const-variable=]
>      903 | static const struct intel_device_info dg1_info = {
>          |                                       ^~~~~~~~

This is intentionally left unused. Wonder what the fix would be...
__attribute__(__unused__) or force the warning
to be ignored here

with or without this change I don't get a warning in  gcc 10 (using
the same config attached).

Lucas De Marchi

>    cc1: all warnings being treated as errors
>
> vim +/dg1_info +903 drivers/gpu/drm/i915/i915_pci.c
>
>    896
>    897  #define GEN12_DGFX_FEATURES \
>    898          GEN12_FEATURES, \
>    899          .memory_regions = REGION_SMEM | REGION_LMEM, \
>    900          .has_master_unit_irq = 1, \
>    901          .is_dgfx = 1
>    902
>  > 903  static const struct intel_device_info dg1_info = {
>    904          GEN12_DGFX_FEATURES,
>    905          PLATFORM(INTEL_DG1),
>    906          .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
>    907          .require_force_probe = 1,
>    908          .engine_mask =
>    909                  BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
>    910                  BIT(VCS0) | BIT(VCS2),
>    911  };
>    912
>
> ---
> 0-DAY CI Kernel Test Service, Intel Corporation
> https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Lucas De Marchi July 9, 2020, 8:56 p.m. UTC | #5 
On Thu, Jul 9, 2020 at 1:01 PM Lucas De Marchi
<lucas.de.marchi@gmail.com> wrote:
>
> On Wed, Jul 1, 2020 at 11:01 PM kernel test robot <lkp@intel.com> wrote:
> >
> > Hi Lucas,
> >
> > Thank you for the patch! Yet something to improve:
> >
> > [auto build test ERROR on drm-intel/for-linux-next]
> > [also build test ERROR on drm-tip/drm-tip next-20200701]
> > [cannot apply to v5.8-rc3]
> > [If your patch is applied to the wrong git tree, kindly drop us a note.
> > And when submitting patch, we suggest to use  as documented in
> > https://git-scm.com/docs/git-format-patch]
> >
> > url:    https://github.com/0day-ci/linux/commits/Lucas-De-Marchi/Introduce-DG1/20200702-075819
> > base:   git://anongit.freedesktop.org/drm-intel for-linux-next
> > config: i386-randconfig-m021-20200701 (attached as .config)
> > compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
> >
> > If you fix the issue, kindly add following tag as appropriate
> > Reported-by: kernel test robot <lkp@intel.com>
> >
> > All errors (new ones prefixed by >>):
> >
> > >> drivers/gpu/drm/i915/i915_pci.c:903:39: error: 'dg1_info' defined but not used [-Werror=unused-const-variable=]
> >      903 | static const struct intel_device_info dg1_info = {
> >          |                                       ^~~~~~~~
>
> This is intentionally left unused. Wonder what the fix would be...
> __attribute__(__unused__) or force the warning
> to be ignored here
>
> with or without this change I don't get a warning in  gcc 10 (using
> the same config attached).

Adding W=1 to the command line and this is sufficient to shut up the warning.

Lucas De Marchi

>
> Lucas De Marchi
>
> >    cc1: all warnings being treated as errors
> >
> > vim +/dg1_info +903 drivers/gpu/drm/i915/i915_pci.c
> >
> >    896
> >    897  #define GEN12_DGFX_FEATURES \
> >    898          GEN12_FEATURES, \
> >    899          .memory_regions = REGION_SMEM | REGION_LMEM, \
> >    900          .has_master_unit_irq = 1, \
> >    901          .is_dgfx = 1
> >    902
> >  > 903  static const struct intel_device_info dg1_info = {
> >    904          GEN12_DGFX_FEATURES,
> >    905          PLATFORM(INTEL_DG1),
> >    906          .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
> >    907          .require_force_probe = 1,
> >    908          .engine_mask =
> >    909                  BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
> >    910                  BIT(VCS0) | BIT(VCS2),
> >    911  };
> >    912
> >
> > ---
> > 0-DAY CI Kernel Test Service, Intel Corporation
> > https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Lucas De Marchi
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 58cceeaa0ffa..8cae64adbb23 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -900,7 +900,7 @@  static const struct intel_device_info rkl_info = {
 	.has_master_unit_irq = 1, \
 	.is_dgfx = 1
 
-static const struct intel_device_info intel_dg1_info = {
+static const struct intel_device_info dg1_info = {
 	GEN12_DGFX_FEATURES,
 	PLATFORM(INTEL_DG1),
 	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index bc989de2aac2..f44fe822880d 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -614,4 +614,8 @@ 
 	INTEL_VGA_DEVICE(0x4C90, info), \
 	INTEL_VGA_DEVICE(0x4C9A, info)
 
+/* DG1 */
+#define INTEL_DG1_IDS(info) \
+	INTEL_VGA_DEVICE(0x4905, info)
+
 #endif /* _I915_PCIIDS_H */