drm/i915: use #defines for qemu subsystem ids
diff mbox

Message ID 1454059382-17320-1-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann Jan. 29, 2016, 9:23 a.m. UTC
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
depends on http://mid.gmane.org/1453739846-3549-1-git-send-email-robbat2@gentoo.org
---
 drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

kernel test robot Jan. 29, 2016, 9:37 a.m. UTC | #1
Hi Gerd,

[auto build test ERROR on drm-intel/for-linux-next]
[cannot apply to v4.5-rc1 next-20160129]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Gerd-Hoffmann/drm-i915-use-defines-for-qemu-subsystem-ids/20160129-172630
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x012-01270835 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/gpu/drm/i915/i915_drv.c: In function 'intel_detect_pch':
>> drivers/gpu/drm/i915/i915_drv.c:506:10: error: 'PCI_SUBVENDOR_ID_REDHAT_QUMRANET' undeclared (first use in this function)
             PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
             ^
   drivers/gpu/drm/i915/i915_drv.c:506:10: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/gpu/drm/i915/i915_drv.c:508:10: error: 'PCI_SUBDEVICE_ID_QEMU' undeclared (first use in this function)
             PCI_SUBDEVICE_ID_QEMU)) {
             ^

vim +/PCI_SUBVENDOR_ID_REDHAT_QUMRANET +506 drivers/gpu/drm/i915/i915_drv.c

   500					DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
   501					WARN_ON(!IS_SKYLAKE(dev) &&
   502						!IS_KABYLAKE(dev));
   503				} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
   504					   ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
   505					    pch->subsystem_vendor ==
 > 506						    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
   507					    pch->subsystem_device ==
 > 508						    PCI_SUBDEVICE_ID_QEMU)) {
   509					dev_priv->pch_type = intel_virt_detect_pch(dev);
   510				} else
   511					continue;

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
kernel test robot Jan. 29, 2016, 9:41 a.m. UTC | #2
Hi Gerd,

[auto build test WARNING on drm-intel/for-linux-next]
[cannot apply to v4.5-rc1 next-20160129]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Gerd-Hoffmann/drm-i915-use-defines-for-qemu-subsystem-ids/20160129-172630
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x014-01270835 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

   In file included from include/linux/ioport.h:12:0,
                    from include/linux/device.h:16,
                    from drivers/gpu/drm/i915/i915_drv.c:30:
   drivers/gpu/drm/i915/i915_drv.c: In function 'intel_detect_pch':
   drivers/gpu/drm/i915/i915_drv.c:506:10: error: 'PCI_SUBVENDOR_ID_REDHAT_QUMRANET' undeclared (first use in this function)
             PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
             ^
   include/linux/compiler.h:147:28: note: in definition of macro '__trace_if'
     if (__builtin_constant_p((cond)) ? !!(cond) :   \
                               ^
>> drivers/gpu/drm/i915/i915_drv.c:503:11: note: in expansion of macro 'if'
       } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
              ^
   drivers/gpu/drm/i915/i915_drv.c:506:10: note: each undeclared identifier is reported only once for each function it appears in
             PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
             ^
   include/linux/compiler.h:147:28: note: in definition of macro '__trace_if'
     if (__builtin_constant_p((cond)) ? !!(cond) :   \
                               ^
>> drivers/gpu/drm/i915/i915_drv.c:503:11: note: in expansion of macro 'if'
       } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
              ^
   drivers/gpu/drm/i915/i915_drv.c:508:10: error: 'PCI_SUBDEVICE_ID_QEMU' undeclared (first use in this function)
             PCI_SUBDEVICE_ID_QEMU)) {
             ^
   include/linux/compiler.h:147:28: note: in definition of macro '__trace_if'
     if (__builtin_constant_p((cond)) ? !!(cond) :   \
                               ^
>> drivers/gpu/drm/i915/i915_drv.c:503:11: note: in expansion of macro 'if'
       } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
              ^

vim +/if +503 drivers/gpu/drm/i915/i915_drv.c

a35cc9d0c Rodrigo Vivi       2015-01-21  487  				WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
e76e06348 Ben Widawsky       2013-11-07  488  			} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
e76e06348 Ben Widawsky       2013-11-07  489  				dev_priv->pch_type = PCH_LPT;
e76e06348 Ben Widawsky       2013-11-07  490  				DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
a35cc9d0c Rodrigo Vivi       2015-01-21  491  				WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
a35cc9d0c Rodrigo Vivi       2015-01-21  492  				WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
e7e7ea202 Satheeshakrishna M 2014-04-09  493  			} else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
e7e7ea202 Satheeshakrishna M 2014-04-09  494  				dev_priv->pch_type = PCH_SPT;
e7e7ea202 Satheeshakrishna M 2014-04-09  495  				DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
ef11bdb3e Rodrigo Vivi       2015-10-28  496  				WARN_ON(!IS_SKYLAKE(dev) &&
ef11bdb3e Rodrigo Vivi       2015-10-28  497  					!IS_KABYLAKE(dev));
e7e7ea202 Satheeshakrishna M 2014-04-09  498  			} else if (id == INTEL_PCH_SPT_LP_DEVICE_ID_TYPE) {
e7e7ea202 Satheeshakrishna M 2014-04-09  499  				dev_priv->pch_type = PCH_SPT;
e7e7ea202 Satheeshakrishna M 2014-04-09  500  				DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
ef11bdb3e Rodrigo Vivi       2015-10-28  501  				WARN_ON(!IS_SKYLAKE(dev) &&
ef11bdb3e Rodrigo Vivi       2015-10-28  502  					!IS_KABYLAKE(dev));
39bfcd523 Gerd Hoffmann      2015-11-26 @503  			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
1e859111c Gerd Hoffmann      2016-01-25  504  				   ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
7e1597c34 Gerd Hoffmann      2016-01-29  505  				    pch->subsystem_vendor ==
7e1597c34 Gerd Hoffmann      2016-01-29  506  					    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
7e1597c34 Gerd Hoffmann      2016-01-29  507  				    pch->subsystem_device ==
7e1597c34 Gerd Hoffmann      2016-01-29  508  					    PCI_SUBDEVICE_ID_QEMU)) {
30c964a6c Robert Beckett     2015-08-28  509  				dev_priv->pch_type = intel_virt_detect_pch(dev);
bcdb72ac7 Imre Deak          2014-02-14  510  			} else
bcdb72ac7 Imre Deak          2014-02-14  511  				continue;

:::::: The code at line 503 was first introduced by commit
:::::: 39bfcd5235e07e95ad3e70eab8e0b85db181de9e drm/i915: more virtual south bridge detection

:::::: TO: Gerd Hoffmann <kraxel@redhat.com>
:::::: CC: Daniel Vetter <daniel.vetter@ffwll.ch>

---
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_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f357058..b200152 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -502,8 +502,10 @@  void intel_detect_pch(struct drm_device *dev)
 					!IS_KABYLAKE(dev));
 			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
 				   ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
-				    pch->subsystem_vendor == 0x1af4 &&
-				    pch->subsystem_device == 0x1100)) {
+				    pch->subsystem_vendor ==
+					    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
+				    pch->subsystem_device ==
+					    PCI_SUBDEVICE_ID_QEMU)) {
 				dev_priv->pch_type = intel_virt_detect_pch(dev);
 			} else
 				continue;