From: Dave Gordon Subject: [PATCH 3/3] drm/i915: rename & update eb_select_ring() Date: Wed, 20 Jul 2016 18:16:07 +0100 Message-ID: <1469034967-15840-4-git-send-email-david.s.gordon@intel.com> References: <1469034967-15840-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 61AF76E891 for ; Wed, 20 Jul 2016 17:16:18 +0000 (UTC) In-Reply-To: <1469034967-15840-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 List-Id: intel-gfx@lists.freedesktop.org J3JpbmcnIGlzIGFuIG9sZCBkZXByZWNhdGVkIHRlcm0gZm9yIGEgR1BVIGVuZ2luZSwgc28gd2Un cmUgdHJ5aW5nIHRvCnBoYXNlIG91dCBhbGwgc3VjaCB0ZXJtaW5vbG9neS4gZWJfc2VsZWN0X3Jp bmcoKSBub3Qgb25seSBoYXMgJ3JpbmcnCihtZWFuaW5nIGVuZ2luZSkgaW4gaXRzIG5hbWUsIGJ1 dCBpdCBoYXMgYW4gdWdseSBjYWxsaW5nIGNvbnZlbnRpb24Kd2hlcmVieSBpdCByZXR1cm5zIGFu IGVycm5vIGFuZCBzdG9yZXMgYSBwb2ludGVyLXRvLWVuZ2luZSBpbmRpcmVjdGx5CnRocm91Z2gg YW4gb3V0cHV0IHBhcmFtZXRlci4gQXMgdGhlcmUgaXMgb25seSBvbmUgZXJyb3IgaXQgZXZlciBy ZXR1cm5zCigtRUlOVkFMKSwgd2UgY2FuIG1ha2UgaXQgcmV0dXJuIHRoZSBwb2ludGVyIGRpcmVj dGx5LCBhbmQgaGF2ZSB0aGUKY2FsbGVyIHBhc3MgYmFjayB0aGUgZXJyb3IgY29kZSAtRUlOVkFM IGlmIHRoZSBwb2ludGVyIHJlc3VsdCBpcyBOVUxMLgoKVGh1cyB3ZSBjYW4gcmVwbGFjZQotCXJl dCA9IGViX3NlbGVjdF9yaW5nKGRldl9wcml2LCBmaWxlLCBhcmdzLCAmZW5naW5lKTsKLQlpZiAo cmV0KQotCQlyZXR1cm4gcmV0Owp3aXRoCisJZW5naW5lID0gZWJfc2VsZWN0X2VuZ2luZShkZXZf cHJpdiwgZmlsZSwgYXJncyk7CisJaWYgKCFlbmdpbmUpCisJCXJldHVybiAtRUlOVkFMOwpmb3Ig aW5jcmVhc2VkIGNsYXJpdHkgYW5kIG1heWJlIHNhdmUgYSBmZXcgY3ljbGVzIHRvby4KClNpZ25l ZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgMzIgKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CmluZGV4IDY0ODJlYzIuLmY4ZDhhZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKQEAgLTEzODAsMjQgKzEzODAsMjQgQEAgc3RhdGljIGJvb2wgb25seV9t YXBwYWJsZV9mb3JfcmVsb2ModW5zaWduZWQgaW50IGZsYWdzKQogCVtJOTE1X0VYRUNfVkVCT1hd CT0gVkVDUwogfTsKIAotc3RhdGljIGludAotZWJfc2VsZWN0X3Jpbmcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAotCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JICAg ICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3MsCi0JICAgICAgIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKipyaW5nKQorc3RhdGljIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KgorZWJfc2VsZWN0X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ CSBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCisJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZm ZXIyICphcmdzKQogewogCXVuc2lnbmVkIGludCB1c2VyX3JpbmdfaWQgPSBhcmdzLT5mbGFncyAm IEk5MTVfRVhFQ19SSU5HX01BU0s7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwog CiAJaWYgKHVzZXJfcmluZ19pZCA+IEk5MTVfVVNFUl9SSU5HUykgewogCQlEUk1fREVCVUcoImV4 ZWNidWYgd2l0aCB1bmtub3duIHJpbmc6ICV1XG4iLCB1c2VyX3JpbmdfaWQpOwotCQlyZXR1cm4g LUVJTlZBTDsKKwkJcmV0dXJuIE5VTEw7CiAJfQogCiAJaWYgKCh1c2VyX3JpbmdfaWQgIT0gSTkx NV9FWEVDX0JTRCkgJiYKIAkgICAgKChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19CU0RfTUFTSykg IT0gMCkpIHsKIAkJRFJNX0RFQlVHKCJleGVjYnVmIHdpdGggbm9uIGJzZCByaW5nIGJ1dCB3aXRo IGludmFsaWQgIgogCQkJICAiYnNkIGRpc3BhdGNoIGZsYWdzOiAlZFxuIiwgKGludCkoYXJncy0+ ZmxhZ3MpKTsKLQkJcmV0dXJuIC1FSU5WQUw7CisJCXJldHVybiBOVUxMOwogCX0KIAogCWlmICh1 c2VyX3JpbmdfaWQgPT0gSTkxNV9FWEVDX0JTRCAmJiBIQVNfQlNEMihkZXZfcHJpdikpIHsKQEAg LTE0MTIsMjAgKzE0MTIsMjAgQEAgc3RhdGljIGJvb2wgb25seV9tYXBwYWJsZV9mb3JfcmVsb2Mo dW5zaWduZWQgaW50IGZsYWdzKQogCQl9IGVsc2UgewogCQkJRFJNX0RFQlVHKCJleGVjYnVmIHdp dGggdW5rbm93biBic2QgcmluZzogJXVcbiIsCiAJCQkJICBic2RfaWR4KTsKLQkJCXJldHVybiAt RUlOVkFMOworCQkJcmV0dXJuIE5VTEw7CiAJCX0KIAotCQkqcmluZyA9ICZkZXZfcHJpdi0+ZW5n aW5lW19WQ1MoYnNkX2lkeCldOworCQllbmdpbmUgPSAmZGV2X3ByaXYtPmVuZ2luZVtfVkNTKGJz ZF9pZHgpXTsKIAl9IGVsc2UgewotCQkqcmluZyA9ICZkZXZfcHJpdi0+ZW5naW5lW3VzZXJfcmlu Z19tYXBbdXNlcl9yaW5nX2lkXV07CisJCWVuZ2luZSA9ICZkZXZfcHJpdi0+ZW5naW5lW3VzZXJf cmluZ19tYXBbdXNlcl9yaW5nX2lkXV07CiAJfQogCi0JaWYgKCFpbnRlbF9lbmdpbmVfaW5pdGlh bGl6ZWQoKnJpbmcpKSB7CisJaWYgKCFpbnRlbF9lbmdpbmVfaW5pdGlhbGl6ZWQoZW5naW5lKSkg ewogCQlEUk1fREVCVUcoImV4ZWNidWYgd2l0aCBpbnZhbGlkIHJpbmc6ICV1XG4iLCB1c2VyX3Jp bmdfaWQpOwotCQlyZXR1cm4gLUVJTlZBTDsKKwkJcmV0dXJuIE5VTEw7CiAJfQogCi0JcmV0dXJu IDA7CisJcmV0dXJuIGVuZ2luZTsKIH0KIAogc3RhdGljIGludApAQCAtMTQ2Nyw5ICsxNDY3LDkg QEAgc3RhdGljIGJvb2wgb25seV9tYXBwYWJsZV9mb3JfcmVsb2ModW5zaWduZWQgaW50IGZsYWdz KQogCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19JU19QSU5ORUQpCiAJCWRpc3BhdGNoX2Zs YWdzIHw9IEk5MTVfRElTUEFUQ0hfUElOTkVEOwogCi0JcmV0ID0gZWJfc2VsZWN0X3JpbmcoZGV2 X3ByaXYsIGZpbGUsIGFyZ3MsICZlbmdpbmUpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJ ZW5naW5lID0gZWJfc2VsZWN0X2VuZ2luZShkZXZfcHJpdiwgZmlsZSwgYXJncyk7CisJaWYgKCFl bmdpbmUpCisJCXJldHVybiAtRUlOVkFMOwogCiAJaWYgKGFyZ3MtPmJ1ZmZlcl9jb3VudCA8IDEp IHsKIAkJRFJNX0RFQlVHKCJleGVjYnVmIHdpdGggJWQgYnVmZmVyc1xuIiwgYXJncy0+YnVmZmVy X2NvdW50KTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK