From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754446AbbHNEdZ (ORCPT ); Fri, 14 Aug 2015 00:33:25 -0400 Received: from gir.skynet.ie ([193.1.99.77]:34143 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753010AbbHNEdY (ORCPT ); Fri, 14 Aug 2015 00:33:24 -0400 Date: Fri, 14 Aug 2015 05:33:21 +0100 (IST) 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, back from holidays, found these in the cracks, one nouveau revert, one vmwgfx locking fix and a bunch of exynos fixes. Thanks, Dave. The following changes since commit 5b3e2e14eaa2a98232a4f292341fb88438685734: Merge tag 'dm-4.2-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (2015-08-13 13:52:46 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to d211d87e14d0c1b28a60cb6b512d162634ca6a99: Revert "drm/nouveau/fifo/gk104: kick channels when deactivating them" (2015-08-14 09:50:37 +1000) ---------------------------------------------------------------- Alexandre Courbot (1): Revert "drm/nouveau/fifo/gk104: kick channels when deactivating them" Andrzej Hajda (4): drm/exynos/hdmi: fix edid memory leak drm/exynos/mixer: fix interrupt clearing drm/exynos/mixer: correct vsync configuration sequence drm/exynos/mixer: always update INT_EN cache Dave Airlie (1): Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Hyungwon Hwang (1): drm/exynos: gsc: fix wrong bitwise operation for swap detection Marek Szyprowski (1): drm/exynos/fimc: fix runtime pm support Thomas Hellstrom (1): drm/vmwgfx: Fix execbuf locking issues drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 - drivers/gpu/drm/exynos/exynos_drm_gsc.c | 6 ++--- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +++++- drivers/gpu/drm/exynos/exynos_mixer.c | 21 +++++++++++------ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 29 +++++++----------------- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++-- 6 files changed, 32 insertions(+), 36 deletions(-) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [git pull] drm fixes Date: Fri, 14 Aug 2015 05:33:21 +0100 (IST) 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 31E4B6E865 for ; Thu, 13 Aug 2015 21:33:24 -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 CkhpIExpbnVzLAoKYmFjayBmcm9tIGhvbGlkYXlzLCBmb3VuZCB0aGVzZSBpbiB0aGUgY3JhY2tz LCBvbmUgbm91dmVhdSByZXZlcnQsCm9uZSB2bXdnZnggbG9ja2luZyBmaXggYW5kIGEgYnVuY2gg b2YgZXh5bm9zIGZpeGVzLgoKVGhhbmtzLApEYXZlLgoKVGhlIGZvbGxvd2luZyBjaGFuZ2VzIHNp bmNlIGNvbW1pdCA1YjNlMmUxNGVhYTJhOTgyMzJhNGYyOTIzNDFmYjg4NDM4Njg1NzM0OgoKICBN ZXJnZSB0YWcgJ2RtLTQuMi1maXhlcy01JyBvZiBnaXQ6Ly9naXQua2VybmVsLm9yZy9wdWIvc2Nt L2xpbnV4L2tlcm5lbC9naXQvZGV2aWNlLW1hcHBlci9saW51eC1kbSAoMjAxNS0wOC0xMyAxMzo1 Mjo0NiAtMDcwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBn aXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35haXJsaWVkL2xpbnV4IGRybS1maXhlcwoKZm9y IHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvIGQyMTFkODdlMTRkMGMxYjI4YTYwY2I2YjUxMmQx NjI2MzRjYTZhOTk6CgogIFJldmVydCAiZHJtL25vdXZlYXUvZmlmby9nazEwNDoga2ljayBjaGFu bmVscyB3aGVuIGRlYWN0aXZhdGluZyB0aGVtIiAoMjAxNS0wOC0xNCAwOTo1MDozNyArMTAwMCkK Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KQWxleGFuZHJlIENvdXJib3QgKDEpOgogICAgICBSZXZlcnQgImRybS9ub3V2ZWF1 L2ZpZm8vZ2sxMDQ6IGtpY2sgY2hhbm5lbHMgd2hlbiBkZWFjdGl2YXRpbmcgdGhlbSIKCkFuZHJ6 ZWogSGFqZGEgKDQpOgogICAgICBkcm0vZXh5bm9zL2hkbWk6IGZpeCBlZGlkIG1lbW9yeSBsZWFr CiAgICAgIGRybS9leHlub3MvbWl4ZXI6IGZpeCBpbnRlcnJ1cHQgY2xlYXJpbmcKICAgICAgZHJt L2V4eW5vcy9taXhlcjogY29ycmVjdCB2c3luYyBjb25maWd1cmF0aW9uIHNlcXVlbmNlCiAgICAg IGRybS9leHlub3MvbWl4ZXI6IGFsd2F5cyB1cGRhdGUgSU5UX0VOIGNhY2hlCgpEYXZlIEFpcmxp ZSAoMSk6CiAgICAgIE1lcmdlIGJyYW5jaCAnZXh5bm9zLWRybS1maXhlcycgb2YgZ2l0Oi8vZ2l0 Lmtlcm5lbC5vcmcvLi4uL2RhZWlua2kvZHJtLWV4eW5vcyBpbnRvIGRybS1maXhlcwoKSHl1bmd3 b24gSHdhbmcgKDEpOgogICAgICBkcm0vZXh5bm9zOiBnc2M6IGZpeCB3cm9uZyBiaXR3aXNlIG9w ZXJhdGlvbiBmb3Igc3dhcCBkZXRlY3Rpb24KCk1hcmVrIFN6eXByb3dza2kgKDEpOgogICAgICBk cm0vZXh5bm9zL2ZpbWM6IGZpeCBydW50aW1lIHBtIHN1cHBvcnQKClRob21hcyBIZWxsc3Ryb20g KDEpOgogICAgICBkcm0vdm13Z2Z4OiBGaXggZXhlY2J1ZiBsb2NraW5nIGlzc3VlcwoKIGRyaXZl cnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9maW1jLmMgICAgICAgICB8ICAxIC0KIGRyaXZl cnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nc2MuYyAgICAgICAgICB8ICA2ICsrLS0tCiBk cml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19oZG1pLmMgICAgICAgICAgICAgfCAgNyArKysr Ky0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX21peGVyLmMgICAgICAgICAgICB8IDIx ICsrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9m aWZvL2drMTA0LmMgfCAyOSArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYyAgICAgICAgICB8ICA0ICsrLS0KIDYgZmlsZXMgY2hh bmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRpb25zKC0pCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==