From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH 4/6] drm/ttm: use gem reservation object Date: Thu, 20 Jun 2019 09:44:22 +0200 Message-ID: <20190620074424.1677-5-kraxel@redhat.com> References: <20190620074424.1677-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 438606E501 for ; Thu, 20 Jun 2019 07:44:35 +0000 (UTC) In-Reply-To: <20190620074424.1677-1-kraxel@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: David Airlie , open list , Huang Rui , Gerd Hoffmann , Christian Koenig List-Id: dri-devel@lists.freedesktop.org RHJvcCB0dG1fcmVzdiBmcm9tIHR0bV9idWZmZXJfb2JqZWN0LCB1c2UgdGhlIGdlbSByZXNlcnZh dGlvbiBvYmplY3QKKGJhc2UuX3Jlc3YpIGluc3RlYWQuCgpTaWduZWQtb2ZmLWJ5OiBHZXJkIEhv ZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KLS0tCiBpbmNsdWRlL2RybS90dG0vdHRtX2JvX2Fw aS5oICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5jICAgICAgfCA0MCAr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9i b191dGlsLmMgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAxOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS90dG0vdHRtX2JvX2FwaS5oIGIv aW5jbHVkZS9kcm0vdHRtL3R0bV9ib19hcGkuaAppbmRleCA3MmY2YWVkYTYxOWMuLjg4YWE3YmYx YjE4YSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vdHRtL3R0bV9ib19hcGkuaAorKysgYi9pbmNs dWRlL2RybS90dG0vdHRtX2JvX2FwaS5oCkBAIC0yMzUsNyArMjM1LDYgQEAgc3RydWN0IHR0bV9i dWZmZXJfb2JqZWN0IHsKIAlzdHJ1Y3Qgc2dfdGFibGUgKnNnOwogCiAJc3RydWN0IHJlc2VydmF0 aW9uX29iamVjdCAqcmVzdjsKLQlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0IHR0bV9yZXN2Owog CXN0cnVjdCBtdXRleCB3dV9tdXRleDsKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS90dG0vdHRtX2JvLmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5jCmluZGV4IGM3ZGU2 NjdkNDgyYS4uNTE2ZWVmM2I3NmQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0 bV9iby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMKQEAgLTE2MCw3ICsxNjAs OCBAQCBzdGF0aWMgdm9pZCB0dG1fYm9fcmVsZWFzZV9saXN0KHN0cnVjdCBrcmVmICpsaXN0X2ty ZWYpCiAJdHRtX3R0X2Rlc3Ryb3koYm8tPnR0bSk7CiAJYXRvbWljX2RlYygmYm8tPmJkZXYtPmds b2ItPmJvX2NvdW50KTsKIAlkbWFfZmVuY2VfcHV0KGJvLT5tb3ZpbmcpOwotCXJlc2VydmF0aW9u X29iamVjdF9maW5pKCZiby0+dHRtX3Jlc3YpOworCWlmICghdHRtX2JvX3VzZXNfZW1iZWRkZWRf Z2VtX29iamVjdChibykpCisJCXJlc2VydmF0aW9uX29iamVjdF9maW5pKCZiby0+YmFzZS5fcmVz dik7CiAJbXV0ZXhfZGVzdHJveSgmYm8tPnd1X211dGV4KTsKIAliby0+ZGVzdHJveShibyk7CiAJ dHRtX21lbV9nbG9iYWxfZnJlZShiZGV2LT5nbG9iLT5tZW1fZ2xvYiwgYWNjX3NpemUpOwpAQCAt NDM4LDE0ICs0MzksMTQgQEAgc3RhdGljIGludCB0dG1fYm9faW5kaXZpZHVhbGl6ZV9yZXN2KHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8pCiB7CiAJaW50IHI7CiAKLQlpZiAoYm8tPnJlc3Yg PT0gJmJvLT50dG1fcmVzdikKKwlpZiAoYm8tPnJlc3YgPT0gJmJvLT5iYXNlLl9yZXN2KQogCQly ZXR1cm4gMDsKIAotCUJVR19PTighcmVzZXJ2YXRpb25fb2JqZWN0X3RyeWxvY2soJmJvLT50dG1f cmVzdikpOworCUJVR19PTighcmVzZXJ2YXRpb25fb2JqZWN0X3RyeWxvY2soJmJvLT5iYXNlLl9y ZXN2KSk7CiAKLQlyID0gcmVzZXJ2YXRpb25fb2JqZWN0X2NvcHlfZmVuY2VzKCZiby0+dHRtX3Jl c3YsIGJvLT5yZXN2KTsKKwlyID0gcmVzZXJ2YXRpb25fb2JqZWN0X2NvcHlfZmVuY2VzKCZiby0+ YmFzZS5fcmVzdiwgYm8tPnJlc3YpOwogCWlmIChyKQotCQlyZXNlcnZhdGlvbl9vYmplY3RfdW5s b2NrKCZiby0+dHRtX3Jlc3YpOworCQlyZXNlcnZhdGlvbl9vYmplY3RfdW5sb2NrKCZiby0+YmFz ZS5fcmVzdik7CiAKIAlyZXR1cm4gcjsKIH0KQEAgLTQ1Niw4ICs0NTcsOCBAQCBzdGF0aWMgdm9p ZCB0dG1fYm9fZmx1c2hfYWxsX2ZlbmNlcyhzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvKQog CXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOwogCWludCBpOwogCi0JZm9iaiA9IHJlc2VydmF0aW9u X29iamVjdF9nZXRfbGlzdCgmYm8tPnR0bV9yZXN2KTsKLQlmZW5jZSA9IHJlc2VydmF0aW9uX29i amVjdF9nZXRfZXhjbCgmYm8tPnR0bV9yZXN2KTsKKwlmb2JqID0gcmVzZXJ2YXRpb25fb2JqZWN0 X2dldF9saXN0KCZiby0+YmFzZS5fcmVzdik7CisJZmVuY2UgPSByZXNlcnZhdGlvbl9vYmplY3Rf Z2V0X2V4Y2woJmJvLT5iYXNlLl9yZXN2KTsKIAlpZiAoZmVuY2UgJiYgIWZlbmNlLT5vcHMtPnNp Z25hbGVkKQogCQlkbWFfZmVuY2VfZW5hYmxlX3N3X3NpZ25hbGluZyhmZW5jZSk7CiAKQEAgLTQ5 MCwxMSArNDkxLDExIEBAIHN0YXRpYyB2b2lkIHR0bV9ib19jbGVhbnVwX3JlZnNfb3JfcXVldWUo c3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibykKIAlzcGluX2xvY2soJmdsb2ItPmxydV9sb2Nr KTsKIAlyZXQgPSByZXNlcnZhdGlvbl9vYmplY3RfdHJ5bG9jayhiby0+cmVzdikgPyAwIDogLUVC VVNZOwogCWlmICghcmV0KSB7Ci0JCWlmIChyZXNlcnZhdGlvbl9vYmplY3RfdGVzdF9zaWduYWxl ZF9yY3UoJmJvLT50dG1fcmVzdiwgdHJ1ZSkpIHsKKwkJaWYgKHJlc2VydmF0aW9uX29iamVjdF90 ZXN0X3NpZ25hbGVkX3JjdSgmYm8tPmJhc2UuX3Jlc3YsIHRydWUpKSB7CiAJCQl0dG1fYm9fZGVs X2Zyb21fbHJ1KGJvKTsKIAkJCXNwaW5fdW5sb2NrKCZnbG9iLT5scnVfbG9jayk7Ci0JCQlpZiAo Ym8tPnJlc3YgIT0gJmJvLT50dG1fcmVzdikKLQkJCQlyZXNlcnZhdGlvbl9vYmplY3RfdW5sb2Nr KCZiby0+dHRtX3Jlc3YpOworCQkJaWYgKGJvLT5yZXN2ICE9ICZiby0+YmFzZS5fcmVzdikKKwkJ CQlyZXNlcnZhdGlvbl9vYmplY3RfdW5sb2NrKCZiby0+YmFzZS5fcmVzdik7CiAKIAkJCXR0bV9i b19jbGVhbnVwX21lbXR5cGVfdXNlKGJvKTsKIAkJCXJlc2VydmF0aW9uX29iamVjdF91bmxvY2so Ym8tPnJlc3YpOwpAQCAtNTE1LDggKzUxNiw4IEBAIHN0YXRpYyB2b2lkIHR0bV9ib19jbGVhbnVw X3JlZnNfb3JfcXVldWUoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibykKIAogCQlyZXNlcnZh dGlvbl9vYmplY3RfdW5sb2NrKGJvLT5yZXN2KTsKIAl9Ci0JaWYgKGJvLT5yZXN2ICE9ICZiby0+ dHRtX3Jlc3YpCi0JCXJlc2VydmF0aW9uX29iamVjdF91bmxvY2soJmJvLT50dG1fcmVzdik7CisJ aWYgKGJvLT5yZXN2ICE9ICZiby0+YmFzZS5fcmVzdikKKwkJcmVzZXJ2YXRpb25fb2JqZWN0X3Vu bG9jaygmYm8tPmJhc2UuX3Jlc3YpOwogCiBlcnJvcjoKIAlrcmVmX2dldCgmYm8tPmxpc3Rfa3Jl Zik7CkBAIC01NTEsNyArNTUyLDcgQEAgc3RhdGljIGludCB0dG1fYm9fY2xlYW51cF9yZWZzKHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCiAJaWYgKHVubGlrZWx5KGxpc3RfZW1wdHkoJmJv LT5kZGVzdHJveSkpKQogCQlyZXN2ID0gYm8tPnJlc3Y7CiAJZWxzZQotCQlyZXN2ID0gJmJvLT50 dG1fcmVzdjsKKwkJcmVzdiA9ICZiby0+YmFzZS5fcmVzdjsKIAogCWlmIChyZXNlcnZhdGlvbl9v YmplY3RfdGVzdF9zaWduYWxlZF9yY3UocmVzdiwgdHJ1ZSkpCiAJCXJldCA9IDA7CkBAIC02MzEs NyArNjMyLDcgQEAgc3RhdGljIGJvb2wgdHRtX2JvX2RlbGF5ZWRfZGVsZXRlKHN0cnVjdCB0dG1f Ym9fZGV2aWNlICpiZGV2LCBib29sIHJlbW92ZV9hbGwpCiAJCWtyZWZfZ2V0KCZiby0+bGlzdF9r cmVmKTsKIAkJbGlzdF9tb3ZlX3RhaWwoJmJvLT5kZGVzdHJveSwgJnJlbW92ZWQpOwogCi0JCWlm IChyZW1vdmVfYWxsIHx8IGJvLT5yZXN2ICE9ICZiby0+dHRtX3Jlc3YpIHsKKwkJaWYgKHJlbW92 ZV9hbGwgfHwgYm8tPnJlc3YgIT0gJmJvLT5iYXNlLl9yZXN2KSB7CiAJCQlzcGluX3VubG9jaygm Z2xvYi0+bHJ1X2xvY2spOwogCQkJcmVzZXJ2YXRpb25fb2JqZWN0X2xvY2soYm8tPnJlc3YsIE5V TEwpOwogCkBAIC0xMzMyLDkgKzEzMzMsMTYgQEAgaW50IHR0bV9ib19pbml0X3Jlc2VydmVkKHN0 cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LAogCQliby0+cmVzdiA9IHJlc3Y7CiAJCXJlc2VydmF0 aW9uX29iamVjdF9hc3NlcnRfaGVsZChiby0+cmVzdik7CiAJfSBlbHNlIHsKLQkJYm8tPnJlc3Yg PSAmYm8tPnR0bV9yZXN2OworCQliby0+cmVzdiA9ICZiby0+YmFzZS5fcmVzdjsKKwl9CisJaWYg KCF0dG1fYm9fdXNlc19lbWJlZGRlZF9nZW1fb2JqZWN0KGJvKSkgeworCQkvKgorCQkgKiBiby5n ZW0gaXMgbm90IGluaXRpYWxpemVkLCBzbyB3ZSBoYXZlIHRvIHNldHVwIHRoZQorCQkgKiBzdHJ1 Y3QgZWxlbWVudHMgd2Ugd2FudCB1c2UgcmVnYXJkbGVzcy4gIFNob3VsZCBnbworCQkgKiBhd2F5 IG9uY2UgYWxsIHVzZXJzIGFyZSBzd2l0Y2hlZCBvdmVyLgorCQkgKi8KKwkJcmVzZXJ2YXRpb25f b2JqZWN0X2luaXQoJmJvLT5iYXNlLl9yZXN2KTsKIAl9Ci0JcmVzZXJ2YXRpb25fb2JqZWN0X2lu aXQoJmJvLT50dG1fcmVzdik7CiAJYXRvbWljX2luYygmYm8tPmJkZXYtPmdsb2ItPmJvX2NvdW50 KTsKIAlkcm1fdm1hX25vZGVfcmVzZXQoJmJvLT52bWFfbm9kZSk7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvX3V0aWwuYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRt X2JvX3V0aWwuYwppbmRleCA4OTVkNzdkNzk5ZTQuLjNkMjYxN2RkNjNlMyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90 dG0vdHRtX2JvX3V0aWwuYwpAQCAtNTE3LDcgKzUxNyw3IEBAIHN0YXRpYyBpbnQgdHRtX2J1ZmZl cl9vYmplY3RfdHJhbnNmZXIoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAlrcmVmX2lu aXQoJmZiby0+YmFzZS5rcmVmKTsKIAlmYm8tPmJhc2UuZGVzdHJveSA9ICZ0dG1fdHJhbnNmZXJl ZF9kZXN0cm95OwogCWZiby0+YmFzZS5hY2Nfc2l6ZSA9IDA7Ci0JZmJvLT5iYXNlLnJlc3YgPSAm ZmJvLT5iYXNlLnR0bV9yZXN2OworCWZiby0+YmFzZS5yZXN2ID0gJmZiby0+YmFzZS5iYXNlLl9y ZXN2OwogCXJlc2VydmF0aW9uX29iamVjdF9pbml0KGZiby0+YmFzZS5yZXN2KTsKIAlyZXQgPSBy ZXNlcnZhdGlvbl9vYmplY3RfdHJ5bG9jayhmYm8tPmJhc2UucmVzdik7CiAJV0FSTl9PTighcmV0 KTsKLS0gCjIuMTguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVs