From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753288AbcJKOys (ORCPT ); Tue, 11 Oct 2016 10:54:48 -0400 Received: from foss.arm.com ([217.140.101.70]:35458 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263AbcJKOyn (ORCPT ); Tue, 11 Oct 2016 10:54:43 -0400 From: Brian Starkey To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, liviu.dudau@arm.com, robdclark@gmail.com, hverkuil@xs4all.nl, eric@anholt.net, ville.syrjala@linux.intel.com, daniel@ffwll.ch Subject: [RFC PATCH 03/11] drm: Extract CRTC/plane disable from drm_framebuffer_remove Date: Tue, 11 Oct 2016 15:54:00 +0100 Message-Id: <1476197648-24918-4-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1476197648-24918-1-git-send-email-brian.starkey@arm.com> References: <1476197648-24918-1-git-send-email-brian.starkey@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for adding an atomic version of the disable code, extract the actual disable operation into a separate function. Signed-off-by: Brian Starkey --- drivers/gpu/drm/drm_framebuffer.c | 87 +++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c index 398efd6..528f75d 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -795,22 +795,61 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) EXPORT_SYMBOL(drm_framebuffer_cleanup); /** - * drm_framebuffer_remove - remove and unreference a framebuffer object + * __drm_framebuffer_remove - remove all usage of a framebuffer object + * @dev: drm device * @fb: framebuffer to remove * * Scans all the CRTCs and planes in @dev's mode_config. If they're - * using @fb, removes it, setting it to NULL. Then drops the reference to the - * passed-in framebuffer. Might take the modeset locks. + * using @fb, removes it, setting it to NULL. Takes the modeset locks. * - * Note that this function optimizes the cleanup away if the caller holds the - * last reference to the framebuffer. It is also guaranteed to not take the - * modeset locks in this case. + * Returns: + * true if the framebuffer was successfully removed from use */ -void drm_framebuffer_remove(struct drm_framebuffer *fb) +static bool __drm_framebuffer_remove(struct drm_device *dev, struct drm_framebuffer *fb) { - struct drm_device *dev; struct drm_crtc *crtc; struct drm_plane *plane; + bool ret = true; + + drm_modeset_lock_all(dev); + /* remove from any CRTC */ + drm_for_each_crtc(crtc, dev) { + if (crtc->primary->fb == fb) { + /* should turn off the crtc */ + if (drm_crtc_force_disable(crtc)) + ret = false; + } + } + + drm_for_each_plane(plane, dev) { + if (plane->fb == fb) + /* TODO: Propagate error here? */ + drm_plane_force_disable(plane); + } + drm_modeset_unlock_all(dev); + + return ret; +} + +/** + * drm_framebuffer_remove - remove and unreference a framebuffer object + * @fb: framebuffer to remove + * + * drm ABI mandates that we remove any deleted framebuffers from active usage. + * This function takes care of this detail, disabling any CRTCs/Planes which + * are using the framebuffer being removed. + * + * Since most sane clients only remove framebuffers they no longer need, we + * skip the disable step if the caller holds the last reference to the + * framebuffer. It is also guaranteed to not take the modeset locks in + * this case. + * + * Before returning this function drops (what should be) the last reference + * on the framebuffer. + */ +void drm_framebuffer_remove(struct drm_framebuffer *fb) +{ + struct drm_device *dev; if (!fb) return; @@ -820,37 +859,19 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) WARN_ON(!list_empty(&fb->filp_head)); /* - * drm ABI mandates that we remove any deleted framebuffers from active - * useage. But since most sane clients only remove framebuffers they no - * longer need, try to optimize this away. - * * Since we're holding a reference ourselves, observing a refcount of 1 - * means that we're the last holder and can skip it. Also, the refcount - * can never increase from 1 again, so we don't need any barriers or - * locks. + * means that we're the last holder and can skip the disable. Also, the + * refcount can never increase from 1 again, so we don't need any + * barriers or locks. * - * Note that userspace could try to race with use and instate a new + * Note that userspace could try to race with us and instate a new * usage _after_ we've cleared all current ones. End result will be an * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot * in this manner. */ - if (drm_framebuffer_read_refcount(fb) > 1) { - drm_modeset_lock_all(dev); - /* remove from any CRTC */ - drm_for_each_crtc(crtc, dev) { - if (crtc->primary->fb == fb) { - /* should turn off the crtc */ - if (drm_crtc_force_disable(crtc)) - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); - } - } - - drm_for_each_plane(plane, dev) { - if (plane->fb == fb) - drm_plane_force_disable(plane); - } - drm_modeset_unlock_all(dev); - } + if (drm_framebuffer_read_refcount(fb) > 1) + if (!__drm_framebuffer_remove(dev, fb)) + DRM_ERROR("failed to remove fb from active usage\n"); drm_framebuffer_unreference(fb); } -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Starkey Subject: [RFC PATCH 03/11] drm: Extract CRTC/plane disable from drm_framebuffer_remove Date: Tue, 11 Oct 2016 15:54:00 +0100 Message-ID: <1476197648-24918-4-git-send-email-brian.starkey@arm.com> References: <1476197648-24918-1-git-send-email-brian.starkey@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F2186E6A7 for ; Tue, 11 Oct 2016 14:54:20 +0000 (UTC) In-Reply-To: <1476197648-24918-1-git-send-email-brian.starkey@arm.com> 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: liviu.dudau@arm.com, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org SW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBhbiBhdG9taWMgdmVyc2lvbiBvZiB0aGUgZGlzYWJs ZSBjb2RlLCBleHRyYWN0CnRoZSBhY3R1YWwgZGlzYWJsZSBvcGVyYXRpb24gaW50byBhIHNlcGFy YXRlIGZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogQnJpYW4gU3RhcmtleSA8YnJpYW4uc3Rhcmtl eUBhcm0uY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZnJhbWVidWZmZXIuYyB8ICAgODcg KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDU0 IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZnJhbWVidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZnJhbWVidWZmZXIu YwppbmRleCAzOThlZmQ2Li41MjhmNzVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2ZyYW1lYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mcmFtZWJ1ZmZlci5jCkBA IC03OTUsMjIgKzc5NSw2MSBAQCB2b2lkIGRybV9mcmFtZWJ1ZmZlcl9jbGVhbnVwKHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiKQogRVhQT1JUX1NZTUJPTChkcm1fZnJhbWVidWZmZXJfY2xlYW51 cCk7CiAKIC8qKgotICogZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSAtIHJlbW92ZSBhbmQgdW5yZWZl cmVuY2UgYSBmcmFtZWJ1ZmZlciBvYmplY3QKKyAqIF9fZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSAt IHJlbW92ZSBhbGwgdXNhZ2Ugb2YgYSBmcmFtZWJ1ZmZlciBvYmplY3QKKyAqIEBkZXY6IGRybSBk ZXZpY2UKICAqIEBmYjogZnJhbWVidWZmZXIgdG8gcmVtb3ZlCiAgKgogICogU2NhbnMgYWxsIHRo ZSBDUlRDcyBhbmQgcGxhbmVzIGluIEBkZXYncyBtb2RlX2NvbmZpZy4gIElmIHRoZXkncmUKLSAq IHVzaW5nIEBmYiwgcmVtb3ZlcyBpdCwgc2V0dGluZyBpdCB0byBOVUxMLiBUaGVuIGRyb3BzIHRo ZSByZWZlcmVuY2UgdG8gdGhlCi0gKiBwYXNzZWQtaW4gZnJhbWVidWZmZXIuIE1pZ2h0IHRha2Ug dGhlIG1vZGVzZXQgbG9ja3MuCisgKiB1c2luZyBAZmIsIHJlbW92ZXMgaXQsIHNldHRpbmcgaXQg dG8gTlVMTC4gVGFrZXMgdGhlIG1vZGVzZXQgbG9ja3MuCiAgKgotICogTm90ZSB0aGF0IHRoaXMg ZnVuY3Rpb24gb3B0aW1pemVzIHRoZSBjbGVhbnVwIGF3YXkgaWYgdGhlIGNhbGxlciBob2xkcyB0 aGUKLSAqIGxhc3QgcmVmZXJlbmNlIHRvIHRoZSBmcmFtZWJ1ZmZlci4gSXQgaXMgYWxzbyBndWFy YW50ZWVkIHRvIG5vdCB0YWtlIHRoZQotICogbW9kZXNldCBsb2NrcyBpbiB0aGlzIGNhc2UuCisg KiBSZXR1cm5zOgorICogdHJ1ZSBpZiB0aGUgZnJhbWVidWZmZXIgd2FzIHN1Y2Nlc3NmdWxseSBy ZW1vdmVkIGZyb20gdXNlCiAgKi8KLXZvaWQgZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZShzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYikKK3N0YXRpYyBib29sIF9fZHJtX2ZyYW1lYnVmZmVyX3JlbW92 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIHsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2OwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZTsKKwlib29sIHJldCA9IHRydWU7CisKKwlkcm1fbW9kZXNldF9s b2NrX2FsbChkZXYpOworCS8qIHJlbW92ZSBmcm9tIGFueSBDUlRDICovCisJZHJtX2Zvcl9lYWNo X2NydGMoY3J0YywgZGV2KSB7CisJCWlmIChjcnRjLT5wcmltYXJ5LT5mYiA9PSBmYikgeworCQkJ Lyogc2hvdWxkIHR1cm4gb2ZmIHRoZSBjcnRjICovCisJCQlpZiAoZHJtX2NydGNfZm9yY2VfZGlz YWJsZShjcnRjKSkKKwkJCQlyZXQgPSBmYWxzZTsKKwkJfQorCX0KKworCWRybV9mb3JfZWFjaF9w bGFuZShwbGFuZSwgZGV2KSB7CisJCWlmIChwbGFuZS0+ZmIgPT0gZmIpCisJCQkvKiBUT0RPOiBQ cm9wYWdhdGUgZXJyb3IgaGVyZT8gKi8KKwkJCWRybV9wbGFuZV9mb3JjZV9kaXNhYmxlKHBsYW5l KTsKKwl9CisJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOworCisJcmV0dXJuIHJldDsKK30K KworLyoqCisgKiBkcm1fZnJhbWVidWZmZXJfcmVtb3ZlIC0gcmVtb3ZlIGFuZCB1bnJlZmVyZW5j ZSBhIGZyYW1lYnVmZmVyIG9iamVjdAorICogQGZiOiBmcmFtZWJ1ZmZlciB0byByZW1vdmUKKyAq CisgKiBkcm0gQUJJIG1hbmRhdGVzIHRoYXQgd2UgcmVtb3ZlIGFueSBkZWxldGVkIGZyYW1lYnVm ZmVycyBmcm9tIGFjdGl2ZSB1c2FnZS4KKyAqIFRoaXMgZnVuY3Rpb24gdGFrZXMgY2FyZSBvZiB0 aGlzIGRldGFpbCwgZGlzYWJsaW5nIGFueSBDUlRDcy9QbGFuZXMgd2hpY2gKKyAqIGFyZSB1c2lu ZyB0aGUgZnJhbWVidWZmZXIgYmVpbmcgcmVtb3ZlZC4KKyAqCisgKiBTaW5jZSBtb3N0IHNhbmUg Y2xpZW50cyBvbmx5IHJlbW92ZSBmcmFtZWJ1ZmZlcnMgdGhleSBubyBsb25nZXIgbmVlZCwgd2UK KyAqIHNraXAgdGhlIGRpc2FibGUgc3RlcCBpZiB0aGUgY2FsbGVyIGhvbGRzIHRoZSBsYXN0IHJl ZmVyZW5jZSB0byB0aGUKKyAqIGZyYW1lYnVmZmVyLiBJdCBpcyBhbHNvIGd1YXJhbnRlZWQgdG8g bm90IHRha2UgdGhlIG1vZGVzZXQgbG9ja3MgaW4KKyAqIHRoaXMgY2FzZS4KKyAqCisgKiBCZWZv cmUgcmV0dXJuaW5nIHRoaXMgZnVuY3Rpb24gZHJvcHMgKHdoYXQgc2hvdWxkIGJlKSB0aGUgbGFz dCByZWZlcmVuY2UKKyAqIG9uIHRoZSBmcmFtZWJ1ZmZlci4KKyAqLwordm9pZCBkcm1fZnJhbWVi dWZmZXJfcmVtb3ZlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQoreworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXY7CiAKIAlpZiAoIWZiKQogCQlyZXR1cm47CkBAIC04MjAsMzcgKzg1OSwxOSBA QCB2b2lkIGRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIp CiAJV0FSTl9PTighbGlzdF9lbXB0eSgmZmItPmZpbHBfaGVhZCkpOwogCiAJLyoKLQkgKiBkcm0g QUJJIG1hbmRhdGVzIHRoYXQgd2UgcmVtb3ZlIGFueSBkZWxldGVkIGZyYW1lYnVmZmVycyBmcm9t IGFjdGl2ZQotCSAqIHVzZWFnZS4gQnV0IHNpbmNlIG1vc3Qgc2FuZSBjbGllbnRzIG9ubHkgcmVt b3ZlIGZyYW1lYnVmZmVycyB0aGV5IG5vCi0JICogbG9uZ2VyIG5lZWQsIHRyeSB0byBvcHRpbWl6 ZSB0aGlzIGF3YXkuCi0JICoKIAkgKiBTaW5jZSB3ZSdyZSBob2xkaW5nIGEgcmVmZXJlbmNlIG91 cnNlbHZlcywgb2JzZXJ2aW5nIGEgcmVmY291bnQgb2YgMQotCSAqIG1lYW5zIHRoYXQgd2UncmUg dGhlIGxhc3QgaG9sZGVyIGFuZCBjYW4gc2tpcCBpdC4gQWxzbywgdGhlIHJlZmNvdW50Ci0JICog Y2FuIG5ldmVyIGluY3JlYXNlIGZyb20gMSBhZ2Fpbiwgc28gd2UgZG9uJ3QgbmVlZCBhbnkgYmFy cmllcnMgb3IKLQkgKiBsb2Nrcy4KKwkgKiBtZWFucyB0aGF0IHdlJ3JlIHRoZSBsYXN0IGhvbGRl ciBhbmQgY2FuIHNraXAgdGhlIGRpc2FibGUuIEFsc28sIHRoZQorCSAqIHJlZmNvdW50IGNhbiBu ZXZlciBpbmNyZWFzZSBmcm9tIDEgYWdhaW4sIHNvIHdlIGRvbid0IG5lZWQgYW55CisJICogYmFy cmllcnMgb3IgbG9ja3MuCiAJICoKLQkgKiBOb3RlIHRoYXQgdXNlcnNwYWNlIGNvdWxkIHRyeSB0 byByYWNlIHdpdGggdXNlIGFuZCBpbnN0YXRlIGEgbmV3CisJICogTm90ZSB0aGF0IHVzZXJzcGFj ZSBjb3VsZCB0cnkgdG8gcmFjZSB3aXRoIHVzIGFuZCBpbnN0YXRlIGEgbmV3CiAJICogdXNhZ2Ug X2FmdGVyXyB3ZSd2ZSBjbGVhcmVkIGFsbCBjdXJyZW50IG9uZXMuIEVuZCByZXN1bHQgd2lsbCBi ZSBhbgogCSAqIGluLXVzZSBmYiB3aXRoIGZiLWlkID09IDAuIFVzZXJzcGFjZSBpcyBhbGxvd2Vk IHRvIHNob290IGl0cyBvd24gZm9vdAogCSAqIGluIHRoaXMgbWFubmVyLgogCSAqLwotCWlmIChk cm1fZnJhbWVidWZmZXJfcmVhZF9yZWZjb3VudChmYikgPiAxKSB7Ci0JCWRybV9tb2Rlc2V0X2xv Y2tfYWxsKGRldik7Ci0JCS8qIHJlbW92ZSBmcm9tIGFueSBDUlRDICovCi0JCWRybV9mb3JfZWFj aF9jcnRjKGNydGMsIGRldikgewotCQkJaWYgKGNydGMtPnByaW1hcnktPmZiID09IGZiKSB7Ci0J CQkJLyogc2hvdWxkIHR1cm4gb2ZmIHRoZSBjcnRjICovCi0JCQkJaWYgKGRybV9jcnRjX2ZvcmNl X2Rpc2FibGUoY3J0YykpCi0JCQkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHJlc2V0IGNydGMgJXAg d2hlbiBmYiB3YXMgZGVsZXRlZFxuIiwgY3J0Yyk7Ci0JCQl9Ci0JCX0KLQotCQlkcm1fZm9yX2Vh Y2hfcGxhbmUocGxhbmUsIGRldikgewotCQkJaWYgKHBsYW5lLT5mYiA9PSBmYikKLQkJCQlkcm1f cGxhbmVfZm9yY2VfZGlzYWJsZShwbGFuZSk7Ci0JCX0KLQkJZHJtX21vZGVzZXRfdW5sb2NrX2Fs bChkZXYpOwotCX0KKwlpZiAoZHJtX2ZyYW1lYnVmZmVyX3JlYWRfcmVmY291bnQoZmIpID4gMSkK KwkJaWYgKCFfX2RybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoZGV2LCBmYikpCisJCQlEUk1fRVJST1Io ImZhaWxlZCB0byByZW1vdmUgZmIgZnJvbSBhY3RpdmUgdXNhZ2VcbiIpOwogCiAJZHJtX2ZyYW1l YnVmZmVyX3VucmVmZXJlbmNlKGZiKTsKIH0KLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=