From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH 4/5] drm: v3d: Switch to use drm_gem_object reservation_object Date: Thu, 31 Jan 2019 18:50:56 -0600 Message-ID: <20190201005057.13648-5-robh@kernel.org> References: <20190201005057.13648-1-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190201005057.13648-1-robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Sean Paul , Rob Clark , Maxime Ripard , David Airlie , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Maarten Lankhorst , etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Eric Anholt , Christian Gmeiner , Daniel Vetter , Russell King , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Lucas Stach List-Id: linux-arm-msm@vger.kernel.org Tm93IHRoYXQgdGhlIGJhc2Ugc3RydWN0IGRybV9nZW1fb2JqZWN0IGhhcyBhIHJlc2VydmF0aW9u X29iamVjdCwgdXNlIGl0CmFuZCByZW1vdmUgdGhlIHByaXZhdGUgQk8gb25lLgoKQ2M6IEVyaWMg QW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwu Y2g+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5l bC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfYm8uYyAgfCAxNCArLS0tLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmMgfCAgMSAtCiBkcml2ZXJzL2dwdS9k cm0vdjNkL3YzZF9kcnYuaCB8ICA1IC0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9nZW0u YyB8IDM1ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5n ZWQsIDEwIGluc2VydGlvbnMoKyksIDQ1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS92M2QvdjNkX2JvLmMgYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9iby5jCmlu ZGV4IGEwODc2NmQzOWVhYi4uODE0MjEzZDE4YTE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vdjNkL3YzZF9iby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2JvLmMKQEAgLTE1 NSw5ICsxNTUsNiBAQCBzdHJ1Y3QgdjNkX2JvICp2M2RfYm9fY3JlYXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2LAogCQlyZXR1cm4gYm87CiAJb2Jq ID0gJmJvLT5iYXNlOwogCi0JYm8tPnJlc3YgPSAmYm8tPl9yZXN2OwotCXJlc2VydmF0aW9uX29i amVjdF9pbml0KGJvLT5yZXN2KTsKLQogCXJldCA9IHYzZF9ib19nZXRfcGFnZXMoYm8pOwogCWlm IChyZXQpCiAJCWdvdG8gZnJlZV9tbTsKQEAgLTE5NCw4ICsxOTEsNiBAQCB2b2lkIHYzZF9mcmVl X29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAl2M2QtPmJvX3N0YXRzLnBhZ2Vz X2FsbG9jYXRlZCAtPSBvYmotPnNpemUgPj4gUEFHRV9TSElGVDsKIAltdXRleF91bmxvY2soJnYz ZC0+Ym9fbG9jayk7CiAKLQlyZXNlcnZhdGlvbl9vYmplY3RfZmluaSgmYm8tPl9yZXN2KTsKLQog CXYzZF9ib19wdXRfcGFnZXMoYm8pOwogCiAJaWYgKG9iai0+aW1wb3J0X2F0dGFjaCkKQEAgLTIx MiwxMyArMjA3LDYgQEAgdm9pZCB2M2RfZnJlZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmopCiAJa2ZyZWUoYm8pOwogfQogCi1zdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICp2M2Rf cHJpbWVfcmVzX29iaihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKLXsKLQlzdHJ1Y3QgdjNk X2JvICpibyA9IHRvX3YzZF9ibyhvYmopOwotCi0JcmV0dXJuIGJvLT5yZXN2OwotfQotCiBzdGF0 aWMgdm9pZAogdjNkX3NldF9tbWFwX3ZtYV9mbGFncyhzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt YSkKIHsKQEAgLTI5MCw3ICsyNzgsNyBAQCB2M2RfcHJpbWVfaW1wb3J0X3NnX3RhYmxlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCXJldHVybiBFUlJfQ0FTVChibyk7CiAJb2JqID0gJmJvLT5i YXNlOwogCi0JYm8tPnJlc3YgPSBhdHRhY2gtPmRtYWJ1Zi0+cmVzdjsKKwlvYmotPnJlc3YgPSBh dHRhY2gtPmRtYWJ1Zi0+cmVzdjsKIAogCWJvLT5zZ3QgPSBzZ3Q7CiAJb2JqLT5pbXBvcnRfYXR0 YWNoID0gYXR0YWNoOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmMg Yi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYuYwppbmRleCBmMGFmY2VjNzJjMzQuLmJhZmU4 ZTU0ZTc1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmMKQEAgLTIxNCw3ICsyMTQsNiBAQCBzdGF0aWMg c3RydWN0IGRybV9kcml2ZXIgdjNkX2RybV9kcml2ZXIgPSB7CiAJLnByaW1lX2ZkX3RvX2hhbmRs ZSA9IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlLAogCS5nZW1fcHJpbWVfaW1wb3J0ID0gZHJt X2dlbV9wcmltZV9pbXBvcnQsCiAJLmdlbV9wcmltZV9leHBvcnQgPSBkcm1fZ2VtX3ByaW1lX2V4 cG9ydCwKLQkuZ2VtX3ByaW1lX3Jlc19vYmogPSB2M2RfcHJpbWVfcmVzX29iaiwKIAkuZ2VtX3By aW1lX2dldF9zZ190YWJsZQk9IHYzZF9wcmltZV9nZXRfc2dfdGFibGUsCiAJLmdlbV9wcmltZV9p bXBvcnRfc2dfdGFibGUgPSB2M2RfcHJpbWVfaW1wb3J0X3NnX3RhYmxlLAogCS5nZW1fcHJpbWVf bW1hcCA9IHYzZF9wcmltZV9tbWFwLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3YzZC92 M2RfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYuaAppbmRleCBkY2I3NzJhMTkx OTEuLjU2NDFkMDU2Yjg1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmgKQEAgLTEzMywxMCArMTMzLDYg QEAgc3RydWN0IHYzZF9ibyB7CiAJICogdjNkX2V4ZWNfaW5mby0+dW5yZWZfbGlzdAogCSAqLwog CXN0cnVjdCBsaXN0X2hlYWQgdW5yZWZfaGVhZDsKLQotCS8qIG5vcm1hbGx5IChyZXN2ID09ICZf cmVzdikgZXhjZXB0IGZvciBpbXBvcnRlZCBibydzICovCi0Jc3RydWN0IHJlc2VydmF0aW9uX29i amVjdCAqcmVzdjsKLQlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0IF9yZXN2OwogfTsKIAogc3Rh dGljIGlubGluZSBzdHJ1Y3QgdjNkX2JvICoKQEAgLTI4MSw3ICsyNzcsNiBAQCBpbnQgdjNkX2dl dF9ib19vZmZzZXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJ CSAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiB2bV9mYXVsdF90IHYzZF9nZW1fZmF1 bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpOwogaW50IHYzZF9tbWFwKHN0cnVjdCBmaWxlICpmaWxw LCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSk7Ci1zdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0 ICp2M2RfcHJpbWVfcmVzX29iaihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7CiBpbnQgdjNk X3ByaW1lX21tYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCB2bV9hcmVhX3N0 cnVjdCAqdm1hKTsKIHN0cnVjdCBzZ190YWJsZSAqdjNkX3ByaW1lX2dldF9zZ190YWJsZShzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7CiBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnYzZF9wcmlt ZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS92M2QvdjNkX2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZ2Vt LmMKaW5kZXggMDVjYTYzMTkwNjVlLi5iZWU0ZmMzZjQ3YTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS92M2QvdjNkX2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2dlbS5j CkBAIC0yMTQsNyArMjE0LDcgQEAgdjNkX2F0dGFjaF9vYmplY3RfZmVuY2VzKHN0cnVjdCB2M2Rf Ym8gKipib3MsIGludCBib19jb3VudCwKIAogCWZvciAoaSA9IDA7IGkgPCBib19jb3VudDsgaSsr KSB7CiAJCS8qIFhYWDogVXNlIHNoYXJlZCBmZW5jZXMgZm9yIHJlYWQtb25seSBvYmplY3RzLiAq LwotCQlyZXNlcnZhdGlvbl9vYmplY3RfYWRkX2V4Y2xfZmVuY2UoYm9zW2ldLT5yZXN2LCBmZW5j ZSk7CisJCXJlc2VydmF0aW9uX29iamVjdF9hZGRfZXhjbF9mZW5jZShib3NbaV0tPmJhc2UucmVz diwgZmVuY2UpOwogCX0KIH0KIApAQCAtMjI2LDcgKzIyNiw3IEBAIHYzZF91bmxvY2tfYm9fcmVz ZXJ2YXRpb25zKHN0cnVjdCB2M2RfYm8gKipib3MsCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBp IDwgYm9fY291bnQ7IGkrKykKLQkJd3dfbXV0ZXhfdW5sb2NrKCZib3NbaV0tPnJlc3YtPmxvY2sp OworCQl3d19tdXRleF91bmxvY2soJmJvc1tpXS0+YmFzZS5yZXN2LT5sb2NrKTsKIAogCXd3X2Fj cXVpcmVfZmluaShhY3F1aXJlX2N0eCk7CiB9CkBAIC0yNTIsNyArMjUyLDcgQEAgdjNkX2xvY2tf Ym9fcmVzZXJ2YXRpb25zKHN0cnVjdCB2M2RfYm8gKipib3MsCiAJaWYgKGNvbnRlbmRlZF9sb2Nr ICE9IC0xKSB7CiAJCXN0cnVjdCB2M2RfYm8gKmJvID0gYm9zW2NvbnRlbmRlZF9sb2NrXTsKIAot CQlyZXQgPSB3d19tdXRleF9sb2NrX3Nsb3dfaW50ZXJydXB0aWJsZSgmYm8tPnJlc3YtPmxvY2ss CisJCXJldCA9IHd3X211dGV4X2xvY2tfc2xvd19pbnRlcnJ1cHRpYmxlKCZiby0+YmFzZS5yZXN2 LT5sb2NrLAogCQkJCQkJICAgICAgIGFjcXVpcmVfY3R4KTsKIAkJaWYgKHJldCkgewogCQkJd3df YWNxdWlyZV9kb25lKGFjcXVpcmVfY3R4KTsKQEAgLTI2NCwxOCArMjY0LDE4IEBAIHYzZF9sb2Nr X2JvX3Jlc2VydmF0aW9ucyhzdHJ1Y3QgdjNkX2JvICoqYm9zLAogCQlpZiAoaSA9PSBjb250ZW5k ZWRfbG9jaykKIAkJCWNvbnRpbnVlOwogCi0JCXJldCA9IHd3X211dGV4X2xvY2tfaW50ZXJydXB0 aWJsZSgmYm9zW2ldLT5yZXN2LT5sb2NrLAorCQlyZXQgPSB3d19tdXRleF9sb2NrX2ludGVycnVw dGlibGUoJmJvc1tpXS0+YmFzZS5yZXN2LT5sb2NrLAogCQkJCQkJICBhY3F1aXJlX2N0eCk7CiAJ CWlmIChyZXQpIHsKIAkJCWludCBqOwogCiAJCQlmb3IgKGogPSAwOyBqIDwgaTsgaisrKQotCQkJ CXd3X211dGV4X3VubG9jaygmYm9zW2pdLT5yZXN2LT5sb2NrKTsKKwkJCQl3d19tdXRleF91bmxv Y2soJmJvc1tqXS0+YmFzZS5yZXN2LT5sb2NrKTsKIAogCQkJaWYgKGNvbnRlbmRlZF9sb2NrICE9 IC0xICYmIGNvbnRlbmRlZF9sb2NrID49IGkpIHsKIAkJCQlzdHJ1Y3QgdjNkX2JvICpibyA9IGJv c1tjb250ZW5kZWRfbG9ja107CiAKLQkJCQl3d19tdXRleF91bmxvY2soJmJvLT5yZXN2LT5sb2Nr KTsKKwkJCQl3d19tdXRleF91bmxvY2soJmJvLT5iYXNlLnJlc3YtPmxvY2spOwogCQkJfQogCiAJ CQlpZiAocmV0ID09IC1FREVBRExLKSB7CkBAIC0yOTQsNyArMjk0LDcgQEAgdjNkX2xvY2tfYm9f cmVzZXJ2YXRpb25zKHN0cnVjdCB2M2RfYm8gKipib3MsCiAJICogYmVmb3JlIHdlIGNvbW1pdCB0 aGUgQ0wgdG8gdGhlIGhhcmR3YXJlLgogCSAqLwogCWZvciAoaSA9IDA7IGkgPCBib19jb3VudDsg aSsrKSB7Ci0JCXJldCA9IHJlc2VydmF0aW9uX29iamVjdF9yZXNlcnZlX3NoYXJlZChib3NbaV0t PnJlc3YsIDEpOworCQlyZXQgPSByZXNlcnZhdGlvbl9vYmplY3RfcmVzZXJ2ZV9zaGFyZWQoYm9z W2ldLT5iYXNlLnJlc3YsIDEpOwogCQlpZiAocmV0KSB7CiAJCQl2M2RfdW5sb2NrX2JvX3Jlc2Vy dmF0aW9ucyhib3MsIGJvX2NvdW50LAogCQkJCQkJICAgYWNxdWlyZV9jdHgpOwpAQCAtNDUzLDgg KzQ1Myw2IEBAIHYzZF93YWl0X2JvX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiB7CiAJaW50IHJldDsKIAlzdHJ1Y3QgZHJtX3YzZF93YWl0X2JvICphcmdzID0gZGF0 YTsKLQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbV9vYmo7Ci0Jc3RydWN0IHYzZF9ibyAqYm87 CiAJa3RpbWVfdCBzdGFydCA9IGt0aW1lX2dldCgpOwogCXU2NCBkZWx0YV9uczsKIAl1bnNpZ25l ZCBsb25nIHRpbWVvdXRfamlmZmllcyA9CkBAIC00NjMsMjEgKzQ2MSw4IEBAIHYzZF93YWl0X2Jv X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKGFyZ3MtPnBh ZCAhPSAwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWdlbV9vYmogPSBkcm1fZ2VtX29iamVjdF9s b29rdXAoZmlsZV9wcml2LCBhcmdzLT5oYW5kbGUpOwotCWlmICghZ2VtX29iaikgewotCQlEUk1f REVCVUcoIkZhaWxlZCB0byBsb29rIHVwIEdFTSBCTyAlZFxuIiwgYXJncy0+aGFuZGxlKTsKLQkJ cmV0dXJuIC1FSU5WQUw7Ci0JfQotCWJvID0gdG9fdjNkX2JvKGdlbV9vYmopOwotCi0JcmV0ID0g cmVzZXJ2YXRpb25fb2JqZWN0X3dhaXRfdGltZW91dF9yY3UoYm8tPnJlc3YsCi0JCQkJCQkgIHRy dWUsIHRydWUsCi0JCQkJCQkgIHRpbWVvdXRfamlmZmllcyk7Ci0KLQlpZiAocmV0ID09IDApCi0J CXJldCA9IC1FVElNRTsKLQllbHNlIGlmIChyZXQgPiAwKQotCQlyZXQgPSAwOworCXJldCA9IGRy bV9nZW1fcmVzZXJ2YXRpb25fb2JqZWN0X3dhaXQoZmlsZV9wcml2LCBhcmdzLT5oYW5kbGUsCisJ CQkJCSAgICAgIHRydWUsIHRpbWVvdXRfamlmZmllcyk7CiAKIAkvKiBEZWNyZW1lbnQgdGhlIHVz ZXIncyB0aW1lb3V0LCBpbiBjYXNlIHdlIGdvdCBpbnRlcnJ1cHRlZAogCSAqIHN1Y2ggdGhhdCB0 aGUgaW9jdGwgd2lsbCBiZSByZXN0YXJ0ZWQuCkBAIC00OTIsOCArNDc3LDYgQEAgdjNkX3dhaXRf Ym9faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlpZiAocmV0ID09 IC1FVElNRSAmJiBhcmdzLT50aW1lb3V0X25zKQogCQlyZXQgPSAtRUFHQUlOOwogCi0JZHJtX2dl bV9vYmplY3RfcHV0X3VubG9ja2VkKGdlbV9vYmopOwotCiAJcmV0dXJuIHJldDsKIH0KIAotLSAK Mi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpG cmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K