From patchwork Fri Jul 15 03:40:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9231141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B67DA60574 for ; Fri, 15 Jul 2016 03:41:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5A8228324 for ; Fri, 15 Jul 2016 03:41:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9977428326; Fri, 15 Jul 2016 03:41:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E830D28324 for ; Fri, 15 Jul 2016 03:41:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1105B6E045; Fri, 15 Jul 2016 03:41:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA1C16E045; Fri, 15 Jul 2016 03:40:55 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3rrJJ46Qssz9sBf; Fri, 15 Jul 2016 13:40:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1468554052; bh=7QFxgPBHX8njW+xEO1Yc5DNPhy+vSVK2sQNStM1A/ts=; h=Date:From:To:Cc:Subject:From; b=ObBvG+hMGSwU4loyOBalACZ4+qWqSj+rgpiQR56brm3Bqu1tJA5yC0Ll/sRr9YGxc sqqfMhtjtCuBd9+nemWUgjs9LHZePP1n7JTgcXzCy8XXX7fTvBbzGSVwscoFQQ/5/x DpVoM5nsKyTsEvw9fHpUgkZIfvCGpozm14bDYTro= Date: Fri, 15 Jul 2016 13:40:52 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , , Subject: linux-next: build failure after merge of the drm tree Message-ID: <20160715134052.030a8c15@canb.auug.org.au> MIME-Version: 1.0 Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Dave, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/i915/intel_opregion.c:34:0: drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_get_panel_type': drivers/gpu/drm/i915/intel_opregion.c:1042:17: error: 'dev' undeclared (first use in this function) if (IS_SKYLAKE(dev)) { ^ drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__' if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \ ^ drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO' #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake) ^ drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE' if (IS_SKYLAKE(dev)) { ^ drivers/gpu/drm/i915/intel_opregion.c:1042:17: note: each undeclared identifier is reported only once for each function it appears in if (IS_SKYLAKE(dev)) { ^ drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__' if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \ ^ drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO' #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake) ^ drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE' if (IS_SKYLAKE(dev)) { ^ Caused by commit 6f9f4b7a2cf7 ("drm/i915/opregion: Convert to using native drm_i915_private") interacting with commit aeddda06c1a7 ("drm/i915: Ignore panel type from OpRegion on SKL") from the drm-intel-fixes tree. I applied this merge fix patch: From: Stephen Rothwell Date: Fri, 15 Jul 2016 13:34:05 +1000 Subject: [PATCH] drm/i915/opregion: fix up for argument change Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 21f19641e33e..dcdb346b596c 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -1039,7 +1039,7 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv) * vswing instead. Low vswing results in some display flickers, so * let's simply ignore the OpRegion panel type on SKL for now. */ - if (IS_SKYLAKE(dev)) { + if (IS_SKYLAKE(dev_priv)) { DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1); return -ENODEV; }