From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH v2 4/5] drm: v3d: Switch to use drm_gem_object reservation_object Date: Sat, 2 Feb 2019 09:41:57 -0600 Message-ID: <20190202154158.10443-5-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 X29iamVjdCwgdXNlIGl0CmFuZCByZW1vdmUgdGhlIHByaXZhdGUgQk8gb25lLgoKQ2M6IEVyaWMg QW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwu Y2g+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5l bC5vcmc+Ci0tLQp2MjoKIC0gTm8gY2hhbmdlLiBBZGRlZCB0aGUgdGltZW91dCBoYW5kbGluZyB0 byAKICAgZHJtX2dlbV9yZXNlcnZhdGlvbl9vYmplY3Rfd2FpdAoKIGRyaXZlcnMvZ3B1L2RybS92 M2QvdjNkX2JvLmMgIHwgMTQgKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92M2QvdjNk X2Rydi5jIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZHJ2LmggfCAgNiAtLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2dlbS5jIHwgMzUgKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfYm8uYyBiL2Ry aXZlcnMvZ3B1L2RybS92M2QvdjNkX2JvLmMKaW5kZXggYTA4NzY2ZDM5ZWFiLi44MTQyMTNkMThh MTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2JvLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3YzZC92M2RfYm8uYwpAQCAtMTU1LDkgKzE1NSw2IEBAIHN0cnVjdCB2M2RfYm8g KnYzZF9ib19jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpm aWxlX3ByaXYsCiAJCXJldHVybiBibzsKIAlvYmogPSAmYm8tPmJhc2U7CiAKLQliby0+cmVzdiA9 ICZiby0+X3Jlc3Y7Ci0JcmVzZXJ2YXRpb25fb2JqZWN0X2luaXQoYm8tPnJlc3YpOwotCiAJcmV0 ID0gdjNkX2JvX2dldF9wYWdlcyhibyk7CiAJaWYgKHJldCkKIAkJZ290byBmcmVlX21tOwpAQCAt MTk0LDggKzE5MSw2IEBAIHZvaWQgdjNkX2ZyZWVfb2JqZWN0KHN0cnVjdCBkcm1fZ2VtX29iamVj dCAqb2JqKQogCXYzZC0+Ym9fc3RhdHMucGFnZXNfYWxsb2NhdGVkIC09IG9iai0+c2l6ZSA+PiBQ QUdFX1NISUZUOwogCW11dGV4X3VubG9jaygmdjNkLT5ib19sb2NrKTsKIAotCXJlc2VydmF0aW9u X29iamVjdF9maW5pKCZiby0+X3Jlc3YpOwotCiAJdjNkX2JvX3B1dF9wYWdlcyhibyk7CiAKIAlp ZiAob2JqLT5pbXBvcnRfYXR0YWNoKQpAQCAtMjEyLDEzICsyMDcsNiBAQCB2b2lkIHYzZF9mcmVl X29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlrZnJlZShibyk7CiB9CiAKLXN0 cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgKnYzZF9wcmltZV9yZXNfb2JqKHN0cnVjdCBkcm1fZ2Vt X29iamVjdCAqb2JqKQotewotCXN0cnVjdCB2M2RfYm8gKmJvID0gdG9fdjNkX2JvKG9iaik7Ci0K LQlyZXR1cm4gYm8tPnJlc3Y7Ci19Ci0KIHN0YXRpYyB2b2lkCiB2M2Rfc2V0X21tYXBfdm1hX2Zs YWdzKHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKQogewpAQCAtMjkwLDcgKzI3OCw3IEBAIHYz ZF9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJu IEVSUl9DQVNUKGJvKTsKIAlvYmogPSAmYm8tPmJhc2U7CiAKLQliby0+cmVzdiA9IGF0dGFjaC0+ ZG1hYnVmLT5yZXN2OworCW9iai0+cmVzdiA9IGF0dGFjaC0+ZG1hYnVmLT5yZXN2OwogCiAJYm8t PnNndCA9IHNndDsKIAlvYmotPmltcG9ydF9hdHRhY2ggPSBhdHRhY2g7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2Ry di5jCmluZGV4IGYwYWZjZWM3MmMzNC4uYmFmZThlNTRlNzViIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vdjNkL3YzZF9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYu YwpAQCAtMjE0LDcgKzIxNCw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciB2M2RfZHJtX2Ry aXZlciA9IHsKIAkucHJpbWVfZmRfdG9faGFuZGxlID0gZHJtX2dlbV9wcmltZV9mZF90b19oYW5k bGUsCiAJLmdlbV9wcmltZV9pbXBvcnQgPSBkcm1fZ2VtX3ByaW1lX2ltcG9ydCwKIAkuZ2VtX3By aW1lX2V4cG9ydCA9IGRybV9nZW1fcHJpbWVfZXhwb3J0LAotCS5nZW1fcHJpbWVfcmVzX29iaiA9 IHYzZF9wcmltZV9yZXNfb2JqLAogCS5nZW1fcHJpbWVfZ2V0X3NnX3RhYmxlCT0gdjNkX3ByaW1l X2dldF9zZ190YWJsZSwKIAkuZ2VtX3ByaW1lX2ltcG9ydF9zZ190YWJsZSA9IHYzZF9wcmltZV9p bXBvcnRfc2dfdGFibGUsCiAJLmdlbV9wcmltZV9tbWFwID0gdjNkX3ByaW1lX21tYXAsCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS92 M2QvdjNkX2Rydi5oCmluZGV4IGRjYjc3MmExOTE5MS4uZmMzNTQxMmViYTMzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vdjNk L3YzZF9kcnYuaApAQCAtMSw3ICsxLDYgQEAKIC8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBH UEwtMi4wKwogLyogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTggQnJvYWRjb20gKi8KIAotI2luY2x1 ZGUgPGxpbnV4L3Jlc2VydmF0aW9uLmg+CiAjaW5jbHVkZSA8bGludXgvbW1fdHlwZXMuaD4KICNp bmNsdWRlIDxkcm0vZHJtUC5oPgogI2luY2x1ZGUgPGRybS9kcm1fZW5jb2Rlci5oPgpAQCAtMTMz LDEwICsxMzIsNiBAQCBzdHJ1Y3QgdjNkX2JvIHsKIAkgKiB2M2RfZXhlY19pbmZvLT51bnJlZl9s aXN0CiAJICovCiAJc3RydWN0IGxpc3RfaGVhZCB1bnJlZl9oZWFkOwotCi0JLyogbm9ybWFsbHkg KHJlc3YgPT0gJl9yZXN2KSBleGNlcHQgZm9yIGltcG9ydGVkIGJvJ3MgKi8KLQlzdHJ1Y3QgcmVz ZXJ2YXRpb25fb2JqZWN0ICpyZXN2OwotCXN0cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgX3Jlc3Y7 CiB9OwogCiBzdGF0aWMgaW5saW5lIHN0cnVjdCB2M2RfYm8gKgpAQCAtMjgxLDcgKzI3Niw2IEBA IGludCB2M2RfZ2V0X2JvX29mZnNldF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCQkJICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KTsKIHZtX2ZhdWx0X3Qg djNkX2dlbV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZik7CiBpbnQgdjNkX21tYXAoc3RydWN0 IGZpbGUgKmZpbHAsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKTsKLXN0cnVjdCByZXNlcnZh dGlvbl9vYmplY3QgKnYzZF9wcmltZV9yZXNfb2JqKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2Jq KTsKIGludCB2M2RfcHJpbWVfbW1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0 IHZtX2FyZWFfc3RydWN0ICp2bWEpOwogc3RydWN0IHNnX3RhYmxlICp2M2RfcHJpbWVfZ2V0X3Nn X3RhYmxlKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKIHN0cnVjdCBkcm1fZ2VtX29iamVj dCAqdjNkX3ByaW1lX2ltcG9ydF9zZ190YWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0v djNkL3YzZF9nZW0uYwppbmRleCAwNWNhNjMxOTA2NWUuLmJlZTRmYzNmNDdhOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Yz ZC92M2RfZ2VtLmMKQEAgLTIxNCw3ICsyMTQsNyBAQCB2M2RfYXR0YWNoX29iamVjdF9mZW5jZXMo c3RydWN0IHYzZF9ibyAqKmJvcywgaW50IGJvX2NvdW50LAogCiAJZm9yIChpID0gMDsgaSA8IGJv X2NvdW50OyBpKyspIHsKIAkJLyogWFhYOiBVc2Ugc2hhcmVkIGZlbmNlcyBmb3IgcmVhZC1vbmx5 IG9iamVjdHMuICovCi0JCXJlc2VydmF0aW9uX29iamVjdF9hZGRfZXhjbF9mZW5jZShib3NbaV0t PnJlc3YsIGZlbmNlKTsKKwkJcmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9leGNsX2ZlbmNlKGJvc1tp XS0+YmFzZS5yZXN2LCBmZW5jZSk7CiAJfQogfQogCkBAIC0yMjYsNyArMjI2LDcgQEAgdjNkX3Vu bG9ja19ib19yZXNlcnZhdGlvbnMoc3RydWN0IHYzZF9ibyAqKmJvcywKIAlpbnQgaTsKIAogCWZv ciAoaSA9IDA7IGkgPCBib19jb3VudDsgaSsrKQotCQl3d19tdXRleF91bmxvY2soJmJvc1tpXS0+ cmVzdi0+bG9jayk7CisJCXd3X211dGV4X3VubG9jaygmYm9zW2ldLT5iYXNlLnJlc3YtPmxvY2sp OwogCiAJd3dfYWNxdWlyZV9maW5pKGFjcXVpcmVfY3R4KTsKIH0KQEAgLTI1Miw3ICsyNTIsNyBA QCB2M2RfbG9ja19ib19yZXNlcnZhdGlvbnMoc3RydWN0IHYzZF9ibyAqKmJvcywKIAlpZiAoY29u dGVuZGVkX2xvY2sgIT0gLTEpIHsKIAkJc3RydWN0IHYzZF9ibyAqYm8gPSBib3NbY29udGVuZGVk X2xvY2tdOwogCi0JCXJldCA9IHd3X211dGV4X2xvY2tfc2xvd19pbnRlcnJ1cHRpYmxlKCZiby0+ cmVzdi0+bG9jaywKKwkJcmV0ID0gd3dfbXV0ZXhfbG9ja19zbG93X2ludGVycnVwdGlibGUoJmJv LT5iYXNlLnJlc3YtPmxvY2ssCiAJCQkJCQkgICAgICAgYWNxdWlyZV9jdHgpOwogCQlpZiAocmV0 KSB7CiAJCQl3d19hY3F1aXJlX2RvbmUoYWNxdWlyZV9jdHgpOwpAQCAtMjY0LDE4ICsyNjQsMTgg QEAgdjNkX2xvY2tfYm9fcmVzZXJ2YXRpb25zKHN0cnVjdCB2M2RfYm8gKipib3MsCiAJCWlmIChp ID09IGNvbnRlbmRlZF9sb2NrKQogCQkJY29udGludWU7CiAKLQkJcmV0ID0gd3dfbXV0ZXhfbG9j a19pbnRlcnJ1cHRpYmxlKCZib3NbaV0tPnJlc3YtPmxvY2ssCisJCXJldCA9IHd3X211dGV4X2xv Y2tfaW50ZXJydXB0aWJsZSgmYm9zW2ldLT5iYXNlLnJlc3YtPmxvY2ssCiAJCQkJCQkgIGFjcXVp cmVfY3R4KTsKIAkJaWYgKHJldCkgewogCQkJaW50IGo7CiAKIAkJCWZvciAoaiA9IDA7IGogPCBp OyBqKyspCi0JCQkJd3dfbXV0ZXhfdW5sb2NrKCZib3Nbal0tPnJlc3YtPmxvY2spOworCQkJCXd3 X211dGV4X3VubG9jaygmYm9zW2pdLT5iYXNlLnJlc3YtPmxvY2spOwogCiAJCQlpZiAoY29udGVu ZGVkX2xvY2sgIT0gLTEgJiYgY29udGVuZGVkX2xvY2sgPj0gaSkgewogCQkJCXN0cnVjdCB2M2Rf Ym8gKmJvID0gYm9zW2NvbnRlbmRlZF9sb2NrXTsKIAotCQkJCXd3X211dGV4X3VubG9jaygmYm8t PnJlc3YtPmxvY2spOworCQkJCXd3X211dGV4X3VubG9jaygmYm8tPmJhc2UucmVzdi0+bG9jayk7 CiAJCQl9CiAKIAkJCWlmIChyZXQgPT0gLUVERUFETEspIHsKQEAgLTI5NCw3ICsyOTQsNyBAQCB2 M2RfbG9ja19ib19yZXNlcnZhdGlvbnMoc3RydWN0IHYzZF9ibyAqKmJvcywKIAkgKiBiZWZvcmUg d2UgY29tbWl0IHRoZSBDTCB0byB0aGUgaGFyZHdhcmUuCiAJICovCiAJZm9yIChpID0gMDsgaSA8 IGJvX2NvdW50OyBpKyspIHsKLQkJcmV0ID0gcmVzZXJ2YXRpb25fb2JqZWN0X3Jlc2VydmVfc2hh cmVkKGJvc1tpXS0+cmVzdiwgMSk7CisJCXJldCA9IHJlc2VydmF0aW9uX29iamVjdF9yZXNlcnZl X3NoYXJlZChib3NbaV0tPmJhc2UucmVzdiwgMSk7CiAJCWlmIChyZXQpIHsKIAkJCXYzZF91bmxv Y2tfYm9fcmVzZXJ2YXRpb25zKGJvcywgYm9fY291bnQsCiAJCQkJCQkgICBhY3F1aXJlX2N0eCk7 CkBAIC00NTMsOCArNDUzLDYgQEAgdjNkX3dhaXRfYm9faW9jdGwoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwKIHsKIAlpbnQgcmV0OwogCXN0cnVjdCBkcm1fdjNkX3dhaXRfYm8g KmFyZ3MgPSBkYXRhOwotCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ2VtX29iajsKLQlzdHJ1Y3Qg djNkX2JvICpibzsKIAlrdGltZV90IHN0YXJ0ID0ga3RpbWVfZ2V0KCk7CiAJdTY0IGRlbHRhX25z OwogCXVuc2lnbmVkIGxvbmcgdGltZW91dF9qaWZmaWVzID0KQEAgLTQ2MywyMSArNDYxLDggQEAg djNkX3dhaXRfYm9faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlp ZiAoYXJncy0+cGFkICE9IDApCiAJCXJldHVybiAtRUlOVkFMOwogCi0JZ2VtX29iaiA9IGRybV9n ZW1fb2JqZWN0X2xvb2t1cChmaWxlX3ByaXYsIGFyZ3MtPmhhbmRsZSk7Ci0JaWYgKCFnZW1fb2Jq KSB7Ci0JCURSTV9ERUJVRygiRmFpbGVkIHRvIGxvb2sgdXAgR0VNIEJPICVkXG4iLCBhcmdzLT5o YW5kbGUpOwotCQlyZXR1cm4gLUVJTlZBTDsKLQl9Ci0JYm8gPSB0b192M2RfYm8oZ2VtX29iaik7 Ci0KLQlyZXQgPSByZXNlcnZhdGlvbl9vYmplY3Rfd2FpdF90aW1lb3V0X3JjdShiby0+cmVzdiwK LQkJCQkJCSAgdHJ1ZSwgdHJ1ZSwKLQkJCQkJCSAgdGltZW91dF9qaWZmaWVzKTsKLQotCWlmIChy ZXQgPT0gMCkKLQkJcmV0ID0gLUVUSU1FOwotCWVsc2UgaWYgKHJldCA+IDApCi0JCXJldCA9IDA7 CisJcmV0ID0gZHJtX2dlbV9yZXNlcnZhdGlvbl9vYmplY3Rfd2FpdChmaWxlX3ByaXYsIGFyZ3Mt PmhhbmRsZSwKKwkJCQkJICAgICAgdHJ1ZSwgdGltZW91dF9qaWZmaWVzKTsKIAogCS8qIERlY3Jl bWVudCB0aGUgdXNlcidzIHRpbWVvdXQsIGluIGNhc2Ugd2UgZ290IGludGVycnVwdGVkCiAJICog c3VjaCB0aGF0IHRoZSBpb2N0bCB3aWxsIGJlIHJlc3RhcnRlZC4KQEAgLTQ5Miw4ICs0NzcsNiBA QCB2M2Rfd2FpdF9ib19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAog CWlmIChyZXQgPT0gLUVUSU1FICYmIGFyZ3MtPnRpbWVvdXRfbnMpCiAJCXJldCA9IC1FQUdBSU47 CiAKLQlkcm1fZ2VtX29iamVjdF9wdXRfdW5sb2NrZWQoZ2VtX29iaik7Ci0KIAlyZXR1cm4gcmV0 OwogfQogCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkZyZWVkcmVubyBtYWlsaW5nIGxpc3QKRnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Zy ZWVkcmVubwo=