From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277AbcDOBbM (ORCPT ); Thu, 14 Apr 2016 21:31:12 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:36409 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbcDOB3v (ORCPT ); Thu, 14 Apr 2016 21:29:51 -0400 From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Daniel Stone , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan Subject: [RFC 4/8] drm/fence: add in-fences support Date: Thu, 14 Apr 2016 18:29:37 -0700 Message-Id: <1460683781-22535-5-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460683781-22535-1-git-send-email-gustavo@padovan.org> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan There is now a new property called FENCE_FD attached to every plane state that receives the sync_file fd from userspace via the atomic commit IOCTL. The fd is then translated to a fence (that may be a fence_collection subclass or just a normal fence) and then used by DRM to fence_wait() for all fences in the sync_file to signal. So it only commits when all framebuffers are ready to scanout. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_atomic.c | 8 ++++++++ drivers/gpu/drm/drm_atomic_helper.c | 5 +++++ drivers/gpu/drm/drm_crtc.c | 7 +++++++ include/drm/drm_crtc.h | 1 + 5 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index f2a74d0..3c987e3 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -12,6 +12,7 @@ menuconfig DRM select I2C select I2C_ALGOBIT select DMA_SHARED_BUFFER + select SYNC_FILE help Kernel-level support for the Direct Rendering Infrastructure (DRI) introduced in XFree86 4.0. If you say Y here, you need to select diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 8ee1db8..6702502 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -30,6 +30,7 @@ #include #include #include +#include /** * drm_atomic_state_default_release - @@ -680,6 +681,11 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, drm_atomic_set_fb_for_plane(state, fb); if (fb) drm_framebuffer_unreference(fb); + } else if (property == config->prop_fence_fd) { + state->fence = sync_file_fences_get(val); + if (!state->fence) + return -EINVAL; + fence_get(state->fence); } else if (property == config->prop_crtc_id) { struct drm_crtc *crtc = drm_crtc_find(dev, val); return drm_atomic_set_crtc_for_plane(state, crtc); @@ -737,6 +743,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, if (property == config->prop_fb_id) { *val = (state->fb) ? state->fb->base.id : 0; + } else if (property == config->prop_fence_fd) { + *val = -1; } else if (property == config->prop_crtc_id) { *val = (state->crtc) ? state->crtc->base.id : 0; } else if (property == config->prop_crtc_x) { diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index f85ef8c..6ed8339 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2687,6 +2687,11 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, { if (state->fb) drm_framebuffer_unreference(state->fb); + + if (state->fence) { + fence_put(state->fence); + state->fence = NULL; + } } EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state); diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 55ffde5..65212ce 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1278,6 +1278,7 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, if (drm_core_check_feature(dev, DRIVER_ATOMIC)) { drm_object_attach_property(&plane->base, config->prop_fb_id, 0); + drm_object_attach_property(&plane->base, config->prop_fence_fd, -1); drm_object_attach_property(&plane->base, config->prop_crtc_id, 0); drm_object_attach_property(&plane->base, config->prop_crtc_x, 0); drm_object_attach_property(&plane->base, config->prop_crtc_y, 0); @@ -1533,6 +1534,12 @@ static int drm_mode_create_standard_properties(struct drm_device *dev) return -ENOMEM; dev->mode_config.prop_fb_id = prop; + prop = drm_property_create_signed_range(dev, DRM_MODE_PROP_ATOMIC, + "FENCE_FD", -1, INT_MAX); + if (!prop) + return -ENOMEM; + dev->mode_config.prop_fence_fd = prop; + prop = drm_property_create_object(dev, DRM_MODE_PROP_ATOMIC, "CRTC_ID", DRM_MODE_OBJECT_CRTC); if (!prop) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8cb377c..5ba3cda 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -2122,6 +2122,7 @@ struct drm_mode_config { struct drm_property *prop_crtc_w; struct drm_property *prop_crtc_h; struct drm_property *prop_fb_id; + struct drm_property *prop_fence_fd; struct drm_property *prop_crtc_id; struct drm_property *prop_active; struct drm_property *prop_mode_id; -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 4/8] drm/fence: add in-fences support Date: Thu, 14 Apr 2016 18:29:37 -0700 Message-ID: <1460683781-22535-5-git-send-email-gustavo@padovan.org> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93C006EB59 for ; Fri, 15 Apr 2016 01:29:50 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id n1so51462631pfn.2 for ; Thu, 14 Apr 2016 18:29:50 -0700 (PDT) In-Reply-To: <1460683781-22535-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , linux-kernel@vger.kernel.org, Riley Andrews , laurent.pinchart@ideasonboard.com, Gustavo Padovan , John Harrison , m.chehab@samsung.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK VGhlcmUgaXMgbm93IGEgbmV3IHByb3BlcnR5IGNhbGxlZCBGRU5DRV9GRCBhdHRhY2hlZCB0byBl dmVyeSBwbGFuZQpzdGF0ZSB0aGF0IHJlY2VpdmVzIHRoZSBzeW5jX2ZpbGUgZmQgZnJvbSB1c2Vy c3BhY2UgdmlhIHRoZSBhdG9taWMgY29tbWl0CklPQ1RMLgoKVGhlIGZkIGlzIHRoZW4gdHJhbnNs YXRlZCB0byBhIGZlbmNlICh0aGF0IG1heSBiZSBhIGZlbmNlX2NvbGxlY3Rpb24Kc3ViY2xhc3Mg b3IganVzdCBhIG5vcm1hbCBmZW5jZSkgYW5kIHRoZW4gdXNlZCBieSBEUk0gdG8gZmVuY2Vfd2Fp dCgpIGZvcgphbGwgZmVuY2VzIGluIHRoZSBzeW5jX2ZpbGUgdG8gc2lnbmFsLiBTbyBpdCBvbmx5 IGNvbW1pdHMgd2hlbiBhbGwKZnJhbWVidWZmZXJzIGFyZSByZWFkeSB0byBzY2Fub3V0LgoKU2ln bmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNv LnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9LY29uZmlnICAgICAgICAgICAgIHwgMSArCiBkcml2 ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jICAgICAgICB8IDggKysrKysrKysKIGRyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNSArKysrKwogZHJpdmVycy9ncHUvZHJtL2RybV9j cnRjLmMgICAgICAgICAgfCA3ICsrKysrKysKIGluY2x1ZGUvZHJtL2RybV9jcnRjLmggICAgICAg ICAgICAgIHwgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKykKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9LY29uZmlnCmlu ZGV4IGYyYTc0ZDAuLjNjOTg3ZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9LY29uZmln CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9LY29uZmlnCkBAIC0xMiw2ICsxMiw3IEBAIG1lbnVjb25m aWcgRFJNCiAJc2VsZWN0IEkyQwogCXNlbGVjdCBJMkNfQUxHT0JJVAogCXNlbGVjdCBETUFfU0hB UkVEX0JVRkZFUgorCXNlbGVjdCBTWU5DX0ZJTEUKIAloZWxwCiAJICBLZXJuZWwtbGV2ZWwgc3Vw cG9ydCBmb3IgdGhlIERpcmVjdCBSZW5kZXJpbmcgSW5mcmFzdHJ1Y3R1cmUgKERSSSkKIAkgIGlu dHJvZHVjZWQgaW4gWEZyZWU4NiA0LjAuIElmIHlvdSBzYXkgWSBoZXJlLCB5b3UgbmVlZCB0byBz ZWxlY3QKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IDhlZTFkYjguLjY3MDI1MDIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9h dG9taWMuYwpAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+CiAj aW5jbHVkZSA8ZHJtL2RybV9tb2RlLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIu aD4KKyNpbmNsdWRlIDxsaW51eC9zeW5jX2ZpbGUuaD4KIAogLyoqCiAgKiBkcm1fYXRvbWljX3N0 YXRlX2RlZmF1bHRfcmVsZWFzZSAtCkBAIC02ODAsNiArNjgxLDExIEBAIGludCBkcm1fYXRvbWlj X3BsYW5lX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJZHJtX2F0b21p Y19zZXRfZmJfZm9yX3BsYW5lKHN0YXRlLCBmYik7CiAJCWlmIChmYikKIAkJCWRybV9mcmFtZWJ1 ZmZlcl91bnJlZmVyZW5jZShmYik7CisJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBjb25maWctPnBy b3BfZmVuY2VfZmQpIHsKKwkJc3RhdGUtPmZlbmNlID0gc3luY19maWxlX2ZlbmNlc19nZXQodmFs KTsKKwkJaWYgKCFzdGF0ZS0+ZmVuY2UpCisJCQlyZXR1cm4gLUVJTlZBTDsKKwkJZmVuY2VfZ2V0 KHN0YXRlLT5mZW5jZSk7CiAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBjb25maWctPnByb3BfY3J0 Y19pZCkgewogCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkcm1fY3J0Y19maW5kKGRldiwgdmFs KTsKIAkJcmV0dXJuIGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3BsYW5lKHN0YXRlLCBjcnRjKTsK QEAgLTczNyw2ICs3NDMsOCBAQCBkcm1fYXRvbWljX3BsYW5lX2dldF9wcm9wZXJ0eShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAogCWlmIChwcm9wZXJ0eSA9PSBjb25maWctPnByb3BfZmJfaWQp IHsKIAkJKnZhbCA9IChzdGF0ZS0+ZmIpID8gc3RhdGUtPmZiLT5iYXNlLmlkIDogMDsKKwl9IGVs c2UgaWYgKHByb3BlcnR5ID09IGNvbmZpZy0+cHJvcF9mZW5jZV9mZCkgeworCQkqdmFsID0gLTE7 CiAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBjb25maWctPnByb3BfY3J0Y19pZCkgewogCQkqdmFs ID0gKHN0YXRlLT5jcnRjKSA/IHN0YXRlLT5jcnRjLT5iYXNlLmlkIDogMDsKIAl9IGVsc2UgaWYg KHByb3BlcnR5ID09IGNvbmZpZy0+cHJvcF9jcnRjX3gpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNf aGVscGVyLmMKaW5kZXggZjg1ZWY4Yy4uNmVkODMzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNf aGVscGVyLmMKQEAgLTI2ODcsNiArMjY4NywxMSBAQCB2b2lkIF9fZHJtX2F0b21pY19oZWxwZXJf cGxhbmVfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIHsKIAlpZiAoc3Rh dGUtPmZiKQogCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uoc3RhdGUtPmZiKTsKKworCWlm IChzdGF0ZS0+ZmVuY2UpIHsKKwkJZmVuY2VfcHV0KHN0YXRlLT5mZW5jZSk7CisJCXN0YXRlLT5m ZW5jZSA9IE5VTEw7CisJfQogfQogRVhQT1JUX1NZTUJPTChfX2RybV9hdG9taWNfaGVscGVyX3Bs YW5lX2Rlc3Ryb3lfc3RhdGUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Ny dGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCmluZGV4IDU1ZmZkZTUuLjY1MjEyY2Ug MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fY3J0Yy5jCkBAIC0xMjc4LDYgKzEyNzgsNyBAQCBpbnQgZHJtX3VuaXZlcnNhbF9w bGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCiAJaWYgKGRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfQVRPTUlDKSkgewog CQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsIGNvbmZpZy0+cHJvcF9m Yl9pZCwgMCk7CisJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwbGFuZS0+YmFzZSwgY29u ZmlnLT5wcm9wX2ZlbmNlX2ZkLCAtMSk7CiAJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZw bGFuZS0+YmFzZSwgY29uZmlnLT5wcm9wX2NydGNfaWQsIDApOwogCQlkcm1fb2JqZWN0X2F0dGFj aF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsIGNvbmZpZy0+cHJvcF9jcnRjX3gsIDApOwogCQlkcm1f b2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsIGNvbmZpZy0+cHJvcF9jcnRjX3ks IDApOwpAQCAtMTUzMyw2ICsxNTM0LDEyIEBAIHN0YXRpYyBpbnQgZHJtX21vZGVfY3JlYXRlX3N0 YW5kYXJkX3Byb3BlcnRpZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuIC1FTk9N RU07CiAJZGV2LT5tb2RlX2NvbmZpZy5wcm9wX2ZiX2lkID0gcHJvcDsKIAorCXByb3AgPSBkcm1f cHJvcGVydHlfY3JlYXRlX3NpZ25lZF9yYW5nZShkZXYsIERSTV9NT0RFX1BST1BfQVRPTUlDLAor CQkJIkZFTkNFX0ZEIiwgLTEsIElOVF9NQVgpOworCWlmICghcHJvcCkKKwkJcmV0dXJuIC1FTk9N RU07CisJZGV2LT5tb2RlX2NvbmZpZy5wcm9wX2ZlbmNlX2ZkID0gcHJvcDsKKwogCXByb3AgPSBk cm1fcHJvcGVydHlfY3JlYXRlX29iamVjdChkZXYsIERSTV9NT0RFX1BST1BfQVRPTUlDLAogCQkJ IkNSVENfSUQiLCBEUk1fTU9ERV9PQkpFQ1RfQ1JUQyk7CiAJaWYgKCFwcm9wKQpkaWZmIC0tZ2l0 IGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKaW5kZXgg OGNiMzc3Yy4uNWJhM2NkYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAorKysg Yi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC0yMTIyLDYgKzIxMjIsNyBAQCBzdHJ1Y3QgZHJt X21vZGVfY29uZmlnIHsKIAlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wX2NydGNfdzsKIAlzdHJ1 Y3QgZHJtX3Byb3BlcnR5ICpwcm9wX2NydGNfaDsKIAlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9w X2ZiX2lkOworCXN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BfZmVuY2VfZmQ7CiAJc3RydWN0IGRy bV9wcm9wZXJ0eSAqcHJvcF9jcnRjX2lkOwogCXN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BfYWN0 aXZlOwogCXN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BfbW9kZV9pZDsKLS0gCjIuNS41CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK