From patchwork Mon Jan 19 20:13:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 5660931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2BCFE9F357 for ; Mon, 19 Jan 2015 20:14:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5805720212 for ; Mon, 19 Jan 2015 20:14:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 46C37201FB for ; Mon, 19 Jan 2015 20:14:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 296AE6E5AD; Mon, 19 Jan 2015 12:13:59 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 783716E5A8 for ; Mon, 19 Jan 2015 12:13:57 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 19 Jan 2015 12:10:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,429,1418112000"; d="scan'208";a="514460582" Received: from rdvivi-talin.jf.intel.com ([10.7.196.79]) by orsmga003.jf.intel.com with ESMTP; 19 Jan 2015 12:07:23 -0800 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Mon, 19 Jan 2015 12:13:55 -0800 Message-Id: <1421698435-13617-1-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.1.0 Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH] drm/i915: Don't WARN on BDW when PCH is propperly identified. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have BDW that PCH might not be propperly identified and we force it to be LPT. However when we correctly identify it is LPT we incorrectly WARN that this isn't a Haswell. For now we have many platforms out there we still need to force LPT so let's keep the force below, but let's remove the WARN when everything is propperly identified. For reference we started receiving logs with this uncessary and incorrect WARN. Signed-off-by: Rodrigo Vivi Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972 Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 308774f..d4ed3a9 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -462,7 +462,7 @@ void intel_detect_pch(struct drm_device *dev) } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_LPT; DRM_DEBUG_KMS("Found LynxPoint PCH\n"); - WARN_ON(!IS_HASWELL(dev)); + WARN_ON(!IS_HASWELL(dev) || !IS_BROADWELL(dev)); WARN_ON(IS_HSW_ULT(dev)); } else if (IS_BROADWELL(dev)) { dev_priv->pch_type = PCH_LPT;