From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 06/10] drm/i915: Refactor eb_select_engine to take eb Date: Thu, 25 Jan 2018 13:33:29 +0000 Message-ID: <20180125133333.13425-7-tvrtko.ursulin@linux.intel.com> References: <20180125133333.13425-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7304D6E0A1 for ; Thu, 25 Jan 2018 13:33:48 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id w50so2198391wrc.2 for ; Thu, 25 Jan 2018 05:33:48 -0800 (PST) In-Reply-To: <20180125133333.13425-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlZmFjdG9y aW5nIHRvIGVuYWJsZSBmdXR1cmUgcGF0Y2hlcy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgNDkgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDM4NGI2YmQ5YTRh Ny4uNzgzNDBjZWIxMTA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCkBAIC0yMDE2LDkgKzIwMTYsOSBAQCBnZW44X2Rpc3BhdGNoX2JzZF9lbmdpbmUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiBmaWxlX3ByaXYtPmJzZF9l bmdpbmU7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICoKLWViX3NlbGVjdF9l bmdpbmVfY2xhc3NfaW5zdGFuY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHU2NCBl Yl9mbGFncykKK3N0YXRpYyBpbnQgZWJfc2VsZWN0X2VuZ2luZV9jbGFzc19pbnN0YW5jZShzdHJ1 Y3QgaTkxNV9leGVjYnVmZmVyICplYikKIHsKKwl1NjQgZWJfZmxhZ3MgPSBlYi0+YXJncy0+Zmxh Z3M7CiAJdTggY2xhc3MgPSBlYl9mbGFncyAmIEk5MTVfRVhFQ19SSU5HX01BU0s7CiAJdTggaW5z dGFuY2UgPSAoZWJfZmxhZ3MgJiBJOTE1X0VYRUNfSU5TVEFOQ0VfTUFTSykgPj4KIAkJICAgICAg STkxNV9FWEVDX0lOU1RBTkNFX1NISUZUOwpAQCAtMjAyNiwxMiArMjAyNiwxNCBAQCBlYl9zZWxl Y3RfZW5naW5lX2NsYXNzX2luc3RhbmNlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCB1 NjQgZWJfZmxhZ3MpCiAJCSAgSTkxNV9FWEVDX0VOR0lORV9DQVBfU0hJRlQ7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCi0JZW5naW5lID0gaW50ZWxfZW5naW5lX2xvb2t1cF91 c2VyKGk5MTUsIGNsYXNzLCBpbnN0YW5jZSk7CisJZW5naW5lID0gaW50ZWxfZW5naW5lX2xvb2t1 cF91c2VyKGViLT5pOTE1LCBjbGFzcywgaW5zdGFuY2UpOwogCiAJaWYgKGVuZ2luZSAmJiAoKGNh cHMgJiBlbmdpbmUtPmNhcHMpICE9IGNhcHMpKQotCQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIC1F SU5WQUw7CiAKLQlyZXR1cm4gZW5naW5lOworCWViLT5lbmdpbmUgPSBlbmdpbmU7CisKKwlyZXR1 cm4gMDsKIH0KIAogI2RlZmluZSBJOTE1X1VTRVJfUklOR1MgKDQpCkBAIC0yMDQ0LDMxICsyMDQ2 LDMwIEBAIHN0YXRpYyBjb25zdCBlbnVtIGludGVsX2VuZ2luZV9pZCB1c2VyX3JpbmdfbWFwW0k5 MTVfVVNFUl9SSU5HUyArIDFdID0gewogCVtJOTE1X0VYRUNfVkVCT1hdCT0gVkVDUwogfTsKIAot c3RhdGljIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKgotZWJfc2VsZWN0X2VuZ2luZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCSBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0J CSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyICphcmdzKQorc3RhdGljIGludCBlYl9z ZWxlY3RfZW5naW5lKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXIgKmViLCBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUpCiB7Ci0JdW5zaWduZWQgaW50IHVzZXJfcmluZ19pZCA9IGFyZ3MtPmZsYWdzICYgSTkx NV9FWEVDX1JJTkdfTUFTSzsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBl Yi0+aTkxNTsKKwl1NjQgZmxhZ3MgPSBlYi0+YXJncy0+ZmxhZ3M7CisJdW5zaWduZWQgaW50IHVz ZXJfcmluZ19pZCA9IGZsYWdzICYgSTkxNV9FWEVDX1JJTkdfTUFTSzsKIAlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmU7CiAKLQlpZiAoYXJncy0+ZmxhZ3MgJiBJOTE1X0VYRUNfQ0xBU1Nf SU5TVEFOQ0UpCi0JCXJldHVybiBlYl9zZWxlY3RfZW5naW5lX2NsYXNzX2luc3RhbmNlKGRldl9w cml2LCBhcmdzLT5mbGFncyk7CisJaWYgKGZsYWdzICYgSTkxNV9FWEVDX0NMQVNTX0lOU1RBTkNF KQorCQlyZXR1cm4gZWJfc2VsZWN0X2VuZ2luZV9jbGFzc19pbnN0YW5jZShlYik7CiAKIAlpZiAo dXNlcl9yaW5nX2lkID4gSTkxNV9VU0VSX1JJTkdTKSB7CiAJCURSTV9ERUJVRygiZXhlY2J1ZiB3 aXRoIHVua25vd24gcmluZzogJXVcbiIsIHVzZXJfcmluZ19pZCk7Ci0JCXJldHVybiBOVUxMOwor CQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKIAlpZiAoKHVzZXJfcmluZ19pZCAhPSBJOTE1X0VYRUNf QlNEKSAmJgotCSAgICAoKGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX0JTRF9NQVNLKSAhPSAwKSkg eworCSAgICAoKGZsYWdzICYgSTkxNV9FWEVDX0JTRF9NQVNLKSAhPSAwKSkgewogCQlEUk1fREVC VUcoImV4ZWNidWYgd2l0aCBub24gYnNkIHJpbmcgYnV0IHdpdGggaW52YWxpZCAiCi0JCQkgICJi c2QgZGlzcGF0Y2ggZmxhZ3M6ICVkXG4iLCAoaW50KShhcmdzLT5mbGFncykpOwotCQlyZXR1cm4g TlVMTDsKKwkJCSAgImJzZCBkaXNwYXRjaCBmbGFnczogJWxseFxuIiwgZmxhZ3MpOworCQlyZXR1 cm4gLUVJTlZBTDsKIAl9CiAKIAlpZiAodXNlcl9yaW5nX2lkID09IEk5MTVfRVhFQ19CU0QgJiYg SEFTX0JTRDIoZGV2X3ByaXYpKSB7Ci0JCXVuc2lnbmVkIGludCBic2RfaWR4ID0gYXJncy0+Zmxh Z3MgJiBJOTE1X0VYRUNfQlNEX01BU0s7CisJCXVuc2lnbmVkIGludCBic2RfaWR4ID0gZmxhZ3Mg JiBJOTE1X0VYRUNfQlNEX01BU0s7CiAKIAkJaWYgKGJzZF9pZHggPT0gSTkxNV9FWEVDX0JTRF9E RUZBVUxUKSB7CiAJCQlic2RfaWR4ID0gZ2VuOF9kaXNwYXRjaF9ic2RfZW5naW5lKGRldl9wcml2 LCBmaWxlKTsKQEAgLTIwNzksNyArMjA4MCw3IEBAIGViX3NlbGVjdF9lbmdpbmUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl9IGVsc2UgewogCQkJRFJNX0RFQlVHKCJleGVj YnVmIHdpdGggdW5rbm93biBic2QgcmluZzogJXVcbiIsCiAJCQkJICBic2RfaWR4KTsKLQkJCXJl dHVybiBOVUxMOworCQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KIAogCQllbmdpbmUgPSBkZXZfcHJp di0+ZW5naW5lW19WQ1MoYnNkX2lkeCldOwpAQCAtMjA4OSwxMCArMjA5MCwxMiBAQCBlYl9zZWxl Y3RfZW5naW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWlmICghZW5n aW5lKSB7CiAJCURSTV9ERUJVRygiZXhlY2J1ZiB3aXRoIGludmFsaWQgcmluZzogJXVcbiIsIHVz ZXJfcmluZ19pZCk7Ci0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQly ZXR1cm4gZW5naW5lOworCWViLT5lbmdpbmUgPSBlbmdpbmU7CisKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIHZvaWQKQEAgLTIyOTcsMTIgKzIzMDAsMTIgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmICh1bmxpa2VseShlcnIpKQogCQlnb3RvIGVy cl9kZXN0cm95OwogCi0JZXJyID0gLUVJTlZBTDsKLQllYi5lbmdpbmUgPSBlYl9zZWxlY3RfZW5n aW5lKGViLmk5MTUsIGZpbGUsIGFyZ3MpOwotCWlmICghZWIuZW5naW5lKQorCWVyciA9IGViX3Nl bGVjdF9lbmdpbmUoJmViLCBmaWxlKTsKKwlpZiAoZXJyKQogCQlnb3RvIGVycl9lbmdpbmU7CiAK IAlpZiAoYXJncy0+ZmxhZ3MgJiBJOTE1X0VYRUNfUkVTT1VSQ0VfU1RSRUFNRVIpIHsKKwkJZXJy ID0gLUVJTlZBTDsKIAkJaWYgKCFIQVNfUkVTT1VSQ0VfU1RSRUFNRVIoZWIuaTkxNSkpIHsKIAkJ CURSTV9ERUJVRygiUlMgaXMgb25seSBhbGxvd2VkIGZvciBIYXN3ZWxsLCBHZW44IGFuZCBhYm92 ZVxuIik7CiAJCQlnb3RvIGVycl9lbmdpbmU7Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=