diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2018-02-05 19:31:37 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-02-13 17:03:11 +0200 |
| commit | 435ad2c009429157cb65ce8a6221038235cc0501 (patch) | |
| tree | f5766312daf401df40b18c0b92f312aebab653ca | |
| parent | drm/i915: abstract PCH type detection from PCH id (diff) | |
| download | linux-dev-435ad2c009429157cb65ce8a6221038235cc0501.tar.xz linux-dev-435ad2c009429157cb65ce8a6221038235cc0501.zip | |
drm/i915: abstract virtual PCH id detection
Make the code slightly more pleasant to look at. No functional changes.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/38ee1ac06c6724e888679eb287af36c221bd399b.1517851783.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 066c3406bbc9..786486a53dce 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -192,6 +192,16 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) } } +static bool intel_is_virt_pch(unsigned short id, + unsigned short svendor, unsigned short sdevice) +{ + return (id == INTEL_PCH_P2X_DEVICE_ID_TYPE || + id == INTEL_PCH_P3X_DEVICE_ID_TYPE || + (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE && + svendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET && + sdevice == PCI_SUBDEVICE_ID_QEMU)); +} + static enum intel_pch intel_virt_detect_pch(struct drm_i915_private *dev_priv) { enum intel_pch ret = PCH_NOP; @@ -264,13 +274,8 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) pch_type = intel_pch_type(dev_priv, id); if (pch_type != PCH_NONE) { dev_priv->pch_type = pch_type; - } 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 == - PCI_SUBVENDOR_ID_REDHAT_QUMRANET && - pch->subsystem_device == - PCI_SUBDEVICE_ID_QEMU)) { + } else if (intel_is_virt_pch(id, pch->subsystem_vendor, + pch->subsystem_device)) { dev_priv->pch_type = intel_virt_detect_pch(dev_priv); } else { continue; |