From patchwork Tue Jul 3 18:57:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1152801 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 67A9B3FE4F for ; Tue, 3 Jul 2012 18:57:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DC4CA0870 for ; Tue, 3 Jul 2012 11:57:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yw0-f49.google.com (mail-yw0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 873D99E804 for ; Tue, 3 Jul 2012 11:57:41 -0700 (PDT) Received: by yhjj52 with SMTP id j52so7707754yhj.36 for ; Tue, 03 Jul 2012 11:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=hiEBErIG46qpxA5s8yL9oweV6QVN3uNhmjscQ8Fv828=; b=V5W2QhaY8xjfUhnEXg4ulDghEcEz9BOSeA6OhaxwOJdurXStDewlD7ckpRqPzeUyDl cNNYNnfnKt4eH/aBRoduMr5IWxHNHBJYpHjoxuBe8mFhnG7xgWGQ+SuUzibD7swsvVXl xez+hzqAjbjxX1fDG1HLWvgDW+1oXil70+ZrrjTFuDRR8nCLSCxdo5eJ8KyVKIsrQ4Xm qP4WoHchURmiSIy1KzF8E5A5whDIhoqLMuZRPoAH7r8VhAwVrpZY7oAW07ijVR33iHA0 kw+lwIXtLHUBla33tG2CwyESUQ6sVwfiyf1SzSTv/2naNPAw65ugdhK9il/VzmW4ilUn hg3Q== Received: by 10.100.231.2 with SMTP id d2mr6430338anh.41.1341341860905; Tue, 03 Jul 2012 11:57:40 -0700 (PDT) Received: from vicky.domain.invalid (189.26.42.14.dynamic.adsl.gvt.net.br. [189.26.42.14]) by mx.google.com with ESMTPS id a64sm33216753yhe.11.2012.07.03.11.57.39 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 11:57:40 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 3 Jul 2012 15:57:31 -0300 Message-Id: <1341341853-4092-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 1/3] drm/i915: add PCH_NONE to enum intel_pch 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 From: Paulo Zanoni And rely on the fact that it's 0 to assume that machines without a PCH will have PCH_NONE as dev_priv->pch_type. Just today I finally realized that HAS_PCH_IBX is true for machines without a PCH. IMHO this is totally counter-intuitive and I don't think it's a good idea to assume that we're going to check for HAS_PCH_IBX only after we check for HAS_PCH_SPLIT. I believe that in the future we'll have more PCH types and checks like: if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) will become more and more common. There's a good chance that we may break non-PCH machines by adding these checks in code that runs on all machines. I also believe that the HAS_PCH_SPLIT check will become less common as we add more and more different PCH types. Also: are we sure we don't already have any bugs triggered by checking for HAS_PCH_IBX on non-PCH machines? Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_drv.h | 1 + 1 file changed, 1 insertion(+) Another alternative would have been to change HAS_PCH_IBX to also check for HAS_PCH_SPLIT, but I'm not exactly in favor of adding more conditionals... diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b7a1eaa..b12e79a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -333,6 +333,7 @@ enum no_fbc_reason { }; enum intel_pch { + PCH_NONE = 0, /* No PCH present */ PCH_IBX, /* Ibexpeak PCH */ PCH_CPT, /* Cougarpoint PCH */ PCH_LPT, /* Lynxpoint PCH */