diff mbox

[RESENT] drm/i915: use #defines for qemu subsystem ids

Message ID 1465821536-21312-1-git-send-email-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann June 13, 2016, 12:38 p.m. UTC 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Jani Nikula June 13, 2016, 1:19 p.m. UTC | #1 
On Mon, 13 Jun 2016, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f313b4d..3099390 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -515,8 +515,10 @@ void intel_detect_pch(struct drm_device *dev)
>  			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
>  				   (id == INTEL_PCH_P3X_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;
Jani Nikula June 13, 2016, 2:45 p.m. UTC | #2 
On Mon, 13 Jun 2016, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Mon, 13 Jun 2016, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

And pushed to drm-intel-next-queued, thanks for the patch.

BR,
Jani.

>
>
>> ---
>>  drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index f313b4d..3099390 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -515,8 +515,10 @@ void intel_detect_pch(struct drm_device *dev)
>>  			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
>>  				   (id == INTEL_PCH_P3X_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;
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f313b4d..3099390 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -515,8 +515,10 @@  void intel_detect_pch(struct drm_device *dev)
 			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||
 				   (id == INTEL_PCH_P3X_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;