From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: build failure after merge of the drm tree Date: Thu, 28 Apr 2016 11:11:00 +0300 Message-ID: <87k2jii25n.fsf@intel.com> References: <20160428115745.55890c80@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160428115745.55890c80@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Stephen Rothwell , Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org T24gVGh1LCAyOCBBcHIgMjAxNiwgU3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcu YXU+IHdyb3RlOgo+IEhpIERhdmUsCj4KPiBBZnRlciBtZXJnaW5nIHRoZSBkcm0gdHJlZSwgdG9k YXkncyBsaW51eC1uZXh0IGJ1aWxkICh4ODZfNjQgYWxsbW9kY29uZmlnKQo+IGZhaWxlZCBsaWtl IHRoaXM6Cj4KPiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYzogSW4gZnVuY3Rpb24g J2ludGVsX3ByZXBhcmVfZGRpX2J1ZmZlcic6Cj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmM6NDQ3OjE1OiBlcnJvcjogJ3N0cnVjdCBkcm1faTkxNV9wcml2YXRlJyBoYXMgbm8gbWVt YmVyIG5hbWVkICdlZHBfbG93X3Zzd2luZycKPiAgICBpZiAoZGV2X3ByaXYtPmVkcF9sb3dfdnN3 aW5nKSB7Cj4gICAgICAgICAgICAgICAgXgo+Cj4gQ2F1c2VkIGJ5IGNvbW1pdAo+Cj4gICAwNjQx MWYwOGIzZjMgKCJkcm0vaTkxNTogbW92ZSBlZHAgbG93IHZzd2luZyBjb25maWcgdG8gdmJ0IGRh dGEiKQo+Cj4gaW50ZXJhY3Rpbmcgd2l0aCBjb21taXQKPgo+ICAgOTkyZTdhNDFmOWZjICgiZHJt L2k5MTU6IEZpeCBlRFAgbG93IHZzd2luZyBmb3IgQnJvYWR3ZWxsIikKPgo+IGZyb20gdGhlIGRy bS1pbnRlbC1maXhlcyB0cmVlLgo+Cj4gSSBhcHBsaWVkIHRoZSBmb2xsb3dpbmcgbWVyZ2UgZml4 dXAgcGF0Y2ggKHdoaWNoIGlzIHN1Z2dlc3RlZCBieSB0aGUgInYzOgo+IENoYW5nZSBkZXZfcHJp di0+ZWRwX2xvd192c3dpbmcgdG8gdXNlIGRldl9wcml2LT52YnQuZWRwLmxvd192c3dpbmciCj4g Y29tbWVudCBpbiB0aGUgZHJtLWludGVsLWZpeGVzIHRyZWUgcGF0Y2gsIGJ1dCBjbGVhcmx5IGNv dWxkIG5vdCBiZQo+IGRvbmUgdGhlcmUpLgo+Cj4gRnJvbTogU3RlcGhlbiBSb3Rod2VsbCA8c2Zy QGNhbmIuYXV1Zy5vcmcuYXU+Cj4gRGF0ZTogVGh1LCAyOCBBcHIgMjAxNiAxMTo1MzozNiArMTAw MAo+IFN1YmplY3Q6IFtQQVRDSF0gZHJtL2k5MTU6IGZpeCB1cCBmb3IgZWRwX2xvd192c3dpbmcg Y2hhbmdlCj4KPiBTaWduZWQtb2ZmLWJ5OiBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVn Lm9yZy5hdT4KCkZXSVcsCgpSZXZpZXdlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGlu dGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIHwgMiAr LQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKPgo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RkaS5jCj4gaW5kZXggNjA4MGI1NDgxOTg0Li5lMzA0ODU3YmE0MDUg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwo+IEBAIC00NDQsNyArNDQ0LDcgQEAgdm9p ZCBpbnRlbF9wcmVwYXJlX2RkaV9idWZmZXIoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIp Cj4gIAkJZGRpX3RyYW5zbGF0aW9uc19mZGkgPSBiZHdfZGRpX3RyYW5zbGF0aW9uc19mZGk7Cj4g IAkJZGRpX3RyYW5zbGF0aW9uc19kcCA9IGJkd19kZGlfdHJhbnNsYXRpb25zX2RwOwo+ICAKPiAt CQlpZiAoZGV2X3ByaXYtPmVkcF9sb3dfdnN3aW5nKSB7Cj4gKwkJaWYgKGRldl9wcml2LT52YnQu ZWRwLmxvd192c3dpbmcpIHsKPiAgCQkJZGRpX3RyYW5zbGF0aW9uc19lZHAgPSBiZHdfZGRpX3Ry YW5zbGF0aW9uc19lZHA7Cj4gIAkJCW5fZWRwX2VudHJpZXMgPSBBUlJBWV9TSVpFKGJkd19kZGlf dHJhbnNsYXRpb25zX2VkcCk7Cj4gIAkJfSBlbHNlIHsKPiAtLSAKPiAyLjcuMAoKLS0gCkphbmkg TmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752561AbcD1ILu (ORCPT ); Thu, 28 Apr 2016 04:11:50 -0400 Received: from mga14.intel.com ([192.55.52.115]:61515 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751679AbcD1ILO (ORCPT ); Thu, 28 Apr 2016 04:11:14 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,546,1455004800"; d="scan'208";a="968229415" From: Jani Nikula To: Stephen Rothwell , Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mika Kahola Subject: Re: linux-next: build failure after merge of the drm tree In-Reply-To: <20160428115745.55890c80@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20160428115745.55890c80@canb.auug.org.au> User-Agent: Notmuch/0.21+91~gada1e33 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 28 Apr 2016 11:11:00 +0300 Message-ID: <87k2jii25n.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 28 Apr 2016, Stephen Rothwell wrote: > 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 FWIW, 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 { > -- > 2.7.0 -- Jani Nikula, Intel Open Source Technology Center