From patchwork Thu Apr 28 01:57:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 8965231 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 957959F1D3 for ; Thu, 28 Apr 2016 01:57:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B68F42028D for ; Thu, 28 Apr 2016 01:57:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DDDCA2021F for ; Thu, 28 Apr 2016 01:57:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D81DC6E39C; Thu, 28 Apr 2016 01:57:48 +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 28A3F6E39C; Thu, 28 Apr 2016 01:57:46 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3qwKj52cwcz9t6M; Thu, 28 Apr 2016 11:57:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1461808665; bh=cKTfLORW8dF2APP+RskM1KjqfreFkHM/tuTB3k8BkPk=; h=Date:From:To:Cc:Subject:From; b=YH00utpiLnY2ZCN1lKUGf09VpuOPbCOG6Bc4YTkTDYCxGPjrA6sC0m9m0R4x/cXZ5 SmJed2dvWK3xPfH4ZuV155auf56HtpapjRsZzgX+gcpOMYXkOha7GSr1sdOyydwOhN 9i5vXLiP0y23lsbEzkJ3HpJ+UPYYdATT/scXU3g0= Date: Thu, 28 Apr 2016 11:57:45 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , , Message-ID: <20160428115745.55890c80@canb.auug.org.au> MIME-Version: 1.0 Cc: Jani Nikula , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [Intel-gfx] linux-next: build failure after merge of the drm 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Hi Dave, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_prepare_ddi_buffer': drivers/gpu/drm/i915/intel_ddi.c:447:15: error: 'struct drm_i915_private' has no member named 'edp_low_vswing' if (dev_priv->edp_low_vswing) { ^ Caused by commit 06411f08b3f3 ("drm/i915: move edp low vswing config to vbt data") interacting with commit 992e7a41f9fc ("drm/i915: Fix eDP low vswing for Broadwell") from the drm-intel-fixes tree. I applied the following merge fixup patch (which is suggested by the "v3: Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing" comment in the drm-intel-fixes tree patch, but clearly could not be done there). From: Stephen Rothwell Date: Thu, 28 Apr 2016 11:53:36 +1000 Subject: [PATCH] drm/i915: fix up for edp_low_vswing change Signed-off-by: Stephen Rothwell Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 6080b5481984..e304857ba405 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -444,7 +444,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder) ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_dp = bdw_ddi_translations_dp; - if (dev_priv->edp_low_vswing) { + if (dev_priv->vbt.edp.low_vswing) { ddi_translations_edp = bdw_ddi_translations_edp; n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp); } else {