From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753437AbdLFBV4 (ORCPT ); Tue, 5 Dec 2017 20:21:56 -0500 Received: from mga06.intel.com ([134.134.136.31]:47901 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753306AbdLFBVz (ORCPT ); Tue, 5 Dec 2017 20:21:55 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,366,1508828400"; d="scan'208";a="13463636" Date: Tue, 5 Dec 2017 17:21:54 -0800 From: Rodrigo Vivi To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , Linux-Next Mailing List , Hans de Goede , Linux Kernel Mailing List Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree Message-ID: <20171206012154.rzeyq6yuhhvsylxp@intel.com> References: <20171206120015.66d85f77@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171206120015.66d85f77@canb.auug.org.au> User-Agent: NeoMutt/20170912 (1.9.0) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 06, 2017 at 01:00:15AM +0000, Stephen Rothwell wrote: > Hi all, Hi Stephen, I had just written the email for you about this. Feel free to ignore that one since you already found the solution and sorry for the delay on warning you. > > 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. Yes, that's the right one. Thanks, Rodrigo. > > 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)) { > -- > 2.15.0 > > -- > Cheers, > Stephen Rothwell > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx