From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbbKKCn1 (ORCPT ); Tue, 10 Nov 2015 21:43:27 -0500 Received: from gir.skynet.ie ([193.1.99.77]:51560 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752403AbbKKCn0 (ORCPT ); Tue, 10 Nov 2015 21:43:26 -0500 Date: Wed, 11 Nov 2015 02:43:23 +0000 (GMT) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: torvalds@linux-foundation.org cc: DRI mailing list , linux-kernel@vger.kernel.org Subject: [git pull] drm fixes Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Two build fixes, one for VC4, one for nouveau where the ARM only code is doing something a bit strange. While people are discussing that, just workaround it and fix the build for now. The code in question will never get used on anything non-ARM anyways. Also one fix for AST that SuSE had been hiding in their kernel, that allows all fbdev apps to work on that driver. Dave. The following changes since commit 816d2206f0f9953ca854e4ff1a2749a5cbd62715: Merge tag 'drm-intel-next-fixes-2015-11-06' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-11-07 17:16:59 +1000) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to 10855aeb1e78533c041065b33e34315e1f381c2e: drm/nouveau: fix build failures on all non ARM. (2015-11-11 12:37:57 +1000) ---------------------------------------------------------------- Dave Airlie (1): drm/nouveau: fix build failures on all non ARM. Egbert Eich (1): drm/ast: Initialized data needed to map fbdev memory Guenter Roeck (1): drm/vc4: Add dependency on HAVE_DMA_ATTRS, and select DRM_GEM_CMA_HELPER drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_fb.c | 7 +++++++ drivers/gpu/drm/ast/ast_main.c | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 6 ++++++ drivers/gpu/drm/vc4/Kconfig | 3 ++- 6 files changed, 19 insertions(+), 1 deletion(-) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [git pull] drm fixes Date: Wed, 11 Nov 2015 02:43:23 +0000 (GMT) Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from gir.skynet.ie (gir.skynet.ie [193.1.99.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3A356E3E3 for ; Tue, 10 Nov 2015 18:43:25 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: torvalds@linux-foundation.org Cc: linux-kernel@vger.kernel.org, DRI mailing list List-Id: dri-devel@lists.freedesktop.org CkhpIExpbnVzLAoKVHdvIGJ1aWxkIGZpeGVzLCBvbmUgZm9yIFZDNCwgb25lIGZvciBub3V2ZWF1 IHdoZXJlIHRoZSBBUk0gb25seSBjb2RlIGlzIApkb2luZyBzb21ldGhpbmcgYSBiaXQgc3RyYW5n ZS4gV2hpbGUgcGVvcGxlIGFyZSBkaXNjdXNzaW5nIHRoYXQsIGp1c3QgCndvcmthcm91bmQgaXQg YW5kIGZpeCB0aGUgYnVpbGQgZm9yIG5vdy4gVGhlIGNvZGUgaW4gcXVlc3Rpb24gd2lsbCBuZXZl ciAKZ2V0IHVzZWQgb24gYW55dGhpbmcgbm9uLUFSTSBhbnl3YXlzLgoKQWxzbyBvbmUgZml4IGZv ciBBU1QgdGhhdCBTdVNFIGhhZCBiZWVuIGhpZGluZyBpbiB0aGVpciBrZXJuZWwsIHRoYXQgCmFs bG93cyBhbGwgZmJkZXYgYXBwcyB0byB3b3JrIG9uIHRoYXQgZHJpdmVyLgoKRGF2ZS4KClRoZSBm b2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21taXQgODE2ZDIyMDZmMGY5OTUzY2E4NTRlNGZmMWEy NzQ5YTVjYmQ2MjcxNToKCiAgTWVyZ2UgdGFnICdkcm0taW50ZWwtbmV4dC1maXhlcy0yMDE1LTEx LTA2JyBvZiBnaXQ6Ly9hbm9uZ2l0LmZyZWVkZXNrdG9wLm9yZy9kcm0taW50ZWwgaW50byBkcm0t bmV4dCAoMjAxNS0xMS0wNyAxNzoxNjo1OSArMTAwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIGdp dCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35haXJsaWVk L2xpbnV4IGRybS1maXhlcwoKZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvIDEwODU1YWVi MWU3ODUzM2MwNDEwNjViMzNlMzQzMTVlMWYzODFjMmU6CgogIGRybS9ub3V2ZWF1OiBmaXggYnVp bGQgZmFpbHVyZXMgb24gYWxsIG5vbiBBUk0uICgyMDE1LTExLTExIDEyOjM3OjU3ICsxMDAwKQoK LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQpEYXZlIEFpcmxpZSAoMSk6CiAgICAgIGRybS9ub3V2ZWF1OiBmaXggYnVpbGQgZmFp bHVyZXMgb24gYWxsIG5vbiBBUk0uCgpFZ2JlcnQgRWljaCAoMSk6CiAgICAgIGRybS9hc3Q6IElu aXRpYWxpemVkIGRhdGEgbmVlZGVkIHRvIG1hcCBmYmRldiBtZW1vcnkKCkd1ZW50ZXIgUm9lY2sg KDEpOgogICAgICBkcm0vdmM0OiBBZGQgZGVwZW5kZW5jeSBvbiBIQVZFX0RNQV9BVFRSUywgYW5k IHNlbGVjdCBEUk1fR0VNX0NNQV9IRUxQRVIKCiBkcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9kcnYu aCAgICAgICAgICAgICAgICAgICAgICAgfCAxICsKIGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X2Zi LmMgICAgICAgICAgICAgICAgICAgICAgICB8IDcgKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2Fz dC9hc3RfbWFpbi5jICAgICAgICAgICAgICAgICAgICAgIHwgMSArCiBkcml2ZXJzL2dwdS9kcm0v YXN0L2FzdF9tb2RlLmMgICAgICAgICAgICAgICAgICAgICAgfCAyICsrCiBkcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9udmttL3N1YmRldi9pbnN0bWVtL2drMjBhLmMgfCA2ICsrKysrKwogZHJpdmVy cy9ncHUvZHJtL3ZjNC9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgICAgIHwgMyArKy0KIDYg ZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=