From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751837AbbCTVtq (ORCPT ); Fri, 20 Mar 2015 17:49:46 -0400 Received: from gir.skynet.ie ([193.1.99.77]:50592 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbbCTVto (ORCPT ); Fri, 20 Mar 2015 17:49:44 -0400 Date: Fri, 20 Mar 2015 21:49:37 +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, a bunch of fixes across drivers, radeon: disable two ended allocation for now, it breaks some stuff amdkfd: misc fixes nouveau: fix irq loop problem, add basic support for GM206 (new hw) i915: fix some WARNs people were seeing exynos: fix some iommu interactions causing boot failures In other news I've some problem with my git tree and git request-pull [airlied@dreadlord-bne-redhat-com linux]$ git request-pull linus/master origin warn: No match for commit 8265d4486d5c2448a1c645fdc20d4e62873d9c3d found at origin warn: Are you sure you pushed 'HEAD' there? is happening when I just had my branch on drm-fixes, I've made it master to generate this pull request so the branch name isn't missing, this might be due to my attempt to remove my own master branch, using git symbolic-ref HEAD refs/heads/drm-next, so I'll have to regen it next week I suppose. Dave. The following changes since commit 06e5801b8cb3fc057d88cb4dc03c0b64b2744cda: Linux 4.0-rc4 (2015-03-15 17:38:20 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux for you to fetch changes up to 8265d4486d5c2448a1c645fdc20d4e62873d9c3d: Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2015-03-20 17:32:21 +1000) ---------------------------------------------------------------- Alex Deucher (1): drm/radeon: drop ttm two ended allocation Andrzej Hajda (1): drm/exynos: remove unused files Ben Goz (3): drm/amdkfd: destroy mqd when destroying kernel queue drm/amdkfd: Fix SDMA queue init. in non-HWS mode drm/radeon: Changing number of compute pipe lines Ben Skeggs (3): drm/nouveau/fifo/nv04: remove the loop from the interrupt handler drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switch Charles Keepax (1): drm/exynos: Check for NULL dereference of crtc Damien Lespiau (1): drm/i915: Make sure the primary plane is enabled before reading out the fb state Dan Carpenter (1): drm/exynos: IS_ERR() vs NULL bug Dave Airlie (5): Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes Hyungwon Hwang (1): drm/exynos: fix the initialization order in FIMD Inki Dae (1): drm/exynos: fix typo config name correctly. Stefan Huehner (2): drm/nouveau/device/gm100: Basic GM206 bring up (as copy of GM204) drm/nouveau/bios: fix i2c table parsing for dcb 4.1 Xi Ruoyao (1): drm/i915: Ensure plane->state->fb stays in sync with plane->fb .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 22 +- drivers/gpu/drm/exynos/Kconfig | 2 +- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_connector.c | 245 --------------------- drivers/gpu/drm/exynos/exynos_drm_connector.h | 20 -- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 29 +-- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 32 ++- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 +- drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c | 43 ++++ drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 85 +++---- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/bios/i2c.c | 6 +- drivers/gpu/drm/radeon/radeon_kfd.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 11 - 18 files changed, 159 insertions(+), 372 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.h From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [git pull] drm fixes Date: Fri, 20 Mar 2015 21:49:37 +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 ESMTP id 3FBF46ED01 for ; Fri, 20 Mar 2015 14:49:42 -0700 (PDT) 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 CkhpIExpbnVzLAoKYSBidW5jaCBvZiBmaXhlcyBhY3Jvc3MgZHJpdmVycywKcmFkZW9uOiBkaXNh YmxlIHR3byBlbmRlZCBhbGxvY2F0aW9uIGZvciBub3csIGl0IGJyZWFrcyBzb21lIHN0dWZmCmFt ZGtmZDogbWlzYyBmaXhlcwpub3V2ZWF1OiBmaXggaXJxIGxvb3AgcHJvYmxlbSwgYWRkIGJhc2lj IHN1cHBvcnQgZm9yIEdNMjA2IChuZXcgaHcpCmk5MTU6IGZpeCBzb21lIFdBUk5zIHBlb3BsZSB3 ZXJlIHNlZWluZwpleHlub3M6IGZpeCBzb21lIGlvbW11IGludGVyYWN0aW9ucyBjYXVzaW5nIGJv b3QgZmFpbHVyZXMKCkluIG90aGVyIG5ld3MgSSd2ZSBzb21lIHByb2JsZW0gd2l0aCBteSBnaXQg dHJlZSBhbmQgZ2l0IHJlcXVlc3QtcHVsbApbYWlybGllZEBkcmVhZGxvcmQtYm5lLXJlZGhhdC1j b20gbGludXhdJCBnaXQgcmVxdWVzdC1wdWxsIGxpbnVzL21hc3RlciBvcmlnaW4Kd2FybjogTm8g bWF0Y2ggZm9yIGNvbW1pdCA4MjY1ZDQ0ODZkNWMyNDQ4YTFjNjQ1ZmRjMjBkNGU2Mjg3M2Q5YzNk IGZvdW5kIGF0IG9yaWdpbgp3YXJuOiBBcmUgeW91IHN1cmUgeW91IHB1c2hlZCAnSEVBRCcgdGhl cmU/CgppcyBoYXBwZW5pbmcgd2hlbiBJIGp1c3QgaGFkIG15IGJyYW5jaCBvbiBkcm0tZml4ZXMs IEkndmUgbWFkZSBpdCBtYXN0ZXIKdG8gZ2VuZXJhdGUgdGhpcyBwdWxsIHJlcXVlc3Qgc28gdGhl IGJyYW5jaCBuYW1lIGlzbid0IG1pc3NpbmcsIHRoaXMKbWlnaHQgYmUgZHVlIHRvIG15IGF0dGVt cHQgdG8gcmVtb3ZlIG15IG93biBtYXN0ZXIgYnJhbmNoLCB1c2luZyAKZ2l0IHN5bWJvbGljLXJl ZiBIRUFEIHJlZnMvaGVhZHMvZHJtLW5leHQsIHNvIEknbGwgaGF2ZSB0byByZWdlbiBpdCBuZXh0 CndlZWsgSSBzdXBwb3NlLgoKRGF2ZS4KClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21t aXQgMDZlNTgwMWI4Y2IzZmMwNTdkODhjYjRkYzAzYzBiNjRiMjc0NGNkYToKCiAgTGludXggNC4w LXJjNCAoMjAxNS0wMy0xNSAxNzozODoyMCAtMDcwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIGdp dCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35haXJsaWVk L2xpbnV4IAoKZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvIDgyNjVkNDQ4NmQ1YzI0NDhh MWM2NDVmZGMyMGQ0ZTYyODczZDljM2Q6CgogIE1lcmdlIHRhZyAnZHJtLWludGVsLWZpeGVzLTIw MTUtMDMtMTknIG9mIGdpdDovL2Fub25naXQuZnJlZWRlc2t0b3Aub3JnL2RybS1pbnRlbCBpbnRv IGRybS1maXhlcyAoMjAxNS0wMy0yMCAxNzozMjoyMSArMTAwMCkKCi0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQWxleCBEZXVj aGVyICgxKToKICAgICAgZHJtL3JhZGVvbjogZHJvcCB0dG0gdHdvIGVuZGVkIGFsbG9jYXRpb24K CkFuZHJ6ZWogSGFqZGEgKDEpOgogICAgICBkcm0vZXh5bm9zOiByZW1vdmUgdW51c2VkIGZpbGVz CgpCZW4gR296ICgzKToKICAgICAgZHJtL2FtZGtmZDogZGVzdHJveSBtcWQgd2hlbiBkZXN0cm95 aW5nIGtlcm5lbCBxdWV1ZQogICAgICBkcm0vYW1ka2ZkOiBGaXggU0RNQSBxdWV1ZSBpbml0LiBp biBub24tSFdTIG1vZGUKICAgICAgZHJtL3JhZGVvbjogQ2hhbmdpbmcgbnVtYmVyIG9mIGNvbXB1 dGUgcGlwZSBsaW5lcwoKQmVuIFNrZWdncyAoMyk6CiAgICAgIGRybS9ub3V2ZWF1L2ZpZm8vbnYw NDogcmVtb3ZlIHRoZSBsb29wIGZyb20gdGhlIGludGVycnVwdCBoYW5kbGVyCiAgICAgIGRybS9u b3V2ZWF1L2dyL2dmMTAwOiBmaXggc29tZSBhY2NpZGVudGFsIG9yJ2luZyBvZiBidWZmZXIgYWRk cmVzc2VzCiAgICAgIGRybS9ub3V2ZWF1L2RldmljZTogcG9zdCB3cml0ZSB0byBOVl9QTUNfQk9P VF8xIHdoZW4gZmxpcHBpbmcgZW5kaWFuIHN3aXRjaAoKQ2hhcmxlcyBLZWVwYXggKDEpOgogICAg ICBkcm0vZXh5bm9zOiBDaGVjayBmb3IgTlVMTCBkZXJlZmVyZW5jZSBvZiBjcnRjCgpEYW1pZW4g TGVzcGlhdSAoMSk6CiAgICAgIGRybS9pOTE1OiBNYWtlIHN1cmUgdGhlIHByaW1hcnkgcGxhbmUg aXMgZW5hYmxlZCBiZWZvcmUgcmVhZGluZyBvdXQgdGhlIGZiIHN0YXRlCgpEYW4gQ2FycGVudGVy ICgxKToKICAgICAgZHJtL2V4eW5vczogSVNfRVJSKCkgdnMgTlVMTCBidWcKCkRhdmUgQWlybGll ICg1KToKICAgICAgTWVyZ2UgYnJhbmNoICdsaW51eC00LjAnIG9mIGdpdDovL2Fub25naXQuZnJl ZWRlc2t0b3Aub3JnL2dpdC9ub3V2ZWF1L2xpbnV4LTIuNiBpbnRvIGRybS1maXhlcwogICAgICBN ZXJnZSBicmFuY2ggJ2V4eW5vcy1kcm0tZml4ZXMnIG9mIGdpdDovL2dpdC5rZXJuZWwub3JnLy4u Li9kYWVpbmtpL2RybS1leHlub3MgaW50byBkcm0tZml4ZXMKICAgICAgTWVyZ2UgYnJhbmNoICdk cm0tZml4ZXMtNC4wJyBvZiBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35hZ2Q1Zi9saW51 eCBpbnRvIGRybS1maXhlcwogICAgICBNZXJnZSB0YWcgJ2RybS1hbWRrZmQtZml4ZXMtMjAxNS0w My0xOScgb2YgZ2l0Oi8vcGVvcGxlLmZyZWVkZXNrdG9wLm9yZy9+Z2FiYmF5by9saW51eCBpbnRv IGRybS1maXhlcwogICAgICBNZXJnZSB0YWcgJ2RybS1pbnRlbC1maXhlcy0yMDE1LTAzLTE5JyBv ZiBnaXQ6Ly9hbm9uZ2l0LmZyZWVkZXNrdG9wLm9yZy9kcm0taW50ZWwgaW50byBkcm0tZml4ZXMK Ckh5dW5nd29uIEh3YW5nICgxKToKICAgICAgZHJtL2V4eW5vczogZml4IHRoZSBpbml0aWFsaXph dGlvbiBvcmRlciBpbiBGSU1ECgpJbmtpIERhZSAoMSk6CiAgICAgIGRybS9leHlub3M6IGZpeCB0 eXBvIGNvbmZpZyBuYW1lIGNvcnJlY3RseS4KClN0ZWZhbiBIdWVobmVyICgyKToKICAgICAgZHJt L25vdXZlYXUvZGV2aWNlL2dtMTAwOiBCYXNpYyBHTTIwNiBicmluZyB1cCAoYXMgY29weSBvZiBH TTIwNCkKICAgICAgZHJtL25vdXZlYXUvYmlvczogZml4IGkyYyB0YWJsZSBwYXJzaW5nIGZvciBk Y2IgNC4xCgpYaSBSdW95YW8gKDEpOgogICAgICBkcm0vaTkxNTogRW5zdXJlIHBsYW5lLT5zdGF0 ZS0+ZmIgc3RheXMgaW4gc3luYyB3aXRoIHBsYW5lLT5mYgoKIC4uLi9ncHUvZHJtL2FtZC9hbWRr ZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMgIHwgIDEwICstCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGtmZC9rZmRfa2VybmVsX3F1ZXVlLmMgICAgICB8ICAyMiArLQogZHJpdmVycy9ncHUv ZHJtL2V4eW5vcy9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgfCAgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9leHlub3MvZXh5bm9zN19kcm1fZGVjb24uYyAgICAgICAgIHwgICA0ICstCiBkcml2 ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fY29ubmVjdG9yLmMgICAgICB8IDI0NSAtLS0t LS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9jb25u ZWN0b3IuaCAgICAgIHwgIDIwIC0tCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1f ZmltZC5jICAgICAgICAgICB8ICAyOSArLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9z X2RybV9wbGFuZS5jICAgICAgICAgIHwgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgICAgICAgICAgICAgICB8ICAzMiArKy0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L252a20vZW5naW5lL2RldmljZS9iYXNlLmMgIHwgICA2ICstCiBkcml2ZXJzL2dwdS9kcm0v bm91dmVhdS9udmttL2VuZ2luZS9kZXZpY2UvZ20xMDAuYyB8ICA0MyArKysrCiBkcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZvL252MDQuYyAgICB8ICA4NSArKystLS0tCiBk cml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9nci9jdHhnZjEwMC5jICB8ICAgNCAr LQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZ3IvY3R4Z2sxMDQuYyAgfCAg IDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vZW5naW5lL2dyL2N0eGdtMTA3LmMg IHwgICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9iaW9zL2kyYy5j ICAgICB8ICAgNiArLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa2ZkLmMgICAgICAg ICAgICAgICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX29iamVjdC5j ICAgICAgICAgICAgIHwgIDExIC0KIDE4IGZpbGVzIGNoYW5nZWQsIDE1OSBpbnNlcnRpb25zKCsp LCAzNzIgZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL2V4 eW5vcy9leHlub3NfZHJtX2Nvbm5lY3Rvci5jCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9n cHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2Nvbm5lY3Rvci5oCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==