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=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 72E22C43461 for ; Mon, 7 Sep 2020 20:47:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3BFE5215A4 for ; Mon, 7 Sep 2020 20:47:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BFE5215A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A688F6E554; Mon, 7 Sep 2020 20:47:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CB476E558 for ; Mon, 7 Sep 2020 20:47:07 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-T1QySKjbMe6kH5q2JgVcXw-1; Mon, 07 Sep 2020 16:47:02 -0400 X-MC-Unique: T1QySKjbMe6kH5q2JgVcXw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4EA30801E53; Mon, 7 Sep 2020 20:47:01 +0000 (UTC) Received: from tyrion-bne-redhat-com.redhat.com (vpn2-54-45.bne.redhat.com [10.64.54.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEFDE60BE2; Mon, 7 Sep 2020 20:46:59 +0000 (UTC) From: Dave Airlie To: dri-devel@lists.freedesktop.org Subject: [PATCH 06/13] drm/nouveau/ttm: use driver bind/unbind/destroy functions. Date: Tue, 8 Sep 2020 06:46:23 +1000 Message-Id: <20200907204630.1406528-7-airlied@gmail.com> In-Reply-To: <20200907204630.1406528-1-airlied@gmail.com> References: <20200907204630.1406528-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com, sroland@vmware.com, bskeggs@redhat.com, christian.koenig@amd.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCkFja2VkLWJ5OiBDaHJpc3Rp YW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClJldmlld2VkLWJ5OiBCZW4gU2tl Z2dzIDxic2tlZ2dzQHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJs aWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9iby5j ICAgIHwgNDQgKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25v dXZlYXVfc2dkbWEuYyB8IDU0ICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfdHRtLmggICB8ICAzICsrCiAzIGZpbGVzIGNoYW5nZWQsIDU5 IGluc2VydGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZl YXVfYm8uYwppbmRleCAwOTFmODBmYmJkN2MuLmY2Y2FjNmVlYzY4NyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9iby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L25vdXZlYXVfYm8uYwpAQCAtNjY4LDYgKzY2OCwzMyBAQCBub3V2ZWF1X3R0bV90dF9j cmVhdGUoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywgdWludDMyX3QgcGFnZV9mbGFncykK IAlyZXR1cm4gbm91dmVhdV9zZ2RtYV9jcmVhdGVfdHRtKGJvLCBwYWdlX2ZsYWdzKTsKIH0KIAor c3RhdGljIGludAorbm91dmVhdV90dG1fdHRfYmluZChzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRl diwgc3RydWN0IHR0bV90dCAqdHRtLAorCQkgICAgc3RydWN0IHR0bV9yZXNvdXJjZSAqcmVnKQor eworI2lmIElTX0VOQUJMRUQoQ09ORklHX0FHUCkKKwlzdHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9 IG5vdXZlYXVfYmRldihiZGV2KTsKKworCWlmIChkcm0tPmFncC5icmlkZ2UpCisJCXJldHVybiB0 dG1fYWdwX2JpbmQoYmRldiwgdHRtLCByZWcpOworI2VuZGlmCisJcmV0dXJuIG5vdXZlYXVfc2dk bWFfYmluZChiZGV2LCB0dG0sIHJlZyk7Cit9CisKK3N0YXRpYyB2b2lkCitub3V2ZWF1X3R0bV90 dF91bmJpbmQoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsIHN0cnVjdCB0dG1fdHQgKnR0bSkK K3sKKyNpZiBJU19FTkFCTEVEKENPTkZJR19BR1ApCisJc3RydWN0IG5vdXZlYXVfZHJtICpkcm0g PSBub3V2ZWF1X2JkZXYoYmRldik7CisKKwlpZiAoZHJtLT5hZ3AuYnJpZGdlKSB7CisJCXR0bV9h Z3BfdW5iaW5kKGJkZXYsIHR0bSk7CisJCXJldHVybjsKKwl9CisjZW5kaWYKKwlub3V2ZWF1X3Nn ZG1hX3VuYmluZChiZGV2LCB0dG0pOworfQorCiBzdGF0aWMgdm9pZAogbm91dmVhdV9ib19ldmlj dF9mbGFncyhzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLCBzdHJ1Y3QgdHRtX3BsYWNlbWVu dCAqcGwpCiB7CkBAIC0xMjg1LDYgKzEzMTIsMjAgQEAgbm91dmVhdV90dG1fdHRfdW5wb3B1bGF0 ZShzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldiwKIAl0dG1fdW5tYXBfYW5kX3VucG9wdWxhdGVf cGFnZXMoZGV2LCB0dG1fZG1hKTsKIH0KIAorc3RhdGljIHZvaWQKK25vdXZlYXVfdHRtX3R0X2Rl c3Ryb3koc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCisJCSAgICAgICBzdHJ1Y3QgdHRtX3R0 ICp0dG0pCit7CisjaWYgSVNfRU5BQkxFRChDT05GSUdfQUdQKQorCXN0cnVjdCBub3V2ZWF1X2Ry bSAqZHJtID0gbm91dmVhdV9iZGV2KGJkZXYpOworCWlmIChkcm0tPmFncC5icmlkZ2UpIHsKKwkJ dHRtX2FncF9kZXN0cm95KGJkZXYsIHR0bSk7CisJCXJldHVybjsKKwl9CisjZW5kaWYKKwlub3V2 ZWF1X3NnZG1hX2Rlc3Ryb3koYmRldiwgdHRtKTsKK30KKwogdm9pZAogbm91dmVhdV9ib19mZW5j ZShzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibywgc3RydWN0IG5vdXZlYXVfZmVuY2UgKmZlbmNlLCBi b29sIGV4Y2x1c2l2ZSkKIHsKQEAgLTEzMDAsNiArMTM0MSw5IEBAIHN0cnVjdCB0dG1fYm9fZHJp dmVyIG5vdXZlYXVfYm9fZHJpdmVyID0gewogCS50dG1fdHRfY3JlYXRlID0gJm5vdXZlYXVfdHRt X3R0X2NyZWF0ZSwKIAkudHRtX3R0X3BvcHVsYXRlID0gJm5vdXZlYXVfdHRtX3R0X3BvcHVsYXRl LAogCS50dG1fdHRfdW5wb3B1bGF0ZSA9ICZub3V2ZWF1X3R0bV90dF91bnBvcHVsYXRlLAorCS50 dG1fdHRfYmluZCA9ICZub3V2ZWF1X3R0bV90dF9iaW5kLAorCS50dG1fdHRfdW5iaW5kID0gJm5v dXZlYXVfdHRtX3R0X3VuYmluZCwKKwkudHRtX3R0X2Rlc3Ryb3kgPSAmbm91dmVhdV90dG1fdHRf ZGVzdHJveSwKIAkuZXZpY3Rpb25fdmFsdWFibGUgPSB0dG1fYm9fZXZpY3Rpb25fdmFsdWFibGUs CiAJLmV2aWN0X2ZsYWdzID0gbm91dmVhdV9ib19ldmljdF9mbGFncywKIAkubW92ZV9ub3RpZnkg PSBub3V2ZWF1X2JvX21vdmVfbnRmeSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L25vdXZlYXVfc2dkbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfc2dk bWEuYwppbmRleCA2MDAwYzY1MGIxMDUuLjA1ZTU0MjI1NGUxZiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9zZ2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L25vdXZlYXVfc2dkbWEuYwpAQCAtMTQsNyArMTQsNyBAQCBzdHJ1Y3Qgbm91dmVhdV9z Z2RtYV9iZSB7CiAJc3RydWN0IG5vdXZlYXVfbWVtICptZW07CiB9OwogCi1zdGF0aWMgdm9pZAor dm9pZAogbm91dmVhdV9zZ2RtYV9kZXN0cm95KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LCBz dHJ1Y3QgdHRtX3R0ICp0dG0pCiB7CiAJc3RydWN0IG5vdXZlYXVfc2dkbWFfYmUgKm52YmUgPSAo c3RydWN0IG5vdXZlYXVfc2dkbWFfYmUgKil0dG07CkBAIC0yNSwxMCArMjUsMTEgQEAgbm91dmVh dV9zZ2RtYV9kZXN0cm95KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LCBzdHJ1Y3QgdHRtX3R0 ICp0dG0pCiAJfQogfQogCi1zdGF0aWMgaW50Ci1udjA0X3NnZG1hX2JpbmQoc3RydWN0IHR0bV9i b19kZXZpY2UgKmJkZXYsIHN0cnVjdCB0dG1fdHQgKnR0bSwgc3RydWN0IHR0bV9yZXNvdXJjZSAq cmVnKQoraW50Citub3V2ZWF1X3NnZG1hX2JpbmQoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYs IHN0cnVjdCB0dG1fdHQgKnR0bSwgc3RydWN0IHR0bV9yZXNvdXJjZSAqcmVnKQogewogCXN0cnVj dCBub3V2ZWF1X3NnZG1hX2JlICpudmJlID0gKHN0cnVjdCBub3V2ZWF1X3NnZG1hX2JlICopdHRt OworCXN0cnVjdCBub3V2ZWF1X2RybSAqZHJtID0gbm91dmVhdV9iZGV2KGJkZXYpOwogCXN0cnVj dCBub3V2ZWF1X21lbSAqbWVtID0gbm91dmVhdV9tZW0ocmVnKTsKIAlpbnQgcmV0OwogCkBAIC0z Niw2NSArMzcsMzQgQEAgbnYwNF9zZ2RtYV9iaW5kKHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2 LCBzdHJ1Y3QgdHRtX3R0ICp0dG0sIHN0cnVjdCB0dG1fcmVzb3UKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gbm91dmVhdV9tZW1fbWFwKG1lbSwgJm1lbS0+Y2xpLT52bW0udm1t LCAmbWVtLT52bWFbMF0pOwotCWlmIChyZXQpIHsKLQkJbm91dmVhdV9tZW1fZmluaShtZW0pOwot CQlyZXR1cm4gcmV0OworCWlmIChkcm0tPmNsaWVudC5kZXZpY2UuaW5mby5mYW1pbHkgPCBOVl9E RVZJQ0VfSU5GT19WMF9URVNMQSkgeworCQlyZXQgPSBub3V2ZWF1X21lbV9tYXAobWVtLCAmbWVt LT5jbGktPnZtbS52bW0sICZtZW0tPnZtYVswXSk7CisJCWlmIChyZXQpIHsKKwkJCW5vdXZlYXVf bWVtX2ZpbmkobWVtKTsKKwkJCXJldHVybiByZXQ7CisJCX0KIAl9CiAKIAludmJlLT5tZW0gPSBt ZW07CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkCi1udjA0X3NnZG1hX3VuYmluZChzdHJ1 Y3QgdHRtX2JvX2RldmljZSAqYmRldiwgc3RydWN0IHR0bV90dCAqdHRtKQordm9pZAorbm91dmVh dV9zZ2RtYV91bmJpbmQoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsIHN0cnVjdCB0dG1fdHQg KnR0bSkKIHsKIAlzdHJ1Y3Qgbm91dmVhdV9zZ2RtYV9iZSAqbnZiZSA9IChzdHJ1Y3Qgbm91dmVh dV9zZ2RtYV9iZSAqKXR0bTsKIAlub3V2ZWF1X21lbV9maW5pKG52YmUtPm1lbSk7CiB9CiAKLXN0 YXRpYyBzdHJ1Y3QgdHRtX2JhY2tlbmRfZnVuYyBudjA0X3NnZG1hX2JhY2tlbmQgPSB7Ci0JLmJp bmQJCQk9IG52MDRfc2dkbWFfYmluZCwKLQkudW5iaW5kCQkJPSBudjA0X3NnZG1hX3VuYmluZCwK LQkuZGVzdHJveQkJPSBub3V2ZWF1X3NnZG1hX2Rlc3Ryb3kKLX07Ci0KLXN0YXRpYyBpbnQKLW52 NTBfc2dkbWFfYmluZChzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldiwgc3RydWN0IHR0bV90dCAq dHRtLCBzdHJ1Y3QgdHRtX3Jlc291cmNlICpyZWcpCi17Ci0Jc3RydWN0IG5vdXZlYXVfc2dkbWFf YmUgKm52YmUgPSAoc3RydWN0IG5vdXZlYXVfc2dkbWFfYmUgKil0dG07Ci0Jc3RydWN0IG5vdXZl YXVfbWVtICptZW0gPSBub3V2ZWF1X21lbShyZWcpOwotCWludCByZXQ7Ci0KLQlyZXQgPSBub3V2 ZWF1X21lbV9ob3N0KHJlZywgJm52YmUtPnR0bSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsK LQotCW52YmUtPm1lbSA9IG1lbTsKLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIHN0cnVjdCB0dG1f YmFja2VuZF9mdW5jIG52NTBfc2dkbWFfYmFja2VuZCA9IHsKLQkuYmluZAkJCT0gbnY1MF9zZ2Rt YV9iaW5kLAotCS51bmJpbmQJCQk9IG52MDRfc2dkbWFfdW5iaW5kLAotCS5kZXN0cm95CQk9IG5v dXZlYXVfc2dkbWFfZGVzdHJveQotfTsKLQogc3RydWN0IHR0bV90dCAqCiBub3V2ZWF1X3NnZG1h X2NyZWF0ZV90dG0oc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywgdWludDMyX3QgcGFnZV9m bGFncykKIHsKLQlzdHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9IG5vdXZlYXVfYmRldihiby0+YmRl dik7CiAJc3RydWN0IG5vdXZlYXVfc2dkbWFfYmUgKm52YmU7CiAKIAludmJlID0ga3phbGxvYyhz aXplb2YoKm52YmUpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIW52YmUpCiAJCXJldHVybiBOVUxMOwog Ci0JaWYgKGRybS0+Y2xpZW50LmRldmljZS5pbmZvLmZhbWlseSA8IE5WX0RFVklDRV9JTkZPX1Yw X1RFU0xBKQotCQludmJlLT50dG0udHRtLmZ1bmMgPSAmbnYwNF9zZ2RtYV9iYWNrZW5kOwotCWVs c2UKLQkJbnZiZS0+dHRtLnR0bS5mdW5jID0gJm52NTBfc2dkbWFfYmFja2VuZDsKLQogCWlmICh0 dG1fZG1hX3R0X2luaXQoJm52YmUtPnR0bSwgYm8sIHBhZ2VfZmxhZ3MpKSB7CiAJCWtmcmVlKG52 YmUpOwogCQlyZXR1cm4gTlVMTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L25vdXZlYXVfdHRtLmggYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3R0bS5oCmlu ZGV4IGVhZjI1NDYxY2Q5MS4uNjk1NTIwNDliYjk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X3R0bS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25v dXZlYXVfdHRtLmgKQEAgLTIyLDQgKzIyLDcgQEAgaW50ICBub3V2ZWF1X3R0bV9tbWFwKHN0cnVj dCBmaWxlICosIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqKTsKIGludCAgbm91dmVhdV90dG1fZ2xv YmFsX2luaXQoc3RydWN0IG5vdXZlYXVfZHJtICopOwogdm9pZCBub3V2ZWF1X3R0bV9nbG9iYWxf cmVsZWFzZShzdHJ1Y3Qgbm91dmVhdV9kcm0gKik7CiAKK2ludCBub3V2ZWF1X3NnZG1hX2JpbmQo c3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsIHN0cnVjdCB0dG1fdHQgKnR0bSwgc3RydWN0IHR0 bV9yZXNvdXJjZSAqcmVnKTsKK3ZvaWQgbm91dmVhdV9zZ2RtYV91bmJpbmQoc3RydWN0IHR0bV9i b19kZXZpY2UgKmJkZXYsIHN0cnVjdCB0dG1fdHQgKnR0bSk7Cit2b2lkIG5vdXZlYXVfc2dkbWFf ZGVzdHJveShzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldiwgc3RydWN0IHR0bV90dCAqdHRtKTsK ICNlbmRpZgotLSAKMi4yNy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK