From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH v2 5/5] drm: vc4: Switch to use drm_gem_object reservation_object Date: Sat, 2 Feb 2019 09:41:58 -0600 Message-ID: <20190202154158.10443-6-robh@kernel.org> References: <20190202154158.10443-1-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190202154158.10443-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 X29iamVjdCwgdXNlIGl0CmFuZCByZW1vdmUgdGhlIHByaXZhdGUgQk8gb25lLgoKQ2M6IERhdmlk IEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZnds bC5jaD4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKUmV2aWV3ZWQtYnk6IEVy aWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+ClNpZ25lZC1vZmYtYnk6IFJvYiBIZXJyaW5nIDxy b2JoQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8uYyAgICB8IDE1 ICstLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmMgICB8ICAxIC0K IGRyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5oICAgfCAgNiAtLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X2dlbS5jICAgfCAxOCArKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X3BsYW5lLmMgfCAgMiArLQogNSBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRp b25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF9iby5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8uYwppbmRleCA4ZGNjZTcxODJi YjcuLjkyZTNmOThkODQ3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9iby5jCkBAIC0yMDEsOCArMjAxLDYgQEAg c3RhdGljIHZvaWQgdmM0X2JvX2Rlc3Ryb3koc3RydWN0IHZjNF9ibyAqYm8pCiAJCWJvLT52YWxp ZGF0ZWRfc2hhZGVyID0gTlVMTDsKIAl9CiAKLQlyZXNlcnZhdGlvbl9vYmplY3RfZmluaSgmYm8t Pl9yZXN2KTsKLQogCWRybV9nZW1fY21hX2ZyZWVfb2JqZWN0KG9iaik7CiB9CiAKQEAgLTQyNyw4 ICs0MjUsNiBAQCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnZjNF9jcmVhdGVfb2JqZWN0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHNpemVfdCBzaXplKQogCXZjNC0+Ym9fbGFiZWxzW1ZDNF9CT19U WVBFX0tFUk5FTF0ubnVtX2FsbG9jYXRlZCsrOwogCXZjNC0+Ym9fbGFiZWxzW1ZDNF9CT19UWVBF X0tFUk5FTF0uc2l6ZV9hbGxvY2F0ZWQgKz0gc2l6ZTsKIAltdXRleF91bmxvY2soJnZjNC0+Ym9f bG9jayk7Ci0JYm8tPnJlc3YgPSAmYm8tPl9yZXN2OwotCXJlc2VydmF0aW9uX29iamVjdF9pbml0 KGJvLT5yZXN2KTsKIAogCXJldHVybiAmYm8tPmJhc2UuYmFzZTsKIH0KQEAgLTY4NCwxMyArNjgw LDYgQEAgc3RhdGljIHZvaWQgdmM0X2JvX2NhY2hlX3RpbWVfdGltZXIoc3RydWN0IHRpbWVyX2xp c3QgKnQpCiAJc2NoZWR1bGVfd29yaygmdmM0LT5ib19jYWNoZS50aW1lX3dvcmspOwogfQogCi1z dHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICp2YzRfcHJpbWVfcmVzX29iaihzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaikKLXsKLQlzdHJ1Y3QgdmM0X2JvICpibyA9IHRvX3ZjNF9ibyhvYmopOwot Ci0JcmV0dXJuIGJvLT5yZXN2OwotfQotCiBzdHJ1Y3QgZG1hX2J1ZiAqCiB2YzRfcHJpbWVfZXhw b3J0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBp bnQgZmxhZ3MpCiB7CkBAIC04MjIsMTQgKzgxMSwxMiBAQCB2YzRfcHJpbWVfaW1wb3J0X3NnX3Rh YmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgIHN0cnVjdCBzZ190YWJsZSAqc2d0KQog ewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqOwotCXN0cnVjdCB2YzRfYm8gKmJvOwogCiAJ b2JqID0gZHJtX2dlbV9jbWFfcHJpbWVfaW1wb3J0X3NnX3RhYmxlKGRldiwgYXR0YWNoLCBzZ3Qp OwogCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIG9iajsKIAotCWJvID0gdG9fdmM0X2JvKG9i aik7Ci0JYm8tPnJlc3YgPSBhdHRhY2gtPmRtYWJ1Zi0+cmVzdjsKKwlvYmotPnJlc3YgPSBhdHRh Y2gtPmRtYWJ1Zi0+cmVzdjsKIAogCXJldHVybiBvYmo7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vdmM0L3ZjNF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5jCmlu ZGV4IGY2ZjVjZDgwYzA0ZC4uZDE3ZGY4YzAyOTFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vdmM0L3ZjNF9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9kcnYuYwpAQCAt MjAxLDcgKzIwMSw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciB2YzRfZHJtX2RyaXZlciA9 IHsKIAkucHJpbWVfZmRfdG9faGFuZGxlID0gZHJtX2dlbV9wcmltZV9mZF90b19oYW5kbGUsCiAJ LmdlbV9wcmltZV9pbXBvcnQgPSBkcm1fZ2VtX3ByaW1lX2ltcG9ydCwKIAkuZ2VtX3ByaW1lX2V4 cG9ydCA9IHZjNF9wcmltZV9leHBvcnQsCi0JLmdlbV9wcmltZV9yZXNfb2JqID0gdmM0X3ByaW1l X3Jlc19vYmosCiAJLmdlbV9wcmltZV9nZXRfc2dfdGFibGUJPSBkcm1fZ2VtX2NtYV9wcmltZV9n ZXRfc2dfdGFibGUsCiAJLmdlbV9wcmltZV9pbXBvcnRfc2dfdGFibGUgPSB2YzRfcHJpbWVfaW1w b3J0X3NnX3RhYmxlLAogCS5nZW1fcHJpbWVfdm1hcCA9IHZjNF9wcmltZV92bWFwLApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF9kcnYuaAppbmRleCA0Zjg3YjAzZjgzN2QuLjAzZTk2MTViNzIyOSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92 YzRfZHJ2LmgKQEAgLTcsNyArNyw2IEBACiAgKi8KIAogI2luY2x1ZGUgPGxpbnV4L21tX3R5cGVz Lmg+Ci0jaW5jbHVkZSA8bGludXgvcmVzZXJ2YXRpb24uaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5o PgogI2luY2x1ZGUgPGRybS9kcm1fZW5jb2Rlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2VtX2Nt YV9oZWxwZXIuaD4KQEAgLTIzOSwxMCArMjM4LDYgQEAgc3RydWN0IHZjNF9ibyB7CiAJICovCiAJ c3RydWN0IHZjNF92YWxpZGF0ZWRfc2hhZGVyX2luZm8gKnZhbGlkYXRlZF9zaGFkZXI7CiAKLQkv KiBub3JtYWxseSAocmVzdiA9PSAmX3Jlc3YpIGV4Y2VwdCBmb3IgaW1wb3J0ZWQgYm8ncyAqLwot CXN0cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgKnJlc3Y7Ci0Jc3RydWN0IHJlc2VydmF0aW9uX29i amVjdCBfcmVzdjsKLQogCS8qIE9uZSBvZiBlbnVtIHZjNF9rZXJuZWxfYm9fdHlwZSwgb3IgVkM0 X0JPX1RZUEVfQ09VTlQgKyBpCiAJICogZm9yIHVzZXItYWxsb2NhdGVkIGxhYmVscy4KIAkgKi8K QEAgLTY4NCw3ICs2NzksNiBAQCBpbnQgdmM0X2xhYmVsX2JvX2lvY3RsKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJp dik7CiB2bV9mYXVsdF90IHZjNF9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZik7CiBpbnQgdmM0 X21tYXAoc3RydWN0IGZpbGUgKmZpbHAsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKTsKLXN0 cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgKnZjNF9wcmltZV9yZXNfb2JqKHN0cnVjdCBkcm1fZ2Vt X29iamVjdCAqb2JqKTsKIGludCB2YzRfcHJpbWVfbW1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg Km9iaiwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpOwogc3RydWN0IGRybV9nZW1fb2JqZWN0 ICp2YzRfcHJpbWVfaW1wb3J0X3NnX3RhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ CQkgc3RydWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNoLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3ZjNC92YzRfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYwpp bmRleCBhZWEyYjhkZmVjMTcuLjVlZTViZjdmZWRmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3ZjNC92YzRfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZ2VtLmMKQEAg LTUzNiw3ICs1MzYsNyBAQCB2YzRfdXBkYXRlX2JvX3NlcW5vcyhzdHJ1Y3QgdmM0X2V4ZWNfaW5m byAqZXhlYywgdWludDY0X3Qgc2Vxbm8pCiAJCWJvID0gdG9fdmM0X2JvKCZleGVjLT5ib1tpXS0+ YmFzZSk7CiAJCWJvLT5zZXFubyA9IHNlcW5vOwogCi0JCXJlc2VydmF0aW9uX29iamVjdF9hZGRf c2hhcmVkX2ZlbmNlKGJvLT5yZXN2LCBleGVjLT5mZW5jZSk7CisJCXJlc2VydmF0aW9uX29iamVj dF9hZGRfc2hhcmVkX2ZlbmNlKGJvLT5iYXNlLmJhc2UucmVzdiwgZXhlYy0+ZmVuY2UpOwogCX0K IAogCWxpc3RfZm9yX2VhY2hfZW50cnkoYm8sICZleGVjLT51bnJlZl9saXN0LCB1bnJlZl9oZWFk KSB7CkBAIC01NDcsNyArNTQ3LDcgQEAgdmM0X3VwZGF0ZV9ib19zZXFub3Moc3RydWN0IHZjNF9l eGVjX2luZm8gKmV4ZWMsIHVpbnQ2NF90IHNlcW5vKQogCQlibyA9IHRvX3ZjNF9ibygmZXhlYy0+ cmNsX3dyaXRlX2JvW2ldLT5iYXNlKTsKIAkJYm8tPndyaXRlX3NlcW5vID0gc2Vxbm87CiAKLQkJ cmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9leGNsX2ZlbmNlKGJvLT5yZXN2LCBleGVjLT5mZW5jZSk7 CisJCXJlc2VydmF0aW9uX29iamVjdF9hZGRfZXhjbF9mZW5jZShiby0+YmFzZS5iYXNlLnJlc3Ys IGV4ZWMtPmZlbmNlKTsKIAl9CiB9CiAKQEAgLTU1OSw3ICs1NTksNyBAQCB2YzRfdW5sb2NrX2Jv X3Jlc2VydmF0aW9ucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludCBpOwogCiAJZm9yIChp ID0gMDsgaSA8IGV4ZWMtPmJvX2NvdW50OyBpKyspIHsKLQkJc3RydWN0IHZjNF9ibyAqYm8gPSB0 b192YzRfYm8oJmV4ZWMtPmJvW2ldLT5iYXNlKTsKKwkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpi byA9ICZleGVjLT5ib1tpXS0+YmFzZTsKIAogCQl3d19tdXRleF91bmxvY2soJmJvLT5yZXN2LT5s b2NrKTsKIAl9CkBAIC01ODEsMTMgKzU4MSwxMyBAQCB2YzRfbG9ja19ib19yZXNlcnZhdGlvbnMo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHsKIAlpbnQgY29udGVuZGVkX2xvY2sgPSAtMTsKIAlp bnQgaSwgcmV0OwotCXN0cnVjdCB2YzRfYm8gKmJvOworCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAq Ym87CiAKIAl3d19hY3F1aXJlX2luaXQoYWNxdWlyZV9jdHgsICZyZXNlcnZhdGlvbl93d19jbGFz cyk7CiAKIHJldHJ5OgogCWlmIChjb250ZW5kZWRfbG9jayAhPSAtMSkgewotCQlibyA9IHRvX3Zj NF9ibygmZXhlYy0+Ym9bY29udGVuZGVkX2xvY2tdLT5iYXNlKTsKKwkJYm8gPSAmZXhlYy0+Ym9b Y29udGVuZGVkX2xvY2tdLT5iYXNlOwogCQlyZXQgPSB3d19tdXRleF9sb2NrX3Nsb3dfaW50ZXJy dXB0aWJsZSgmYm8tPnJlc3YtPmxvY2ssCiAJCQkJCQkgICAgICAgYWNxdWlyZV9jdHgpOwogCQlp ZiAocmV0KSB7CkBAIC02MDAsMTkgKzYwMCwxOSBAQCB2YzRfbG9ja19ib19yZXNlcnZhdGlvbnMo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKGkgPT0gY29udGVuZGVkX2xvY2spCiAJCQlj b250aW51ZTsKIAotCQlibyA9IHRvX3ZjNF9ibygmZXhlYy0+Ym9baV0tPmJhc2UpOworCQlibyA9 ICZleGVjLT5ib1tpXS0+YmFzZTsKIAogCQlyZXQgPSB3d19tdXRleF9sb2NrX2ludGVycnVwdGli bGUoJmJvLT5yZXN2LT5sb2NrLCBhY3F1aXJlX2N0eCk7CiAJCWlmIChyZXQpIHsKIAkJCWludCBq OwogCiAJCQlmb3IgKGogPSAwOyBqIDwgaTsgaisrKSB7Ci0JCQkJYm8gPSB0b192YzRfYm8oJmV4 ZWMtPmJvW2pdLT5iYXNlKTsKKwkJCQlibyA9ICZleGVjLT5ib1tqXS0+YmFzZTsKIAkJCQl3d19t dXRleF91bmxvY2soJmJvLT5yZXN2LT5sb2NrKTsKIAkJCX0KIAogCQkJaWYgKGNvbnRlbmRlZF9s b2NrICE9IC0xICYmIGNvbnRlbmRlZF9sb2NrID49IGkpIHsKLQkJCQlibyA9IHRvX3ZjNF9ibygm ZXhlYy0+Ym9bY29udGVuZGVkX2xvY2tdLT5iYXNlKTsKKwkJCQlibyA9ICZleGVjLT5ib1tjb250 ZW5kZWRfbG9ja10tPmJhc2U7CiAKIAkJCQl3d19tdXRleF91bmxvY2soJmJvLT5yZXN2LT5sb2Nr KTsKIAkJCX0KQEAgLTYzMyw3ICs2MzMsNyBAQCB2YzRfbG9ja19ib19yZXNlcnZhdGlvbnMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBiZWZvcmUgd2UgY29tbWl0IHRoZSBDTCB0byB0aGUg aGFyZHdhcmUuCiAJICovCiAJZm9yIChpID0gMDsgaSA8IGV4ZWMtPmJvX2NvdW50OyBpKyspIHsK LQkJYm8gPSB0b192YzRfYm8oJmV4ZWMtPmJvW2ldLT5iYXNlKTsKKwkJYm8gPSAmZXhlYy0+Ym9b aV0tPmJhc2U7CiAKIAkJcmV0ID0gcmVzZXJ2YXRpb25fb2JqZWN0X3Jlc2VydmVfc2hhcmVkKGJv LT5yZXN2LCAxKTsKIAkJaWYgKHJldCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Zj NC92YzRfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMKaW5kZXggNzVk YjYyY2JlNDY4Li5iOGJhY2VlYmI3M2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92YzQv dmM0X3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYwpAQCAtOTk0 LDcgKzk5NCw3IEBAIHN0YXRpYyBpbnQgdmM0X3ByZXBhcmVfZmIoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAKIAlibyA9IHRvX3ZjNF9ibygmZHJtX2ZiX2NtYV9nZXRfZ2VtX29iaihzdGF0ZS0+ ZmIsIDApLT5iYXNlKTsKIAotCWZlbmNlID0gcmVzZXJ2YXRpb25fb2JqZWN0X2dldF9leGNsX3Jj dShiby0+cmVzdik7CisJZmVuY2UgPSByZXNlcnZhdGlvbl9vYmplY3RfZ2V0X2V4Y2xfcmN1KGJv LT5iYXNlLmJhc2UucmVzdik7CiAJZHJtX2F0b21pY19zZXRfZmVuY2VfZm9yX3BsYW5lKHN0YXRl LCBmZW5jZSk7CiAKIAlpZiAocGxhbmUtPnN0YXRlLT5mYiA9PSBzdGF0ZS0+ZmIpCi0tIAoyLjE5 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkZyZWVk cmVubyBtYWlsaW5nIGxpc3QKRnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubwo=