From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Fri, 22 Jan 2016 09:37:03 +0800 Subject: [GIT PULL] drm/rockchip: fixes Message-ID: <56A187BF.5060906@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Dave Here are some fixes for drm/rockchip, these fixes base on drm-next. These fixes works on my popmetal(rk3288) board. About patch: drm/atomic-helper: Export framebuffer_changed() Daniel Vetter ack for merging it through rockchip git trees, so framebuffer_changed() can be reused by drm/rockchip. All others looks good, so I'd like you can land them. Thanks. The following changes since commit 1df59b8497f47495e873c23abd6d3d290c730505: Merge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-01-18 07:02:19 +1000) are available in the git repository at: https://github.com/markyzq/kernel-drm-rockchip.git drm-rockchip-next-fixes-2016-01-22 for you to fetch changes up to f0442df2156a2171e40f1643c60103e6333f4e7e: drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION (2016-01-22 08:45:31 +0800) ---------------------------------------------------------------- Andrzej Hajda (1): drm/rockchip/dsi: fix handling mipi_dsi_pixel_format_to_bpp result John Keeping (5): drm/rockchip: vop: fix mask when updating interrupts drm/atomic-helper: Export framebuffer_changed() drm/rockchip: don't wait for vblank if fb hasn't changed drm/rockchip: explain why we can't wait_for_vblanks drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION Mark Yao (3): drm/rockchip: Don't build rockchip_drm_vop as modules drm/rockchip: cleanup unnecessary export symbol drm/rockchip: fix wrong pitch/size using on gem drivers/gpu/drm/drm_atomic_helper.c | 24 ++++++++++++++++++++---- drivers/gpu/drm/rockchip/Makefile | 8 ++++---- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 3 ++- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ---- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 24 +++++++++++++++++++++--- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h | 11 +++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 ++------- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 16 +++++++++------- include/drm/drm_atomic_helper.h | 4 ++++ 9 files changed, 73 insertions(+), 30 deletions(-) -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: [GIT PULL] drm/rockchip: fixes Date: Fri, 22 Jan 2016 09:37:03 +0800 Message-ID: <56A187BF.5060906@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from regular1.263xmail.com (regular1.263xmail.com [211.150.99.139]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C5066EB69 for ; Thu, 21 Jan 2016 17:37:09 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: dri-devel , =?UTF-8?B?6ZKf5YuH5rGq?= , Andrzej Hajda , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org SGkgRGF2ZQoKSGVyZSBhcmUgc29tZSBmaXhlcyBmb3IgZHJtL3JvY2tjaGlwLCB0aGVzZSBmaXhl cyBiYXNlIG9uIGRybS1uZXh0LgoKVGhlc2UgZml4ZXMgd29ya3Mgb24gbXkgcG9wbWV0YWwocmsz Mjg4KSBib2FyZC4KCkFib3V0IHBhdGNoOiBkcm0vYXRvbWljLWhlbHBlcjogRXhwb3J0IGZyYW1l YnVmZmVyX2NoYW5nZWQoKQpEYW5pZWwgVmV0dGVyIGFjayBmb3IgbWVyZ2luZyBpdCB0aHJvdWdo IHJvY2tjaGlwIGdpdCB0cmVlcywgc28gCmZyYW1lYnVmZmVyX2NoYW5nZWQoKSBjYW4gYmUgcmV1 c2VkIGJ5IGRybS9yb2NrY2hpcC4KCkFsbCBvdGhlcnMgbG9va3MgZ29vZCwgc28gSSdkIGxpa2Ug eW91IGNhbiBsYW5kIHRoZW0uCgpUaGFua3MuCgpUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2Ug Y29tbWl0IDFkZjU5Yjg0OTdmNDc0OTVlODczYzIzYWJkNmQzZDI5MGM3MzA1MDU6CgogICBNZXJn ZSB0YWcgJ2RybS1pbnRlbC1uZXh0LWZpeGVzLTIwMTYtMDEtMTQnIG9mIApnaXQ6Ly9hbm9uZ2l0 LmZyZWVkZXNrdG9wLm9yZy9kcm0taW50ZWwgaW50byBkcm0tbmV4dCAoMjAxNi0wMS0xOCAKMDc6 MDI6MTkgKzEwMDApCgphcmUgYXZhaWxhYmxlIGluIHRoZSBnaXQgcmVwb3NpdG9yeSBhdDoKCiAg IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXJreXpxL2tlcm5lbC1kcm0tcm9ja2NoaXAuZ2l0IApkcm0t cm9ja2NoaXAtbmV4dC1maXhlcy0yMDE2LTAxLTIyCgpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMg dXAgdG8gZjA0NDJkZjIxNTZhMjE3MWU0MGYxNjQzYzYwMTAzZTYzMzNmNGU3ZToKCiAgIGRybS9y b2NrY2hpcDogcmVzcGVjdCBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElPTiAoMjAxNi0wMS0yMiAw ODo0NTozMSAKKzA4MDApCgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkFuZHJ6ZWogSGFqZGEgKDEpOgogICAgICAgZHJtL3Jv Y2tjaGlwL2RzaTogZml4IGhhbmRsaW5nIG1pcGlfZHNpX3BpeGVsX2Zvcm1hdF90b19icHAgcmVz dWx0CgpKb2huIEtlZXBpbmcgKDUpOgogICAgICAgZHJtL3JvY2tjaGlwOiB2b3A6IGZpeCBtYXNr IHdoZW4gdXBkYXRpbmcgaW50ZXJydXB0cwogICAgICAgZHJtL2F0b21pYy1oZWxwZXI6IEV4cG9y dCBmcmFtZWJ1ZmZlcl9jaGFuZ2VkKCkKICAgICAgIGRybS9yb2NrY2hpcDogZG9uJ3Qgd2FpdCBm b3IgdmJsYW5rIGlmIGZiIGhhc24ndCBjaGFuZ2VkCiAgICAgICBkcm0vcm9ja2NoaXA6IGV4cGxh aW4gd2h5IHdlIGNhbid0IHdhaXRfZm9yX3ZibGFua3MKICAgICAgIGRybS9yb2NrY2hpcDogcmVz cGVjdCBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElPTgoKTWFyayBZYW8gKDMpOgogICAgICAgZHJt L3JvY2tjaGlwOiBEb24ndCBidWlsZCByb2NrY2hpcF9kcm1fdm9wIGFzIG1vZHVsZXMKICAgICAg IGRybS9yb2NrY2hpcDogY2xlYW51cCB1bm5lY2Vzc2FyeSBleHBvcnQgc3ltYm9sCiAgICAgICBk cm0vcm9ja2NoaXA6IGZpeCB3cm9uZyBwaXRjaC9zaXplIHVzaW5nIG9uIGdlbQoKICBkcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyAgICAgICAgICAgfCAgIDI0IAorKysrKysrKysr KysrKysrKysrKy0tLS0KICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvTWFrZWZpbGUgICAgICAg ICAgICAgfCAgICA4ICsrKystLS0tCiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGkt ZHNpLmMgICAgICAgIHwgICAgMyArKy0KICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2No aXBfZHJtX2Rydi5jICAgfCAgICA0IC0tLS0KICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9j a2NoaXBfZHJtX2ZiLmMgICAgfCAgIDI0IAorKysrKysrKysrKysrKysrKysrKystLS0KICBkcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiZGV2LmggfCAgIDExICsrKysrKysr KysrCiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9nZW0uYyAgIHwgICAg OSArKy0tLS0tLS0KICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5j ICAgfCAgIDE2ICsrKysrKysrKy0tLS0tLS0KICBpbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBl ci5oICAgICAgICAgICAgICAgfCAgICA0ICsrKysKICA5IGZpbGVzIGNoYW5nZWQsIDczIGluc2Vy dGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKLS0gCu+8rWFyayBZYW8KCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=