From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612AbdCGEYi (ORCPT ); Mon, 6 Mar 2017 23:24:38 -0500 Received: from ozlabs.org ([103.22.144.67]:50093 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754148AbdCGEYa (ORCPT ); Mon, 6 Mar 2017 23:24:30 -0500 Date: Tue, 7 Mar 2017 11:10:19 +1100 From: Stephen Rothwell To: Maxime Ripard , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo , Chen-Yu Tsai Subject: linux-next: build failure after merge of the sunxi tree Message-ID: <20170307111019.246a9629@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, After merging the sunxi tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank': drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv' struct sun4i_drv *drv = scrtc->drv; ^ drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank': drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv' struct sun4i_drv *drv = scrtc->drv; ^ Caused by commit 50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs") from the drm-misc tree interacting with commit 1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc") from the sunxi tree. I added this merge fix patch: From: Stephen Rothwell Date: Tue, 7 Mar 2017 11:06:45 +1100 Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index a1634ff6eb40..7bbcedff9f07 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -106,11 +106,10 @@ static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = { static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc) { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); - struct sun4i_drv *drv = scrtc->drv; DRM_DEBUG_DRIVER("Enabling VBLANK on crtc %p\n", crtc); - sun4i_tcon_enable_vblank(drv->tcon, true); + sun4i_tcon_enable_vblank(scrtc->tcon, true); return 0; } @@ -118,11 +117,10 @@ static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc) static void sun4i_crtc_disable_vblank(struct drm_crtc *crtc) { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); - struct sun4i_drv *drv = scrtc->drv; DRM_DEBUG_DRIVER("Disabling VBLANK on crtc %p\n", crtc); - sun4i_tcon_enable_vblank(drv->tcon, false); + sun4i_tcon_enable_vblank(scrtc->tcon, false); } static const struct drm_crtc_funcs sun4i_crtc_funcs = { -- 2.11.0 -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the sunxi tree Date: Tue, 7 Mar 2017 11:10:19 +1100 Message-ID: <20170307111019.246a9629@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maxime Ripard , Daniel Vetter , Intel Graphics , DRI Cc: Chen-Yu Tsai , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKQWZ0ZXIgbWVyZ2luZyB0aGUgc3VueGkgdHJlZSwgdG9kYXkncyBsaW51eC1uZXh0 IGJ1aWxkIChhcm0KbXVsdGlfdjdfZGVmY29uZmlnKSBmYWlsZWQgbGlrZSB0aGlzOgoKZHJpdmVy cy9ncHUvZHJtL3N1bjRpL3N1bjRpX2NydGMuYzogSW4gZnVuY3Rpb24gJ3N1bjRpX2NydGNfZW5h YmxlX3ZibGFuayc6CmRyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9jcnRjLmM6MTA5OjMxOiBl cnJvcjogJ3N0cnVjdCBzdW40aV9jcnRjJyBoYXMgbm8gbWVtYmVyIG5hbWVkICdkcnYnCiAgc3Ry dWN0IHN1bjRpX2RydiAqZHJ2ID0gc2NydGMtPmRydjsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIF4KZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1bjRpX2NydGMuYzogSW4gZnVuY3Rpb24g J3N1bjRpX2NydGNfZGlzYWJsZV92YmxhbmsnOgpkcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlf Y3J0Yy5jOjEyMTozMTogZXJyb3I6ICdzdHJ1Y3Qgc3VuNGlfY3J0YycgaGFzIG5vIG1lbWJlciBu YW1lZCAnZHJ2JwogIHN0cnVjdCBzdW40aV9kcnYgKmRydiA9IHNjcnRjLT5kcnY7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBeCgpDYXVzZWQgYnkgY29tbWl0CgogIDUwNDgwYTc4ZTI4 MiAoImRybTogc3VuNGk6IHVzZSB2YmxhbmsgaG9va3MgaW4gc3RydWN0IGRybV9jcnRjX2Z1bmNz IikKCmZyb20gdGhlIGRybS1taXNjIHRyZWUgaW50ZXJhY3Rpbmcgd2l0aCBjb21taXQKCiAgMWI4 ZDEwOTU4NWRmICgiZHJtL3N1bjRpOiBBZGQgYmFja2VuZCBhbmQgdGNvbiBwb2ludGVycyB0byBz dW40aV9jcnRjIikKCmZyb20gdGhlIHN1bnhpIHRyZWUuCgpJIGFkZGVkIHRoaXMgbWVyZ2UgZml4 IHBhdGNoOgoKRnJvbTogU3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcuYXU+CkRh dGU6IFR1ZSwgNyBNYXIgMjAxNyAxMTowNjo0NSArMTEwMApTdWJqZWN0OiBbUEFUQ0hdIGRybTog c3VuNGk6IGZpeHVwIGZvciBzdHJ1Y3Qgc3VuNGlfY3J0YyBjaGFuZ2VzCgpTaWduZWQtb2ZmLWJ5 OiBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vc3VuNGkvc3VuNGlfY3J0Yy5jIHwgNiArKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3N1bjRpL3N1bjRpX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9jcnRjLmMK aW5kZXggYTE2MzRmZjZlYjQwLi43YmJjZWRmZjlmMDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9zdW40aS9zdW40aV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1bjRp X2NydGMuYwpAQCAtMTA2LDExICsxMDYsMTAgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0 Y19oZWxwZXJfZnVuY3Mgc3VuNGlfY3J0Y19oZWxwZXJfZnVuY3MgPSB7CiBzdGF0aWMgaW50IHN1 bjRpX2NydGNfZW5hYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0 IHN1bjRpX2NydGMgKnNjcnRjID0gZHJtX2NydGNfdG9fc3VuNGlfY3J0YyhjcnRjKTsKLQlzdHJ1 Y3Qgc3VuNGlfZHJ2ICpkcnYgPSBzY3J0Yy0+ZHJ2OwogCiAJRFJNX0RFQlVHX0RSSVZFUigiRW5h YmxpbmcgVkJMQU5LIG9uIGNydGMgJXBcbiIsIGNydGMpOwogCi0Jc3VuNGlfdGNvbl9lbmFibGVf dmJsYW5rKGRydi0+dGNvbiwgdHJ1ZSk7CisJc3VuNGlfdGNvbl9lbmFibGVfdmJsYW5rKHNjcnRj LT50Y29uLCB0cnVlKTsKIAogCXJldHVybiAwOwogfQpAQCAtMTE4LDExICsxMTcsMTAgQEAgc3Rh dGljIGludCBzdW40aV9jcnRjX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpjcnRjKQog c3RhdGljIHZvaWQgc3VuNGlfY3J0Y19kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiB7CiAJc3RydWN0IHN1bjRpX2NydGMgKnNjcnRjID0gZHJtX2NydGNfdG9fc3VuNGlfY3J0 YyhjcnRjKTsKLQlzdHJ1Y3Qgc3VuNGlfZHJ2ICpkcnYgPSBzY3J0Yy0+ZHJ2OwogCiAJRFJNX0RF QlVHX0RSSVZFUigiRGlzYWJsaW5nIFZCTEFOSyBvbiBjcnRjICVwXG4iLCBjcnRjKTsKIAotCXN1 bjRpX3Rjb25fZW5hYmxlX3ZibGFuayhkcnYtPnRjb24sIGZhbHNlKTsKKwlzdW40aV90Y29uX2Vu YWJsZV92Ymxhbmsoc2NydGMtPnRjb24sIGZhbHNlKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVj dCBkcm1fY3J0Y19mdW5jcyBzdW40aV9jcnRjX2Z1bmNzID0gewotLSAKMi4xMS4wCgotLSAKQ2hl ZXJzLApTdGVwaGVuIFJvdGh3ZWxsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=