From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 2/2] drm/i915: Add simulator's host bridge Date: Fri, 20 Jul 2012 10:43:30 -0700 Message-ID: <1342806210-4807-2-git-send-email-ben@bwidawsk.net> References: <1342806210-4807-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com [184.106.247.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 294DCA1139 for ; Fri, 20 Jul 2012 10:43:40 -0700 (PDT) In-Reply-To: <1342806210-4807-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org Add the host bridge ID used by the simulator. This was added in a previous patch for the agp layer, but wasn't preserved here. It also gives us an opportunity to let the rest of the driver know we're running as the simulator for various workarounds. We must always do this early as it's the only way we have to detect the simulator. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 72e86a7..ebaaea1 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -387,6 +387,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); #define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 #define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00 #define INTEL_PCH_LPT_DEVICE_ID_TYPE 0x8c00 +#define INTEL_PCH_HAS_DEVICE_ID_TYPE 0x7000 void intel_detect_pch(struct drm_device *dev) { @@ -422,6 +423,12 @@ void intel_detect_pch(struct drm_device *dev) dev_priv->pch_type = PCH_LPT; dev_priv->num_pch_pll = 0; DRM_DEBUG_KMS("Found LynxPoint PCH\n"); + } else if (id == INTEL_PCH_HAS_DEVICE_ID_TYPE) { + /* XXX it is important to do this early */ + dev_priv->is_simulator = true; + dev_priv->pch_type = PCH_CPT; + dev_priv->num_pch_pll = 2; + DRM_DEBUG_KMS("Found HAS PCH\n"); } BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); } -- 1.7.11.2