From patchwork Wed Oct 31 21:52:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1681831 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 89A8CDFB80 for ; Wed, 31 Oct 2012 21:53:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57ABBA0C33 for ; Wed, 31 Oct 2012 14:53:32 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FEE99EB10 for ; Wed, 31 Oct 2012 14:52:38 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id n13so757703eaa.36 for ; Wed, 31 Oct 2012 14:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vHSp3KfhWKBTyYq5q7kUn6KSg7TobAIFxAYZQLxDQg4=; b=RW+qnPvAcUjCTuHouivBdjlzPdSoUCQ51HDLqFUtxeZQjL/zfg0/dPS39LlJj96V4j rTWMlj02k3Cm2tEJj2YEmHqYlHoGlfA4S16eMLRJHpEo8ZU4hzk+MMKgPOEyK4UW7kf+ jvv+XFLbKe90kVV9T8QUk9bMITONIZZUwx0PA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=vHSp3KfhWKBTyYq5q7kUn6KSg7TobAIFxAYZQLxDQg4=; b=EbasfwOwoWMkx6dzwwXqsrBTgidyB3F5npWVCIcN0xAhtdPXbJXUKRYvQzPz0Fexin 1o+Y2q7fJofR2a+uvvVIk5rUGJqz+WZR7vJos/ksU8ZLC/hc56JlvNW6BjIIp+TnE3wp GDMXrX3YOx/tvVYABgmQai70v8SW9oG5TKxF8MpyjZO6VxoCB4bOt+qNHreVrxnfrBZF WXUPIgELc5xdcLL4YM3WffprtLO3cWtGIbi+fYfahbFrkUBrnmfWTy4Cpa5GF4bJ5HVI V0Iz3SR+etAhaa7xuyeNuOsXE+F8jSQnRCKNW71qcUYWKblEnBYroi5iYyecEmt1C6qH Qiqw== Received: by 10.14.179.1 with SMTP id g1mr90046061eem.14.1351720357755; Wed, 31 Oct 2012 14:52:37 -0700 (PDT) Received: from bremse.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id e7sm10446269eep.1.2012.10.31.14.52.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 14:52:37 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 31 Oct 2012 22:52:27 +0100 Message-Id: <1351720351-2688-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1351720351-2688-1-git-send-email-daniel.vetter@ffwll.ch> References: <1351720351-2688-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQk0QiZ0otMSRi9tyhrePRRFdju6v+J7Xukjd/UqaU5aXOBK4MmwPjE2qGjzwc+zlH//P+lX Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/5] drm/i915: check whether the pch is the soulmate of the cpu X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org We don't really support fancy north display/pch combinations, so put a big yelling WARN_ON in there. It /should/ be impossible, but alas, the rumours don't stop (mostly due to really early silicon sometimes using older PCHs). v2: Fixup the logic fumble noticed by Paulo Zanoni. I should actually try to test run the patch next time around ... Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6d0afc9..a5ece75 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -423,19 +423,23 @@ void intel_detect_pch(struct drm_device *dev) dev_priv->pch_type = PCH_IBX; dev_priv->num_pch_pll = 2; DRM_DEBUG_KMS("Found Ibex Peak PCH\n"); + WARN_ON(!IS_GEN5(dev)); } else if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_CPT; dev_priv->num_pch_pll = 2; DRM_DEBUG_KMS("Found CougarPoint PCH\n"); + WARN_ON(!(IS_GEN6(dev) || IS_IVYBRIDGE(dev))); } else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) { /* PantherPoint is CPT compatible */ dev_priv->pch_type = PCH_CPT; dev_priv->num_pch_pll = 2; DRM_DEBUG_KMS("Found PatherPoint PCH\n"); + WARN_ON(!(IS_GEN6(dev) || IS_IVYBRIDGE(dev))); } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_LPT; dev_priv->num_pch_pll = 0; DRM_DEBUG_KMS("Found LynxPoint PCH\n"); + WARN_ON(!IS_HASWELL(dev)); } BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); }