From: Karol Herbst Subject: [PATCH 4/6] Revert "drm/ttm: use a static ttm_bo_global instance" Date: Tue, 16 Apr 2019 02:35:21 +0200 Message-ID: <20190416003523.5069-5-kherbst@redhat.com> References: <20190416003523.5069-1-kherbst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C65E89688 for ; Tue, 16 Apr 2019 00:35:34 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id q1so24376228wrp.0 for ; Mon, 15 Apr 2019 17:35:34 -0700 (PDT) In-Reply-To: <20190416003523.5069-1-kherbst@redhat.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: Alex Deucher , Karol Herbst List-Id: dri-devel@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCA2MmI1M2IzN2U0YjE1MDBkNGViNDYyNGE0NGFkODYxY2Y4ZDNj ZDE4LgoKU2lnbmVkLW9mZi1ieTogS2Fyb2wgSGVyYnN0IDxraGVyYnN0QHJlZGhhdC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm8uYyAgICB8IDMxICsrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvZHJtL3R0bS90dG1fYm9fZHJpdmVyLmggfCAxNSArKysr KysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm8uYyBiL2RyaXZl cnMvZ3B1L2RybS90dG0vdHRtX2JvLmMKaW5kZXggNjk0MTU2MmVmMmZhLi5jMGVmZTRjODliYWYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3R0bS90dG1fYm8uYwpAQCAtNDksOSArNDksNiBAQCBzdGF0aWMgdm9pZCB0dG1fYm9f Z2xvYmFsX2tvYmpfcmVsZWFzZShzdHJ1Y3Qga29iamVjdCAqa29iaik7CiAgKiB0dG1fZ2xvYmFs X211dGV4IC0gcHJvdGVjdGluZyB0aGUgZ2xvYmFsIEJPIHN0YXRlCiAgKi8KIERFRklORV9NVVRF WCh0dG1fZ2xvYmFsX211dGV4KTsKLXN0cnVjdCB0dG1fYm9fZ2xvYmFsIHR0bV9ib19nbG9iID0g ewotCS51c2VfY291bnQgPSAwCi19OwogCiBzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZSB0dG1fYm9f Y291bnQgPSB7CiAJLm5hbWUgPSAiYm9fY291bnQiLApAQCAtMTUzMSwzNSArMTUyOCwyMiBAQCBz dGF0aWMgdm9pZCB0dG1fYm9fZ2xvYmFsX2tvYmpfcmVsZWFzZShzdHJ1Y3Qga29iamVjdCAqa29i aikKIAlrZnJlZShnbG9iKTsKIH0KIAotdm9pZCB0dG1fYm9fZ2xvYmFsX3JlbGVhc2Uodm9pZCkK K3ZvaWQgdHRtX2JvX2dsb2JhbF9yZWxlYXNlKHN0cnVjdCB0dG1fYm9fZ2xvYmFsICpnbG9iKQog ewotCXN0cnVjdCB0dG1fYm9fZ2xvYmFsICpnbG9iID0gJnR0bV9ib19nbG9iOwotCi0JbXV0ZXhf bG9jaygmdHRtX2dsb2JhbF9tdXRleCk7Ci0JaWYgKC0tZ2xvYi0+dXNlX2NvdW50ID4gMCkKLQkJ Z290byBvdXQ7Ci0KIAlrb2JqZWN0X2RlbCgmZ2xvYi0+a29iaik7CiAJa29iamVjdF9wdXQoJmds b2ItPmtvYmopOwogCXR0bV9tZW1fZ2xvYmFsX3JlbGVhc2UoJnR0bV9tZW1fZ2xvYik7Ci1vdXQ6 Ci0JbXV0ZXhfdW5sb2NrKCZ0dG1fZ2xvYmFsX211dGV4KTsKIH0KIEVYUE9SVF9TWU1CT0wodHRt X2JvX2dsb2JhbF9yZWxlYXNlKTsKIAotaW50IHR0bV9ib19nbG9iYWxfaW5pdCh2b2lkKQoraW50 IHR0bV9ib19nbG9iYWxfaW5pdChzdHJ1Y3QgdHRtX2JvX2dsb2JhbCAqZ2xvYikKIHsKLQlzdHJ1 Y3QgdHRtX2JvX2dsb2JhbCAqZ2xvYiA9ICZ0dG1fYm9fZ2xvYjsKLQlpbnQgcmV0ID0gMDsKKwlp bnQgcmV0OwogCXVuc2lnbmVkIGk7CiAKLQltdXRleF9sb2NrKCZ0dG1fZ2xvYmFsX211dGV4KTsK LQlpZiAoKytnbG9iLT51c2VfY291bnQgPiAxKQotCQlnb3RvIG91dDsKLQogCXJldCA9IHR0bV9t ZW1fZ2xvYmFsX2luaXQoJnR0bV9tZW1fZ2xvYik7CiAJaWYgKHJldCkKLQkJZ290byBvdXQ7CisJ CXJldHVybiByZXQ7CiAKIAlzcGluX2xvY2tfaW5pdCgmZ2xvYi0+bHJ1X2xvY2spOwogCWdsb2It Pm1lbV9nbG9iID0gJnR0bV9tZW1fZ2xvYjsKQEAgLTE1NjgsNyArMTU1Miw3IEBAIGludCB0dG1f Ym9fZ2xvYmFsX2luaXQodm9pZCkKIAogCWlmICh1bmxpa2VseShnbG9iLT5kdW1teV9yZWFkX3Bh Z2UgPT0gTlVMTCkpIHsKIAkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBvdXQ7CisJCWdvdG8gb3V0 X25vX2RycDsKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgVFRNX01BWF9CT19QUklPUklUWTsgKytp KQpAQCAtMTU4MCw4ICsxNTY0LDkgQEAgaW50IHR0bV9ib19nbG9iYWxfaW5pdCh2b2lkKQogCQkm Z2xvYi0+a29iaiwgJnR0bV9ib19nbG9iX2tvYmpfdHlwZSwgdHRtX2dldF9rb2JqKCksICJidWZm ZXJfb2JqZWN0cyIpOwogCWlmICh1bmxpa2VseShyZXQgIT0gMCkpCiAJCWtvYmplY3RfcHV0KCZn bG9iLT5rb2JqKTsKLW91dDoKLQltdXRleF91bmxvY2soJnR0bV9nbG9iYWxfbXV0ZXgpOworCXJl dHVybiByZXQ7CitvdXRfbm9fZHJwOgorCWtmcmVlKGdsb2IpOwogCXJldHVybiByZXQ7CiB9CiBF WFBPUlRfU1lNQk9MKHR0bV9ib19nbG9iYWxfaW5pdCk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2Ry bS90dG0vdHRtX2JvX2RyaXZlci5oIGIvaW5jbHVkZS9kcm0vdHRtL3R0bV9ib19kcml2ZXIuaApp bmRleCAyNmJlNzQ5MzlmMTAuLjljZWM4ODM1Yjg4ZiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0v dHRtL3R0bV9ib19kcml2ZXIuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX2JvX2RyaXZlci5o CkBAIC0zOTgsNyArMzk4LDcgQEAgc3RydWN0IHR0bV9ib19kcml2ZXIgewogICogQHN3YXBfbHJ1 OiBMcnUgbGlzdCBvZiBidWZmZXIgb2JqZWN0cyB1c2VkIGZvciBzd2FwcGluZy4KICAqLwogCi1l eHRlcm4gc3RydWN0IHR0bV9ib19nbG9iYWwgeworc3RydWN0IHR0bV9ib19nbG9iYWwgewogCiAJ LyoqCiAJICogQ29uc3RhbnQgYWZ0ZXIgaW5pdC4KQEAgLTQxMCw5ICs0MTAsOCBAQCBleHRlcm4g c3RydWN0IHR0bV9ib19nbG9iYWwgewogCXNwaW5sb2NrX3QgbHJ1X2xvY2s7CiAKIAkvKioKLQkg KiBQcm90ZWN0ZWQgYnkgdHRtX2dsb2JhbF9tdXRleC4KKwkgKiBQcm90ZWN0ZWQgYnkgZGV2aWNl X2xpc3RfbXV0ZXguCiAJICovCi0JdW5zaWduZWQgaW50IHVzZV9jb3VudDsKIAlzdHJ1Y3QgbGlz dF9oZWFkIGRldmljZV9saXN0OwogCiAJLyoqCkBAIC00MjQsNyArNDIzLDcgQEAgZXh0ZXJuIHN0 cnVjdCB0dG1fYm9fZ2xvYmFsIHsKIAkgKiBJbnRlcm5hbCBwcm90ZWN0aW9uLgogCSAqLwogCWF0 b21pY190IGJvX2NvdW50OwotfSB0dG1fYm9fZ2xvYjsKK307CiAKIAogI2RlZmluZSBUVE1fTlVN X01FTV9UWVBFUyA4CkBAIC01NjksOCArNTY4LDggQEAgdm9pZCB0dG1fYm9fbWVtX3B1dChzdHJ1 Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLCBzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSk7CiB2b2lk IHR0bV9ib19tZW1fcHV0X2xvY2tlZChzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogCQkJ ICAgc3RydWN0IHR0bV9tZW1fcmVnICptZW0pOwogCi12b2lkIHR0bV9ib19nbG9iYWxfcmVsZWFz ZSh2b2lkKTsKLWludCB0dG1fYm9fZ2xvYmFsX2luaXQodm9pZCk7Cit2b2lkIHR0bV9ib19nbG9i YWxfcmVsZWFzZShzdHJ1Y3QgdHRtX2JvX2dsb2JhbCAqZ2xvYik7CitpbnQgdHRtX2JvX2dsb2Jh bF9pbml0KHN0cnVjdCB0dG1fYm9fZ2xvYmFsICpnbG9iKTsKIAogaW50IHR0bV9ib19kZXZpY2Vf cmVsZWFzZShzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldik7CiAKQEAgLTkwNyw3ICs5MDYsNyBA QCBzdHJ1Y3QgdHRtX2JvX2dsb2JhbF9yZWYgewogICovCiBzdGF0aWMgaW5saW5lIGludCB0dG1f Ym9fZ2xvYmFsX3JlZl9pbml0KHN0cnVjdCBkcm1fZ2xvYmFsX3JlZmVyZW5jZSAqcmVmKQogewot CXJldHVybiB0dG1fYm9fZ2xvYmFsX2luaXQoKTsKKwlyZXR1cm4gdHRtX2JvX2dsb2JhbF9pbml0 KHJlZi0+b2JqZWN0KTsKIH0KIAogLyoqCkBAIC05MjEsNyArOTIwLDcgQEAgc3RhdGljIGlubGlu ZSBpbnQgdHRtX2JvX2dsb2JhbF9yZWZfaW5pdChzdHJ1Y3QgZHJtX2dsb2JhbF9yZWZlcmVuY2Ug KnJlZikKICAqLwogc3RhdGljIGlubGluZSB2b2lkIHR0bV9ib19nbG9iYWxfcmVmX3JlbGVhc2Uo c3RydWN0IGRybV9nbG9iYWxfcmVmZXJlbmNlICpyZWYpCiB7Ci0JdHRtX2JvX2dsb2JhbF9yZWxl YXNlKCk7CisJdHRtX2JvX2dsb2JhbF9yZWxlYXNlKHJlZi0+b2JqZWN0KTsKIH0KIAogI2VuZGlm Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA==