From: Gerd Hoffmann Subject: [PATCH v4 12/16] drm/bochs: move ttm_bo_(un)reserve calls into bochs_bo_{pin, unpin} Date: Fri, 11 Jan 2019 06:37:48 +0100 Message-ID: <20190111053752.4004-13-kraxel@redhat.com> References: <20190111053752.4004-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 BCD7A6F55B for ; Fri, 11 Jan 2019 05:38:02 +0000 (UTC) In-Reply-To: <20190111053752.4004-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, David Airlie Cc: andr2000@gmail.com, open list , "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" , David Airlie , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkFja2VkLWJ5 OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9ib2Nocy9ib2Noc19mYmRldi5jIHwgIDggLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9i b2Nocy9ib2Noc19rbXMuYyAgIHwgMTQgKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9i b2Nocy9ib2Noc19tbS5jICAgIHwgIDggKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgOSBpbnNl cnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v Ym9jaHMvYm9jaHNfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19mYmRldi5j CmluZGV4IDkyZmViODE3ZmYuLmNjZjc4M2IwMzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9ib2Nocy9ib2Noc19mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19m YmRldi5jCkBAIC03NywxNCArNzcsOSBAQCBzdGF0aWMgaW50IGJvY2hzZmJfY3JlYXRlKHN0cnVj dCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAKIAlibyA9IGdlbV90b19ib2Noc19ibyhnb2JqKTsK IAotCXJldCA9IHR0bV9ib19yZXNlcnZlKCZiby0+Ym8sIHRydWUsIGZhbHNlLCBOVUxMKTsKLQlp ZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCiAJcmV0ID0gYm9jaHNfYm9fcGluKGJvLCBUVE1fUExf RkxBR19WUkFNKTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBmYmNv blxuIik7Ci0JCXR0bV9ib191bnJlc2VydmUoJmJvLT5ibyk7CiAJCXJldHVybiByZXQ7CiAJfQog CkBAIC05MiwxMiArODcsOSBAQCBzdGF0aWMgaW50IGJvY2hzZmJfY3JlYXRlKHN0cnVjdCBkcm1f ZmJfaGVscGVyICpoZWxwZXIsCiAJCQkgICZiby0+a21hcCk7CiAJaWYgKHJldCkgewogCQlEUk1f RVJST1IoImZhaWxlZCB0byBrbWFwIGZiY29uXG4iKTsKLQkJdHRtX2JvX3VucmVzZXJ2ZSgmYm8t PmJvKTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQl0dG1fYm9fdW5yZXNlcnZlKCZiby0+Ym8pOwot CiAJLyogaW5pdCBmYiBkZXZpY2UgKi8KIAlpbmZvID0gZHJtX2ZiX2hlbHBlcl9hbGxvY19mYmko aGVscGVyKTsKIAlpZiAoSVNfRVJSKGluZm8pKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYm9jaHMvYm9jaHNfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfa21zLmMK aW5kZXggZjY2M2M1NDE4NS4uZmM4NTZhMDJhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2JvY2hzL2JvY2hzX2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19rbXMu YwpAQCAtOTIsMzQgKzkyLDIyIEBAIHN0YXRpYyBpbnQgYm9jaHNfcGxhbmVfcHJlcGFyZV9mYihz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdf c3RhdGUpCiB7CiAJc3RydWN0IGJvY2hzX2JvICpibzsKLQlpbnQgcmV0OwogCiAJaWYgKCFuZXdf c3RhdGUtPmZiKQogCQlyZXR1cm4gMDsKIAlibyA9IGdlbV90b19ib2Noc19ibyhuZXdfc3RhdGUt PmZiLT5vYmpbMF0pOwotCi0JcmV0ID0gdHRtX2JvX3Jlc2VydmUoJmJvLT5ibywgdHJ1ZSwgZmFs c2UsIE5VTEwpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0JcmV0ID0gYm9jaHNfYm9fcGlu KGJvLCBUVE1fUExfRkxBR19WUkFNKTsKLQl0dG1fYm9fdW5yZXNlcnZlKCZiby0+Ym8pOwotCXJl dHVybiByZXQ7CisJcmV0dXJuIGJvY2hzX2JvX3BpbihibywgVFRNX1BMX0ZMQUdfVlJBTSk7CiB9 CiAKIHN0YXRpYyB2b2lkIGJvY2hzX3BsYW5lX2NsZWFudXBfZmIoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJCQkJICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3N0YXRlKQogewogCXN0 cnVjdCBib2Noc19ibyAqYm87Ci0JaW50IHJldDsKIAogCWlmICghb2xkX3N0YXRlLT5mYikKIAkJ cmV0dXJuOwogCWJvID0gZ2VtX3RvX2JvY2hzX2JvKG9sZF9zdGF0ZS0+ZmItPm9ialswXSk7Ci0J cmV0ID0gdHRtX2JvX3Jlc2VydmUoJmJvLT5ibywgdHJ1ZSwgZmFsc2UsIE5VTEwpOwotCWlmIChy ZXQpCi0JCXJldHVybjsKIAlib2Noc19ib191bnBpbihibyk7Ci0JdHRtX2JvX3VucmVzZXJ2ZSgm Ym8tPmJvKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNz IGJvY2hzX3BsYW5lX2hlbHBlcl9mdW5jcyA9IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9ib2Nocy9ib2Noc19tbS5jIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX21tLmMKaW5k ZXggNWEwZTA5Mjg0Ny4uZmNiZjM1NDU2ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Jv Y2hzL2JvY2hzX21tLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX21tLmMKQEAg LTIyMyw3ICsyMjMsMTEgQEAgaW50IGJvY2hzX2JvX3BpbihzdHJ1Y3QgYm9jaHNfYm8gKmJvLCB1 MzIgcGxfZmxhZykKIAlib2Noc190dG1fcGxhY2VtZW50KGJvLCBwbF9mbGFnKTsKIAlmb3IgKGkg PSAwOyBpIDwgYm8tPnBsYWNlbWVudC5udW1fcGxhY2VtZW50OyBpKyspCiAJCWJvLT5wbGFjZW1l bnRzW2ldLmZsYWdzIHw9IFRUTV9QTF9GTEFHX05PX0VWSUNUOworCXJldCA9IHR0bV9ib19yZXNl cnZlKCZiby0+Ym8sIHRydWUsIGZhbHNlLCBOVUxMKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0 OwogCXJldCA9IHR0bV9ib192YWxpZGF0ZSgmYm8tPmJvLCAmYm8tPnBsYWNlbWVudCwgJmN0eCk7 CisJdHRtX2JvX3VucmVzZXJ2ZSgmYm8tPmJvKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC0yNDcsNyArMjUxLDExIEBAIGludCBib2Noc19ib191bnBpbihzdHJ1Y3QgYm9jaHNfYm8g KmJvKQogCiAJZm9yIChpID0gMDsgaSA8IGJvLT5wbGFjZW1lbnQubnVtX3BsYWNlbWVudDsgaSsr KQogCQliby0+cGxhY2VtZW50c1tpXS5mbGFncyAmPSB+VFRNX1BMX0ZMQUdfTk9fRVZJQ1Q7CisJ cmV0ID0gdHRtX2JvX3Jlc2VydmUoJmJvLT5ibywgdHJ1ZSwgZmFsc2UsIE5VTEwpOworCWlmIChy ZXQpCisJCXJldHVybiByZXQ7CiAJcmV0ID0gdHRtX2JvX3ZhbGlkYXRlKCZiby0+Ym8sICZiby0+ cGxhY2VtZW50LCAmY3R4KTsKKwl0dG1fYm9fdW5yZXNlcnZlKCZiby0+Ym8pOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK