From: Dave Gordon Subject: [PATCH v2, 3/4] drm/i915: simplify allocation of driver-internal requests Date: Wed, 23 Dec 2015 19:33:54 +0000 Message-ID: <1450899235-14463-4-git-send-email-david.s.gordon@intel.com> References: <1450899235-14463-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BF736E6A0 for ; Wed, 23 Dec 2015 11:34:11 -0800 (PST) In-Reply-To: <1450899235-14463-1-git-send-email-david.s.gordon@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgYXJlIGEgbnVtYmVyIG9mIHBsYWNlcyB3aGVyZSB0aGUgZHJpdmVyIG5lZWRzIGEgcmVx dWVzdCwgYnV0IGlzbid0Cndvcmtpbmcgb24gYmVoYWxmIG9mIGFueSBzcGVjaWZpYyB1c2VyIG9y IGluIGEgc3BlY2lmaWMgY29udGV4dC4gQXQKcHJlc2VudCwgd2UgYXNzb2NpYXRlIHRoZW0gd2l0 aCB0aGUgcGVyLWVuZ2luZSBkZWZhdWx0IGNvbnRleHQuIEEgZnV0dXJlCnBhdGNoIHdpbGwgYWJv bGlzaCB0aG9zZSBwZXItZW5naW5lIGNvbnRleHQgcG9pbnRlcnM7IGJ1dCB3ZSBjYW4gYWxyZWFk eQplbGltaW5hdGUgYSBsb3Qgb2YgdGhlIHJlZmVyZW5jZXMgdG8gdGhlbSBqdXN0IGJ5IGZ1bm5l bGluZyBhbGwgc3VjaAphbGxvY2F0aW9ucyB0aHJvdWdoIGEgc2luZ2xlIGZ1bmN0aW9uLCB3aGlj aCB3aWxsIG1lYW4gdGhhdCB0aGUgY2FsbGVycwpkb24ndCBuZWVkIHRvIGtub3cgYW55dGhpbmcg YWJvdXQgaG93IGFuIGFwcHJvcHJpYXRlIGNvbnRleHQgaXMgZm91bmQuCgpTbyB0aGlzIHBhdGNo IHByb3ZpZGVzIGEgc2hvcnRoYW5kIGZvciBkb2luZyBzdWNoIHJlcXVlc3QgYWxsb2NhdGlvbnMK YW5kIGNoYW5nZXMgYWxsIHN1Y2ggY2FsbHMgdG8gdXNlIHRoZSBuZXcgZnVuY3Rpb24uCgpTaWdu ZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jICAgICAgfCAzOSArKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICA2ICsrKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIHwgMjQgKysrKysrKysrKyst LS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0ZmIxNWY1Li41NmQxNDllIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIyNjksNiArMjI2OSw4IEBAIHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCB7CiBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAogCQkJICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCSAg IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnJlcV9vdXQpOworc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICogX19tdXN0X2NoZWNrCisJaTkxNV9nZW1fcmVxdWVzdF9hbGxvY19hbm9u KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2Nh bmNlbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiB2b2lkIGk5MTVfZ2VtX3Jl cXVlc3RfZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZik7CiBpbnQgaTkxNV9nZW1fcmVxdWVzdF9h ZGRfdG9fY2xpZW50KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggZDlhMzMwNC4uOTI3ZWJjOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC0yNzUxLDYgKzI3NTEsMjIgQEAgZXJyOgogCXJldHVybiByZXQ7CiB9CiAKKy8qCisg KiBBbGxvY2F0ZSBhIHJlcXVlc3QgYXNzb2NpYXRlZCB3aXRoIHRoZSBkZWZhdWx0IGNvbnRleHQg Zm9yIHRoZSBnaXZlbgorICogcmluZy4gVGhpcyBjYW4gYmUgdXNlZCB3aGVyZSB0aGUgZHJpdmVy IG5lZWRzIGEgcmVxdWVzdCBmb3IgaW50ZXJuYWwKKyAqIHB1cnBvc2VzIG5vdCBkaXJlY3RseSBy ZWxhdGVkIHRvIGEgdXNlciBiYXRjaCBzdWJtaXNzaW9uLgorICovCitzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKgoraTkxNV9nZW1fcmVxdWVzdF9hbGxvY19hbm9uKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShyaW5nLT5kZXYpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwor CWludCBlcnI7CisKKwllcnIgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJpbmctPmRl ZmF1bHRfY29udGV4dCwgJnJlcSk7CisJcmV0dXJuIGVyciA/IEVSUl9QVFIoZXJyKSA6IHJlcTsK K30KKwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSkKIHsKIAlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChyZXEtPnJp bmdidWYpOwpAQCAtMzE2OCw5ICszMTg0LDEzIEBAIF9faTkxNV9nZW1fb2JqZWN0X3N5bmMoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCXJldHVybiAwOwogCiAJCWlmICgqdG9f cmVxID09IE5VTEwpIHsKLQkJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2ModG8sIHRvLT5k ZWZhdWx0X2NvbnRleHQsIHRvX3JlcSk7Ci0JCQlpZiAocmV0KQotCQkJCXJldHVybiByZXQ7CisJ CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKKworCQkJcmVxID0gaTkxNV9nZW1f cmVxdWVzdF9hbGxvY19hbm9uKHRvKTsKKwkJCWlmIChJU19FUlIocmVxKSkKKwkJCQlyZXR1cm4g UFRSX0VSUihyZXEpOworCisJCQkqdG9fcmVxID0gcmVxOwogCQl9CiAKIAkJdHJhY2VfaTkxNV9n ZW1fcmluZ19zeW5jX3RvKCp0b19yZXEsIGZyb20sIGZyb21fcmVxKTsKQEAgLTMzNzAsOSArMzM5 MCw5IEBAIGludCBpOTE1X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmICgh aTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcTsKIAotCQkJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCByaW5nLT5kZWZh dWx0X2NvbnRleHQsICZyZXEpOwotCQkJaWYgKHJldCkKLQkJCQlyZXR1cm4gcmV0OworCQkJcmVx ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvY19hbm9uKHJpbmcpOworCQkJaWYgKElTX0VSUihyZXEp KQorCQkJCXJldHVybiBQVFJfRVJSKHJlcSk7CiAKIAkJCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRl eHQocmVxKTsKIAkJCWlmIChyZXQpIHsKQEAgLTQ4NjcsMTAgKzQ4ODcsOSBAQCBpOTE1X2dlbV9p bml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZf cHJpdiwgaSkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAotCQlXQVJO X09OKCFyaW5nLT5kZWZhdWx0X2NvbnRleHQpOwotCi0JCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3Rf YWxsb2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKLQkJaWYgKHJldCkgewor CQlyZXEgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jX2Fub24ocmluZyk7CisJCWlmIChJU19FUlIo cmVxKSkgeworCQkJcmV0ID0gUFRSX0VSUihyZXEpOwogCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5n YnVmZmVyKGRldik7CiAJCQlnb3RvIG91dDsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IGFiZDJkMjkuLjU3MTZmNGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTExNjYyLDkgKzExNjYyLDExIEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19w YWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQlvYmotPmxhc3Rfd3JpdGVfcmVx KTsKIAl9IGVsc2UgewogCQlpZiAoIXJlcXVlc3QpIHsKLQkJCXJldCA9IGk5MTVfZ2VtX3JlcXVl c3RfYWxsb2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxdWVzdCk7Ci0JCQlpZiAo cmV0KQorCQkJcmVxdWVzdCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2NfYW5vbihyaW5nKTsKKwkJ CWlmIChJU19FUlIocmVxdWVzdCkpIHsKKwkJCQlyZXQgPSBQVFJfRVJSKHJlcXVlc3QpOwogCQkJ CWdvdG8gY2xlYW51cF91bnBpbjsKKwkJCX0KIAkJfQogCiAJCXJldCA9IGRldl9wcml2LT5kaXNw bGF5LnF1ZXVlX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByZXF1ZXN0LApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jCmluZGV4IDc2ZjE5ODAuLjU3Y2Q1MDMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9vdmVybGF5LmMKQEAgLTI0MCw5ICsyNDAsOSBAQCBzdGF0aWMgaW50IGludGVs X292ZXJsYXlfb24oc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXkpCiAJV0FSTl9PTihvdmVy bGF5LT5hY3RpdmUpOwogCVdBUk5fT04oSVNfSTgzMChkZXYpICYmICEoZGV2X3ByaXYtPnF1aXJr cyAmIFFVSVJLX1BJUEVBX0ZPUkNFKSk7CiAKLQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9j KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJlcSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJu IHJldDsKKwlyZXEgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jX2Fub24ocmluZyk7CisJaWYgKElT X0VSUihyZXEpKQorCQlyZXR1cm4gUFRSX0VSUihyZXEpOwogCiAJcmV0ID0gaW50ZWxfcmluZ19i ZWdpbihyZXEsIDQpOwogCWlmIChyZXQpIHsKQEAgLTI4Myw5ICsyODMsOSBAQCBzdGF0aWMgaW50 IGludGVsX292ZXJsYXlfY29udGludWUoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXksCiAJ aWYgKHRtcCAmICgxIDw8IDE3KSkKIAkJRFJNX0RFQlVHKCJvdmVybGF5IHVuZGVycnVuLCBET1ZT VEE6ICV4XG4iLCB0bXApOwogCi0JcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCBy aW5nLT5kZWZhdWx0X2NvbnRleHQsICZyZXEpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJ cmVxID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvY19hbm9uKHJpbmcpOworCWlmIChJU19FUlIocmVx KSkKKwkJcmV0dXJuIFBUUl9FUlIocmVxKTsKIAogCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVx LCAyKTsKIAlpZiAocmV0KSB7CkBAIC0zNDksOSArMzQ5LDkgQEAgc3RhdGljIGludCBpbnRlbF9v dmVybGF5X29mZihzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSkKIAkgKiBvZiB0aGUgaHcu IERvIGl0IGluIGJvdGggY2FzZXMgKi8KIAlmbGlwX2FkZHIgfD0gT0ZDX1VQREFURTsKIAotCXJl dCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAm cmVxKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3Rf YWxsb2NfYW5vbihyaW5nKTsKKwlpZiAoSVNfRVJSKHJlcSkpCisJCXJldHVybiBQVFJfRVJSKHJl cSk7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgNik7CiAJaWYgKHJldCkgewpAQCAt NDIzLDkgKzQyMyw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9yZWxlYXNlX29sZF92aWQo c3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXkpCiAJCS8qIHN5bmNocm9ub3VzIHNsb3dwYXRo ICovCiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCi0JCXJldCA9IGk5MTVf Z2VtX3JlcXVlc3RfYWxsb2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKLQkJ aWYgKHJldCkKLQkJCXJldHVybiByZXQ7CisJCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2Nf YW5vbihyaW5nKTsKKwkJaWYgKElTX0VSUihyZXEpKQorCQkJcmV0dXJuIFBUUl9FUlIocmVxKTsK IAogCQlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgMik7CiAJCWlmIChyZXQpIHsKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=