From mboxrd@z Thu Jan 1 00:00:00 1970 From: yu.dai@intel.com Subject: [PATCH v2] drm/i915/guc: Move GuC wq_reserve_space to alloc_request_extras Date: Wed, 9 Dec 2015 10:50:54 -0800 Message-ID: <1449687054-16903-1-git-send-email-yu.dai@intel.com> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 731F66E30A for ; Wed, 9 Dec 2015 10:53:25 -0800 (PST) In-Reply-To: <1449623090-1461-1-git-send-email-yu.dai@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpTcGxpdCBHdUMgd29yayBxdWV1ZSBz cGFjZSByZXNlcnZlIGZyb20gc3VibWlzc2lvbiBhbmQgbW92ZSBpdCB0bwpyaW5nX2FsbG9jX3Jl cXVlc3RfZXh0cmFzLiBUaGUgcmVhc29uIGlzIHRoYXQgZmFpbHVyZSBpbiBsYXRlcgppOTE1X2Fk ZF9yZXF1ZXN0KCkgd29uJ3QgYmUgaGFuZGxlZC4gSW4gdGhlIGNhc2UgdGltZW91dCBoYXBwZW5z LApkcml2ZXIgY2FuIHJldHVybiBlYXJseSBpbiBvcmRlciB0byBoYW5kbGUgdGhlIGVycm9yLgoK djE6IE1vdmUgd3FfcmVzZXJ2ZV9zcGFjZSB0byByaW5nX3Jlc2VydmVfc3BhY2UKdjI6IE1vdmUg d3FfcmVzZXJ2ZV9zcGFjZSB0byBhbGxvY19yZXF1ZXN0X2V4dHJhcyAoQ2hyaXMgV2lsc29uKQoK U2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMjEgKysrKysrKysrLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgNiArKysrKysKIDMg ZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDIyNmU5YzAuLmY3YmQw MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTQ3 MiwyNSArNDcyLDIxIEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0eF9kZXNjKHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgpOwog fQogCi0vKiBHZXQgdmFsaWQgd29ya3F1ZXVlIGl0ZW0gYW5kIHJldHVybiBpdCBiYWNrIHRvIG9m ZnNldCAqLwotc3RhdGljIGludCBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShzdHJ1Y3QgaTkxNV9n dWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCitpbnQgaTkxNV9ndWNfd3FfcmVzZXJ2ZV9zcGFj ZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIHsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVz YyAqZGVzYzsKIAl2b2lkICpiYXNlOwogCXUzMiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3Ff aXRlbSk7CiAJaW50IHJldCA9IC1FVElNRURPVVQsIHRpbWVvdXRfY291bnRlciA9IDIwMDsKIAor CWlmICghZ2MpCisJCXJldHVybiAwOworCiAJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29i amVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwogCWRlc2MgPSBiYXNlICsgZ2MtPnBy b2NfZGVzY19vZmZzZXQ7CiAKIAl3aGlsZSAodGltZW91dF9jb3VudGVyLS0gPiAwKSB7CiAJCWlm IChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6 ZSkgewotCQkJKm9mZnNldCA9IGdjLT53cV90YWlsOwotCi0JCQkvKiBhZHZhbmNlIHRoZSB0YWls IGZvciBuZXh0IHdvcmtxdWV1ZSBpdGVtICovCi0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwotCQkJ Z2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOwotCiAJCQkvKiB0aGlzIHdpbGwgYnJlYWsg dGhlIGxvb3AgKi8KIAkJCXRpbWVvdXRfY291bnRlciA9IDA7CiAJCQlyZXQgPSAwOwpAQCAtNTEy LDExICs1MDgsMTIgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBp OTE1X2d1Y19jbGllbnQgKmdjLAogCXN0cnVjdCBndWNfd3FfaXRlbSAqd3FpOwogCXZvaWQgKmJh c2U7CiAJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2ZmID0gMDsKLQlpbnQgcmV0OwogCi0JcmV0ID0g Z3VjX2dldF93b3JrcXVldWVfc3BhY2UoZ2MsICZ3cV9vZmYpOwotCWlmIChyZXQpCi0JCXJldHVy biByZXQ7CisJd3Ffb2ZmID0gZ2MtPndxX3RhaWw7CisKKwkvKiBhZHZhbmNlIHRoZSB0YWlsIGZv ciBuZXh0IHdvcmtxdWV1ZSBpdGVtICovCisJZ2MtPndxX3RhaWwgKz0gc2l6ZW9mKHN0cnVjdCBn dWNfd3FfaXRlbSk7CisJZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOwogCiAJLyogRm9y IG5vdyB3b3JrcXVldWUgaXRlbSBpcyA0IERXczsgd29ya3F1ZXVlIGJ1ZmZlciBpcyAyIHBhZ2Vz LiBTbyB3ZQogCSAqIHNob3VsZCBub3QgaGF2ZSB0aGUgY2FzZSB3aGVyZSBzdHJ1Y3R1cmUgd3Fp IGlzIGFjcm9zcyBwYWdlLCBuZWl0aGVyCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDBl MDQ4YmYuLjU5YzhlMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xMjMsNSArMTIz LDYgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQs CiAJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKTsKIHZvaWQgaTkxNV9ndWNf c3VibWlzc2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2d1 Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaTkxNV9ndWNf d3FfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpOwogCiAjZW5k aWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZjk2ZmI1MS4uN2Q1M2QyNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTY2Nyw2ICs2NjcsMTIgQEAgaW50IGludGVsX2xvZ2lj YWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcXVlc3QKIAkJCXJldHVybiByZXQ7CiAJfQogCisJLyogUmVzZXJ2ZSBHdUMgV1Egc3BhY2Ug aGVyZSAob25lIHJlcXVlc3QgbmVlZHMgb25lIFdRIGl0ZW0pIGJlY2F1c2UKKwkgKiB0aGUgbGF0 ZXIgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwgY2FuJ3QgZmFpbC4gKi8KKwlyZXQgPSBpOTE1X2d1 Y193cV9yZXNlcnZlX3NwYWNlKHJlcXVlc3QtPmk5MTUtPmd1Yy5leGVjYnVmX2NsaWVudCk7CisJ aWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXJldHVybiAwOwogfQogCi0tIAoyLjUuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK