From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756486AbcBQFoE (ORCPT ); Wed, 17 Feb 2016 00:44:04 -0500 Received: from gir.skynet.ie ([193.1.99.77]:48087 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756461AbcBQFoD (ORCPT ); Wed, 17 Feb 2016 00:44:03 -0500 Date: Wed, 17 Feb 2016 05:43:57 +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, This has two main sets of fixse, A bunch of Exynos fixes, mainly for their MIC component. vblank regression fixes from Mario, apparantly some changes in 4.4 caused some vblank breakage on radeon/nouveau, this set fixes all the issues seen. There is also a revert of one of the MST changse, that I was overzealous in including, that broke 30" MST monitors, and two qxl fixes. Dave. The following changes since commit 65c23c65bee479faceb042a52f5a7278dfa8d972: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (2016-02-16 10:52:59 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to dada168b3b76439d83aff34f8fbd9c512c2d136a: drm/qxl: fix erroneous return value (2016-02-17 15:39:35 +1000) ---------------------------------------------------------------- Andrzej Hajda (1): drm/exynos/decon: fix disable clocks order Anton Protopopov (1): drm/qxl: fix erroneous return value Dave Airlie (2): Revert "drm/dp/mst: change MST detection scheme" Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Gerd Hoffmann (1): drm/qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command Joonyoung Shim (1): drm/exynos: depend on ARCH_EXYNOS for DRM_EXYNOS Marek Szyprowski (9): drm/exynos: ipp: fix incorrect format specifiers in debug messages drm/exynos: fix types for compilation on 64bit architectures drm/exynos: mic: use devm_clk interface drm/exynos: mic: convert to component framework drm/exynos: mic: make all functions static drm/exynos: dsi: restore support for drm bridge drm/exynos: exynos5433_decon: fix wrong state assignment in decon_enable drm/exynos: exynos5433_decon: fix wrong state in decon_vblank_enable drm/exynos: fix incorrect cpu address for dma_mmap_attrs() Mario Kleiner (6): drm: No-Op redundant calls to drm_vblank_off() (v2) drm: Prevent vblank counter bumps > 1 with active vblank clients. (v2) drm: Fix drm_vblank_pre/post_modeset regression from Linux 4.4 drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2) drm/radeon/pm: Handle failure of drm_vblank_get. drm/nouveau/display: Enable vblank irqs after display engine is on again. drivers/gpu/drm/drm_dp_mst_topology.c | 37 +++++++------- drivers/gpu/drm/drm_irq.c | 73 +++++++++++++++++++++++++-- drivers/gpu/drm/exynos/Kconfig | 2 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 8 ++- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 5 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 32 ++++++------ drivers/gpu/drm/exynos/exynos_drm_mic.c | 72 +++++++++++++++----------- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +-- drivers/gpu/drm/nouveau/nouveau_display.c | 8 +-- drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +- drivers/gpu/drm/qxl/qxl_prime.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 8 ++- 18 files changed, 178 insertions(+), 93 deletions(-) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [git pull] drm fixes Date: Wed, 17 Feb 2016 05:43:57 +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 8A94D6E230 for ; Wed, 17 Feb 2016 05:44:03 +0000 (UTC) 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 CkhpIExpbnVzLAoKVGhpcyBoYXMgdHdvIG1haW4gc2V0cyBvZiBmaXhzZSwKCkEgYnVuY2ggb2Yg RXh5bm9zIGZpeGVzLCBtYWlubHkgZm9yIHRoZWlyIE1JQyBjb21wb25lbnQuCgp2YmxhbmsgcmVn cmVzc2lvbiBmaXhlcyBmcm9tIE1hcmlvLCBhcHBhcmFudGx5IHNvbWUgY2hhbmdlcwppbiA0LjQg Y2F1c2VkIHNvbWUgdmJsYW5rIGJyZWFrYWdlIG9uIHJhZGVvbi9ub3V2ZWF1LCB0aGlzCnNldCBm aXhlcyBhbGwgdGhlIGlzc3VlcyBzZWVuLgoKVGhlcmUgaXMgYWxzbyBhIHJldmVydCBvZiBvbmUg b2YgdGhlIE1TVCBjaGFuZ3NlLCB0aGF0IEkgd2FzCm92ZXJ6ZWFsb3VzIGluIGluY2x1ZGluZywg dGhhdCBicm9rZSAzMCIgTVNUIG1vbml0b3JzLCBhbmQKdHdvIHF4bCBmaXhlcy4KCkRhdmUuCgpU aGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29tbWl0IDY1YzIzYzY1YmVlNDc5ZmFjZWIwNDJh NTJmNWE3Mjc4ZGZhOGQ5NzI6CgogIE1lcmdlIGJyYW5jaCAnZm9yLW5leHQnIG9mIGdpdDovL2dp dC5zYW1iYS5vcmcvc2ZyZW5jaC9jaWZzLTIuNiAoMjAxNi0wMi0xNiAxMDo1Mjo1OSAtMDgwMCkK CmFyZSBhdmFpbGFibGUgaW4gdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9wZW9wbGUu ZnJlZWRlc2t0b3Aub3JnL35haXJsaWVkL2xpbnV4IGRybS1maXhlcwoKZm9yIHlvdSB0byBmZXRj aCBjaGFuZ2VzIHVwIHRvIGRhZGExNjhiM2I3NjQzOWQ4M2FmZjM0ZjhmYmQ5YzUxMmMyZDEzNmE6 CgogIGRybS9xeGw6IGZpeCBlcnJvbmVvdXMgcmV0dXJuIHZhbHVlICgyMDE2LTAyLTE3IDE1OjM5 OjM1ICsxMDAwKQoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQpBbmRyemVqIEhhamRhICgxKToKICAgICAgZHJtL2V4eW5vcy9k ZWNvbjogZml4IGRpc2FibGUgY2xvY2tzIG9yZGVyCgpBbnRvbiBQcm90b3BvcG92ICgxKToKICAg ICAgZHJtL3F4bDogZml4IGVycm9uZW91cyByZXR1cm4gdmFsdWUKCkRhdmUgQWlybGllICgyKToK ICAgICAgUmV2ZXJ0ICJkcm0vZHAvbXN0OiBjaGFuZ2UgTVNUIGRldGVjdGlvbiBzY2hlbWUiCiAg ICAgIE1lcmdlIGJyYW5jaCAnZXh5bm9zLWRybS1maXhlcycgb2YgZ2l0Oi8vZ2l0Lmtlcm5lbC5v cmcvLi4uL2RhZWlua2kvZHJtLWV4eW5vcyBpbnRvIGRybS1maXhlcwoKR2VyZCBIb2ZmbWFubiAo MSk6CiAgICAgIGRybS9xeGw6IHVzZSBrbWFsbG9jX2FycmF5IHRvIGFsbG9jIHJlbG9jX2luZm8g aW4gcXhsX3Byb2Nlc3Nfc2luZ2xlX2NvbW1hbmQKCkpvb255b3VuZyBTaGltICgxKToKICAgICAg ZHJtL2V4eW5vczogZGVwZW5kIG9uIEFSQ0hfRVhZTk9TIGZvciBEUk1fRVhZTk9TCgpNYXJlayBT enlwcm93c2tpICg5KToKICAgICAgZHJtL2V4eW5vczogaXBwOiBmaXggaW5jb3JyZWN0IGZvcm1h dCBzcGVjaWZpZXJzIGluIGRlYnVnIG1lc3NhZ2VzCiAgICAgIGRybS9leHlub3M6IGZpeCB0eXBl cyBmb3IgY29tcGlsYXRpb24gb24gNjRiaXQgYXJjaGl0ZWN0dXJlcwogICAgICBkcm0vZXh5bm9z OiBtaWM6IHVzZSBkZXZtX2NsayBpbnRlcmZhY2UKICAgICAgZHJtL2V4eW5vczogbWljOiBjb252 ZXJ0IHRvIGNvbXBvbmVudCBmcmFtZXdvcmsKICAgICAgZHJtL2V4eW5vczogbWljOiBtYWtlIGFs bCBmdW5jdGlvbnMgc3RhdGljCiAgICAgIGRybS9leHlub3M6IGRzaTogcmVzdG9yZSBzdXBwb3J0 IGZvciBkcm0gYnJpZGdlCiAgICAgIGRybS9leHlub3M6IGV4eW5vczU0MzNfZGVjb246IGZpeCB3 cm9uZyBzdGF0ZSBhc3NpZ25tZW50IGluIGRlY29uX2VuYWJsZQogICAgICBkcm0vZXh5bm9zOiBl eHlub3M1NDMzX2RlY29uOiBmaXggd3Jvbmcgc3RhdGUgaW4gZGVjb25fdmJsYW5rX2VuYWJsZQog ICAgICBkcm0vZXh5bm9zOiBmaXggaW5jb3JyZWN0IGNwdSBhZGRyZXNzIGZvciBkbWFfbW1hcF9h dHRycygpCgpNYXJpbyBLbGVpbmVyICg2KToKICAgICAgZHJtOiBOby1PcCByZWR1bmRhbnQgY2Fs bHMgdG8gZHJtX3ZibGFua19vZmYoKSAodjIpCiAgICAgIGRybTogUHJldmVudCB2YmxhbmsgY291 bnRlciBidW1wcyA+IDEgd2l0aCBhY3RpdmUgdmJsYW5rIGNsaWVudHMuICh2MikKICAgICAgZHJt OiBGaXggZHJtX3ZibGFua19wcmUvcG9zdF9tb2Rlc2V0IHJlZ3Jlc3Npb24gZnJvbSBMaW51eCA0 LjQKICAgICAgZHJtOiBGaXggdHJlYXRtZW50IG9mIGRybV92Ymxhbmtfb2ZmZGVsYXkgaW4gZHJt X3ZibGFua19vbigpICh2MikKICAgICAgZHJtL3JhZGVvbi9wbTogSGFuZGxlIGZhaWx1cmUgb2Yg ZHJtX3ZibGFua19nZXQuCiAgICAgIGRybS9ub3V2ZWF1L2Rpc3BsYXk6IEVuYWJsZSB2Ymxhbmsg aXJxcyBhZnRlciBkaXNwbGF5IGVuZ2luZSBpcyBvbiBhZ2Fpbi4KCiBkcml2ZXJzL2dwdS9kcm0v ZHJtX2RwX21zdF90b3BvbG9neS5jICAgICAgICAgfCAzNyArKysrKysrLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2RybV9pcnEuYyAgICAgICAgICAgICAgICAgICAgIHwgNzMgKysrKysrKysrKysr KysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL0tjb25maWcgICAgICAgICAg ICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3M1NDMzX2RybV9kZWNv bi5jIHwgIDggKystCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZHNpLmMgICAg ICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZmJkZXYuYyAgICAg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2ZpbWMuYyAgICAgIHwg IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nMmQuYyAgICAgICB8ICA1 ICstCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZ2VtLmMgICAgICAgfCAgNCAr LQogZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2dzYy5jICAgICAgIHwgIDIgKy0K IGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9pcHAuYyAgICAgICB8IDMyICsrKysr Ky0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX21pYy5jICAgICAgIHwg NzIgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5 bm9zX2RybV9yb3RhdG9yLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5v c19kcm1fdmlkaS5jICAgICAgfCAgOCArLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZl YXVfZGlzcGxheS5jICAgICB8ICA4ICstLQogZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfaW9jdGwu YyAgICAgICAgICAgICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3ByaW1lLmMg ICAgICAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9wbS5j ICAgICAgICAgICAgfCAgOCArKy0KIDE4IGZpbGVzIGNoYW5nZWQsIDE3OCBpbnNlcnRpb25zKCsp LCA5MyBkZWxldGlvbnMoLSkKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==