From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH 19/27] drm/etnaviv: move ww_acquire_ctx out of submit object Date: Fri, 1 Dec 2017 11:36:16 +0100 Message-ID: <20171201103624.6565-20-l.stach@pengutronix.de> References: <20171201103624.6565-1-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7C256ECB8 for ; Fri, 1 Dec 2017 10:36:27 +0000 (UTC) In-Reply-To: <20171201103624.6565-1-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: etnaviv@lists.freedesktop.org Cc: patchwork-lst@pengutronix.de, kernel@pengutronix.de, dri-devel@lists.freedesktop.org, Russell King List-Id: dri-devel@lists.freedesktop.org VGhlIGFjcXVpcmVfY3R4IGlzIHNwZWNpYWwgaW4gdGhhdCBpdCBuZWVkcyB0byBiZSByZWxlYXNl ZCBmcm9tIHRoZSBzYW1lCnRocmVhZCBhcyBoYXMgYmVlbiB1c2VkIHRvIGluaXRpYWxpemUgaXQu IFRoaXMgY29sbGlkZXMgd2l0aCB0aGUgaW50ZW50aW9uIHRvCmV4dGVuZCB0aGUgc3VibWl0IGxp ZmV0aW1lIGJleW9uZCB0aGUgZ2VtX3N1Ym1pdCBmdW5jdGlvbiB3aXRoIHBvdGVudGlhbGx5Cm90 aGVyIHRocmVhZHMgZG9pbmcgdGhlIGZpbmFsIGNsZWFudXAuCgpNb3ZlIHRoZSB3d19hY3F1aXJl X2N0eCB0byB0aGUgZnVuY3Rpb24gbG9jYWwgc3RhY2sgYXMgc3VnZ2VzdGVkIGluIHRoZQpkb2N1 bWVudGF0aW9uLgoKU2lnbmVkLW9mZi1ieTogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9u aXguZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW0uaCAgICAgICAg fCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbV9zdWJtaXQuYyB8IDIy ICsrKysrKysrKysrKystLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr KSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYv ZXRuYXZpdl9nZW0uaCBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ2VtLmgKaW5k ZXggMjFjYjM0NjAwNDZmLi42Yjc4ZDA1OWVkMmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9ldG5hdml2L2V0bmF2aXZfZ2VtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRu YXZpdl9nZW0uaApAQCAtMTAyLDcgKzEwMiw2IEBAIHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXRf Ym8gewogICovCiBzdHJ1Y3QgZXRuYXZpdl9nZW1fc3VibWl0IHsKIAlzdHJ1Y3QgZXRuYXZpdl9n cHUgKmdwdTsKLQlzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggdGlja2V0OwogCXN0cnVjdCBkbWFfZmVu Y2UgKm91dF9mZW5jZSwgKmluX2ZlbmNlOwogCXUzMiBmbGFnczsKIAl1bnNpZ25lZCBpbnQgbnJf Ym9zOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW1fc3Vi bWl0LmMgYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbV9zdWJtaXQuYwppbmRl eCA5YjU1NDEyMDdkMzMuLjMwOTBhNDY5NzlhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2 aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMKQEAgLTQ0LDggKzQ0LDYgQEAgc3RhdGljIHN0cnVjdCBl dG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAogCXN1Ym1pdC0+Z3B1ID0gZ3B1OwogCi0Jd3dfYWNxdWlyZV9pbml0KCZzdWJtaXQtPnRpY2tl dCwgJnJlc2VydmF0aW9uX3d3X2NsYXNzKTsKLQogCXJldHVybiBzdWJtaXQ7CiB9CiAKQEAgLTEw Nyw3ICsxMDUsOCBAQCBzdGF0aWMgdm9pZCBzdWJtaXRfdW5sb2NrX29iamVjdChzdHJ1Y3QgZXRu YXZpdl9nZW1fc3VibWl0ICpzdWJtaXQsIGludCBpKQogCX0KIH0KIAotc3RhdGljIGludCBzdWJt aXRfbG9ja19vYmplY3RzKHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdCkKK3N0YXRp YyBpbnQgc3VibWl0X2xvY2tfb2JqZWN0cyhzdHJ1Y3QgZXRuYXZpdl9nZW1fc3VibWl0ICpzdWJt aXQsCisJCXN0cnVjdCB3d19hY3F1aXJlX2N0eCAqdGlja2V0KQogewogCWludCBjb250ZW5kZWQs IHNsb3dfbG9ja2VkID0gLTEsIGksIHJldCA9IDA7CiAKQEAgLTEyMiw3ICsxMjEsNyBAQCBzdGF0 aWMgaW50IHN1Ym1pdF9sb2NrX29iamVjdHMoc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3Vi bWl0KQogCiAJCWlmICghKHN1Ym1pdC0+Ym9zW2ldLmZsYWdzICYgQk9fTE9DS0VEKSkgewogCQkJ cmV0ID0gd3dfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZldG5hdml2X29iai0+cmVzdi0+bG9j aywKLQkJCQkJJnN1Ym1pdC0+dGlja2V0KTsKKwkJCQkJCQkgIHRpY2tldCk7CiAJCQlpZiAocmV0 ID09IC1FQUxSRUFEWSkKIAkJCQlEUk1fRVJST1IoIkJPIGF0IGluZGV4ICV1IGFscmVhZHkgb24g c3VibWl0IGxpc3RcbiIsCiAJCQkJCSAgaSk7CkBAIC0xMzIsNyArMTMxLDcgQEAgc3RhdGljIGlu dCBzdWJtaXRfbG9ja19vYmplY3RzKHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdCkK IAkJfQogCX0KIAotCXd3X2FjcXVpcmVfZG9uZSgmc3VibWl0LT50aWNrZXQpOworCXd3X2FjcXVp cmVfZG9uZSh0aWNrZXQpOwogCiAJcmV0dXJuIDA7CiAKQEAgLTE1MCw3ICsxNDksNyBAQCBzdGF0 aWMgaW50IHN1Ym1pdF9sb2NrX29iamVjdHMoc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3Vi bWl0KQogCiAJCS8qIHdlIGxvc3Qgb3V0IGluIGEgc2Vxbm8gcmFjZSwgbG9jayBhbmQgcmV0cnku LiAqLwogCQlyZXQgPSB3d19tdXRleF9sb2NrX3Nsb3dfaW50ZXJydXB0aWJsZSgmZXRuYXZpdl9v YmotPnJlc3YtPmxvY2ssCi0JCQkJJnN1Ym1pdC0+dGlja2V0KTsKKwkJCQkJCSAgICAgICB0aWNr ZXQpOwogCQlpZiAoIXJldCkgewogCQkJc3VibWl0LT5ib3NbY29udGVuZGVkXS5mbGFncyB8PSBC T19MT0NLRUQ7CiAJCQlzbG93X2xvY2tlZCA9IGNvbnRlbmRlZDsKQEAgLTM2MSw3ICszNjAsNiBA QCBzdGF0aWMgdm9pZCBzdWJtaXRfY2xlYW51cChzdHJ1Y3QgZXRuYXZpdl9nZW1fc3VibWl0ICpz dWJtaXQpCiAJCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZCgmZXRuYXZpdl9vYmotPmJhc2Up OwogCX0KIAotCXd3X2FjcXVpcmVfZmluaSgmc3VibWl0LT50aWNrZXQpOwogCWlmIChzdWJtaXQt PmluX2ZlbmNlKQogCQlkbWFfZmVuY2VfcHV0KHN1Ym1pdC0+aW5fZmVuY2UpOwogCWlmIChzdWJt aXQtPm91dF9mZW5jZSkKQEAgLTM4MSw2ICszNzksNyBAQCBpbnQgZXRuYXZpdl9pb2N0bF9nZW1f c3VibWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGV0bmF2 aXZfY21kYnVmICpjbWRidWY7CiAJc3RydWN0IGV0bmF2aXZfZ3B1ICpncHU7CiAJc3RydWN0IHN5 bmNfZmlsZSAqc3luY19maWxlID0gTlVMTDsKKwlzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggdGlja2V0 OwogCWludCBvdXRfZmVuY2VfZmQgPSAtMTsKIAl2b2lkICpzdHJlYW07CiAJaW50IHJldDsKQEAg LTQ2NiwxMCArNDY1LDEyIEBAIGludCBldG5hdml2X2lvY3RsX2dlbV9zdWJtaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJfQogCX0KIAorCXd3X2FjcXVpcmVfaW5pdCgm dGlja2V0LCAmcmVzZXJ2YXRpb25fd3dfY2xhc3MpOworCiAJc3VibWl0ID0gc3VibWl0X2NyZWF0 ZShkZXYsIGdwdSwgYXJncy0+bnJfYm9zKTsKIAlpZiAoIXN1Ym1pdCkgewogCQlyZXQgPSAtRU5P TUVNOwotCQlnb3RvIGVycl9zdWJtaXRfY21kczsKKwkJZ290byBlcnJfc3VibWl0X3d3X2FjcXVp cmU7CiAJfQogCiAJc3VibWl0LT5mbGFncyA9IGFyZ3MtPmZsYWdzOwpAQCAtNDc4LDcgKzQ3OSw3 IEBAIGludCBldG5hdml2X2lvY3RsX2dlbV9zdWJtaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwKIAlpZiAocmV0KQogCQlnb3RvIGVycl9zdWJtaXRfb2JqZWN0czsKIAotCXJl dCA9IHN1Ym1pdF9sb2NrX29iamVjdHMoc3VibWl0KTsKKwlyZXQgPSBzdWJtaXRfbG9ja19vYmpl Y3RzKHN1Ym1pdCwgJnRpY2tldCk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfc3VibWl0X29iamVj dHM7CiAKQEAgLTU0NSw2ICs1NDYsOSBAQCBpbnQgZXRuYXZpdl9pb2N0bF9nZW1fc3VibWl0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiBlcnJfc3VibWl0X29iamVjdHM6CiAJ c3VibWl0X2NsZWFudXAoc3VibWl0KTsKIAorZXJyX3N1Ym1pdF93d19hY3F1aXJlOgorCXd3X2Fj cXVpcmVfZmluaSgmdGlja2V0KTsKKwogZXJyX3N1Ym1pdF9jbWRzOgogCWlmIChyZXQgJiYgKG91 dF9mZW5jZV9mZCA+PSAwKSkKIAkJcHV0X3VudXNlZF9mZChvdXRfZmVuY2VfZmQpOwotLSAKMi4x MS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK