From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D53DC43387 for ; Fri, 18 Jan 2019 12:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4572420652 for ; Fri, 18 Jan 2019 12:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728001AbfARMVv (ORCPT ); Fri, 18 Jan 2019 07:21:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41172 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727576AbfARMU1 (ORCPT ); Fri, 18 Jan 2019 07:20:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6870586676; Fri, 18 Jan 2019 12:20:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id F345B5D979; Fri, 18 Jan 2019 12:20:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B71B11FCC1; Fri, 18 Jan 2019 13:20:22 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , Dave Airlie , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 16/23] drm/qxl: implement prime kmap/kunmap Date: Fri, 18 Jan 2019 13:20:13 +0100 Message-Id: <20190118122020.27596-17-kraxel@redhat.com> In-Reply-To: <20190118122020.27596-1-kraxel@redhat.com> References: <20190118122020.27596-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 18 Jan 2019 12:20:27 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Generic fbdev emulation needs this. Also: We must keep track of the number of mappings now, so we don't unmap early in case two users want a kmap of the same bo. Add a sanity check to destroy callback to make sure kmap/kunmap is balanced. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/qxl/qxl_drv.h | 1 + drivers/gpu/drm/qxl/qxl_object.c | 6 ++++++ drivers/gpu/drm/qxl/qxl_prime.c | 17 +++++++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index 43c6df9cf9..8c3af1cdbe 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -84,6 +84,7 @@ struct qxl_bo { struct ttm_bo_kmap_obj kmap; unsigned int pin_count; void *kptr; + unsigned int map_count; int type; /* Constant after initialization */ diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c index 024c8dd317..4928fa6029 100644 --- a/drivers/gpu/drm/qxl/qxl_object.c +++ b/drivers/gpu/drm/qxl/qxl_object.c @@ -36,6 +36,7 @@ static void qxl_ttm_bo_destroy(struct ttm_buffer_object *tbo) qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; qxl_surface_evict(qdev, bo, false); + WARN_ON_ONCE(bo->map_count > 0); mutex_lock(&qdev->gem.mutex); list_del_init(&bo->list); mutex_unlock(&qdev->gem.mutex); @@ -131,6 +132,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr) if (bo->kptr) { if (ptr) *ptr = bo->kptr; + bo->map_count++; return 0; } r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages, &bo->kmap); @@ -139,6 +141,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr) bo->kptr = ttm_kmap_obj_virtual(&bo->kmap, &is_iomem); if (ptr) *ptr = bo->kptr; + bo->map_count = 1; return 0; } @@ -180,6 +183,9 @@ void qxl_bo_kunmap(struct qxl_bo *bo) { if (bo->kptr == NULL) return; + bo->map_count--; + if (bo->map_count > 0) + return; bo->kptr = NULL; ttm_bo_kunmap(&bo->kmap); } diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c index a55dece118..708378844c 100644 --- a/drivers/gpu/drm/qxl/qxl_prime.c +++ b/drivers/gpu/drm/qxl/qxl_prime.c @@ -22,7 +22,7 @@ * Authors: Andreas Pokorny */ -#include "qxl_drv.h" +#include "qxl_object.h" /* Empty Implementations as there should not be any other driver for a virtual * device that might share buffers with qxl */ @@ -54,13 +54,22 @@ struct drm_gem_object *qxl_gem_prime_import_sg_table( void *qxl_gem_prime_vmap(struct drm_gem_object *obj) { - WARN_ONCE(1, "not implemented"); - return ERR_PTR(-ENOSYS); + struct qxl_bo *bo = gem_to_qxl_bo(obj); + void *ptr; + int ret; + + ret = qxl_bo_kmap(bo, &ptr); + if (ret < 0) + return ERR_PTR(ret); + + return ptr; } void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) { - WARN_ONCE(1, "not implemented"); + struct qxl_bo *bo = gem_to_qxl_bo(obj); + + qxl_bo_kunmap(bo); } int qxl_gem_prime_mmap(struct drm_gem_object *obj, -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 16/23] drm/qxl: implement prime kmap/kunmap Date: Fri, 18 Jan 2019 13:20:13 +0100 Message-ID: <20190118122020.27596-17-kraxel@redhat.com> References: <20190118122020.27596-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190118122020.27596-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spice-devel-bounces@lists.freedesktop.org Sender: "Spice-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , open list , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Gerd Hoffmann , Daniel Vetter , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Dave Airlie List-Id: dri-devel@lists.freedesktop.org R2VuZXJpYyBmYmRldiBlbXVsYXRpb24gbmVlZHMgdGhpcy4gIEFsc286IFdlIG11c3Qga2VlcCB0 cmFjayBvZiB0aGUKbnVtYmVyIG9mIG1hcHBpbmdzIG5vdywgc28gd2UgZG9uJ3QgdW5tYXAgZWFy bHkgaW4gY2FzZSB0d28gdXNlcnMgd2FudCBhCmttYXAgb2YgdGhlIHNhbWUgYm8uICBBZGQgYSBz YW5pdHkgY2hlY2sgdG8gZGVzdHJveSBjYWxsYmFjayB0byBtYWtlCnN1cmUga21hcC9rdW5tYXAg aXMgYmFsYW5jZWQuCgpTaWduZWQtb2ZmLWJ5OiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0 LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9kcnYuaCAgICB8ICAxICsKIGRyaXZl cnMvZ3B1L2RybS9xeGwvcXhsX29iamVjdC5jIHwgIDYgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0v cXhsL3F4bF9wcmltZS5jICB8IDE3ICsrKysrKysrKysrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDIwIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3F4bC9xeGxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9kcnYuaAppbmRl eCA0M2M2ZGY5Y2Y5Li44YzNhZjFjZGJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcXhs L3F4bF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9kcnYuaApAQCAtODQsNiAr ODQsNyBAQCBzdHJ1Y3QgcXhsX2JvIHsKIAlzdHJ1Y3QgdHRtX2JvX2ttYXBfb2JqCQlrbWFwOwog CXVuc2lnbmVkIGludCBwaW5fY291bnQ7CiAJdm9pZAkJCQkqa3B0cjsKKwl1bnNpZ25lZCBpbnQg ICAgICAgICAgICAgICAgICAgIG1hcF9jb3VudDsKIAlpbnQgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHR5cGU7CiAKIAkvKiBDb25zdGFudCBhZnRlciBpbml0aWFsaXphdGlvbiAqLwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9k cm0vcXhsL3F4bF9vYmplY3QuYwppbmRleCAwMjRjOGRkMzE3Li40OTI4ZmE2MDI5IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9vYmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vcXhsL3F4bF9vYmplY3QuYwpAQCAtMzYsNiArMzYsNyBAQCBzdGF0aWMgdm9pZCBxeGxfdHRt X2JvX2Rlc3Ryb3koc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICp0Ym8pCiAJcWRldiA9IChzdHJ1 Y3QgcXhsX2RldmljZSAqKWJvLT5nZW1fYmFzZS5kZXYtPmRldl9wcml2YXRlOwogCiAJcXhsX3N1 cmZhY2VfZXZpY3QocWRldiwgYm8sIGZhbHNlKTsKKwlXQVJOX09OX09OQ0UoYm8tPm1hcF9jb3Vu dCA+IDApOwogCW11dGV4X2xvY2soJnFkZXYtPmdlbS5tdXRleCk7CiAJbGlzdF9kZWxfaW5pdCgm Ym8tPmxpc3QpOwogCW11dGV4X3VubG9jaygmcWRldi0+Z2VtLm11dGV4KTsKQEAgLTEzMSw2ICsx MzIsNyBAQCBpbnQgcXhsX2JvX2ttYXAoc3RydWN0IHF4bF9ibyAqYm8sIHZvaWQgKipwdHIpCiAJ aWYgKGJvLT5rcHRyKSB7CiAJCWlmIChwdHIpCiAJCQkqcHRyID0gYm8tPmtwdHI7CisJCWJvLT5t YXBfY291bnQrKzsKIAkJcmV0dXJuIDA7CiAJfQogCXIgPSB0dG1fYm9fa21hcCgmYm8tPnRibywg MCwgYm8tPnRiby5udW1fcGFnZXMsICZiby0+a21hcCk7CkBAIC0xMzksNiArMTQxLDcgQEAgaW50 IHF4bF9ib19rbWFwKHN0cnVjdCBxeGxfYm8gKmJvLCB2b2lkICoqcHRyKQogCWJvLT5rcHRyID0g dHRtX2ttYXBfb2JqX3ZpcnR1YWwoJmJvLT5rbWFwLCAmaXNfaW9tZW0pOwogCWlmIChwdHIpCiAJ CSpwdHIgPSBiby0+a3B0cjsKKwliby0+bWFwX2NvdW50ID0gMTsKIAlyZXR1cm4gMDsKIH0KIApA QCAtMTgwLDYgKzE4Myw5IEBAIHZvaWQgcXhsX2JvX2t1bm1hcChzdHJ1Y3QgcXhsX2JvICpibykK IHsKIAlpZiAoYm8tPmtwdHIgPT0gTlVMTCkKIAkJcmV0dXJuOworCWJvLT5tYXBfY291bnQtLTsK KwlpZiAoYm8tPm1hcF9jb3VudCA+IDApCisJCXJldHVybjsKIAliby0+a3B0ciA9IE5VTEw7CiAJ dHRtX2JvX2t1bm1hcCgmYm8tPmttYXApOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3F4bC9xeGxfcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3ByaW1lLmMKaW5kZXgg YTU1ZGVjZTExOC4uNzA4Mzc4ODQ0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3F4bC9x eGxfcHJpbWUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9wcmltZS5jCkBAIC0yMiw3 ICsyMiw3IEBACiAgKiBBdXRob3JzOiBBbmRyZWFzIFBva29ybnkKICAqLwogCi0jaW5jbHVkZSAi cXhsX2Rydi5oIgorI2luY2x1ZGUgInF4bF9vYmplY3QuaCIKIAogLyogRW1wdHkgSW1wbGVtZW50 YXRpb25zIGFzIHRoZXJlIHNob3VsZCBub3QgYmUgYW55IG90aGVyIGRyaXZlciBmb3IgYSB2aXJ0 dWFsCiAgKiBkZXZpY2UgdGhhdCBtaWdodCBzaGFyZSBidWZmZXJzIHdpdGggcXhsICovCkBAIC01 NCwxMyArNTQsMjIgQEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICpxeGxfZ2VtX3ByaW1lX2ltcG9y dF9zZ190YWJsZSgKIAogdm9pZCAqcXhsX2dlbV9wcmltZV92bWFwKHN0cnVjdCBkcm1fZ2VtX29i amVjdCAqb2JqKQogewotCVdBUk5fT05DRSgxLCAibm90IGltcGxlbWVudGVkIik7Ci0JcmV0dXJu IEVSUl9QVFIoLUVOT1NZUyk7CisJc3RydWN0IHF4bF9ibyAqYm8gPSBnZW1fdG9fcXhsX2JvKG9i aik7CisJdm9pZCAqcHRyOworCWludCByZXQ7CisKKwlyZXQgPSBxeGxfYm9fa21hcChibywgJnB0 cik7CisJaWYgKHJldCA8IDApCisJCXJldHVybiBFUlJfUFRSKHJldCk7CisKKwlyZXR1cm4gcHRy OwogfQogCiB2b2lkIHF4bF9nZW1fcHJpbWVfdnVubWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqLCB2b2lkICp2YWRkcikKIHsKLQlXQVJOX09OQ0UoMSwgIm5vdCBpbXBsZW1lbnRlZCIpOwor CXN0cnVjdCBxeGxfYm8gKmJvID0gZ2VtX3RvX3F4bF9ibyhvYmopOworCisJcXhsX2JvX2t1bm1h cChibyk7CiB9CiAKIGludCBxeGxfZ2VtX3ByaW1lX21tYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmosCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KU3BpY2UtZGV2ZWwgbWFpbGluZyBsaXN0ClNwaWNlLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L3NwaWNlLWRldmVsCg==