From patchwork Wed Dec 6 01:00:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10094601 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 AD99B60329 for ; Wed, 6 Dec 2017 01:00:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D43328978 for ; Wed, 6 Dec 2017 01:00:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BC9C29D03; Wed, 6 Dec 2017 01:00:42 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6CA9129BEA for ; Wed, 6 Dec 2017 01:00:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6325C6E180; Wed, 6 Dec 2017 01:00:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B3DF6E180; Wed, 6 Dec 2017 01:00:19 +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 3ys0dq1kKhz9sNr; Wed, 6 Dec 2017 12:00:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1512522015; bh=POmlEScMta/eivtn2YScWx4rRIIiJRGhIw90jF3HurQ=; h=Date:From:To:Cc:Subject:From; b=HZ3VGm3tsVNlKLBSuG2EsMvEkc3b6M51VK7iO2J9OhRrVV7vouycYRxC3blOkXvpp VCzSZiRmRf8g9zu3DIQh5k1Vff+b+QaoPEOQUQN5M+kKvgAiz1Jw4rYoccY104MfC4 4MaoRoJiwvvg4kWI7Z9aSE0hLPx4BqQM/2hiwvYQViynQlZkyRHXi4CFlVtU0Zc88T SJUvXPXMML2Y5HKrBbpFGsl3vJDJF0Mh8ih6HeheQNnFX7Rts2FpzF/6DxvMcp3Zg2 DamfO10mGTIoeCDgRYCAf+QOxkUytkaIcN2iMvd9vOHi+DtWOgdrokEdARkeY2Qt5p d9+KXz7tejj/Q== Date: Wed, 6 Dec 2017 12:00:15 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20171206120015.66d85f77@canb.auug.org.au> MIME-Version: 1.0 Cc: Linux-Next Mailing List , Hans de Goede , Linux Kernel Mailing List Subject: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/intel_dsi.c: In function 'intel_dsi_get_panel_orientation': drivers/gpu/drm/i915/intel_dsi.c:1673:13: error: storage size of 'plane' isn't known enum plane plane; ^ Caused by commit 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.") interacting with commit ed15030d7ab0 ("drm/i915: s/enum plane/enum i9xx_plane_id/") from the drm-intel tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Wed, 6 Dec 2017 11:56:32 +1100 Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum i9xx_plane_id/" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/intel_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 1b60df3c14a0..f67d321376e4 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL; - enum plane plane; + enum i9xx_plane_id plane; u32 val; if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {