From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 50/59] drm/i915: Update intel_logical_ring_begin() to take a request structure Date: Thu, 19 Mar 2015 12:30:55 +0000 Message-ID: <1426768264-16996-51-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 64AE46EA36 for ; Thu, 19 Mar 2015 05:32:08 -0700 (PDT) In-Reply-To: <1426768264-16996-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGV2ZXJ5dGhpbmcgYWJvdmUgaGFzIGJlZW4gY29udmVydGVkIHRvIHVzZSByZXF1ZXN0cywKaW50 ZWxfbG9naWNhbF9yaW5nX2JlZ2luKCkgY2FuIGJlIHVwZGF0ZWQgdG8gdGFrZSBhIHJlcXVlc3Qg aW5zdGVhZCBvZiBhCnJpbmdidWYvY29udGV4dCBwYWlyLiBUaGlzIGFsc28gbWVhbnMgdGhhdCBp dCBubyBsb25nZXIgbmVlZHMgdG8gbGF6aWx5IGFsbG9jYXRlCmEgcmVxdWVzdCBpZiBuby1vbmUg aGFwcGVucyB0byBoYXZlIGRvbmUgaXQgZWFybGllci4KCk5vdGUgdGhhdCB0aGlzIGNoYW5nZSBt YWtlcyB0aGUgZXhlY2xpc3Qgc2lnbmF0dXJlIHRoZSBzYW1lIGFzIHRoZSBsZWdhY3kKdmVyc2lv bi4gVGh1cyB0aGUgdHdvIGZ1bmN0aW9ucyBjb3VsZCBiZSBtZXJnZWQgaW50byBhIHJpbmctPmJl Z2luKCkgd3JhcHBlciBpZgpyZXF1aXJlZC4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTog Sm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8ICAgMzYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBjZGJlNTE0Li5jMTZkNzI2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNzk2LDcgKzc5Niw3IEBAIHN0YXRpYyBpbnQgbG9n aWNhbF9yaW5nX3ByZXBhcmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAvKioK ICAqIGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbigpIC0gcHJlcGFyZSB0aGUgbG9naWNhbCByaW5n YnVmZmVyIHRvIGFjY2VwdCBzb21lIGNvbW1hbmRzCiAgKgotICogQHJpbmdidWY6IExvZ2ljYWwg cmluZ2J1ZmZlci4KKyAqIEByZXF1ZXN0OiBUaGUgcmVxdWVzdCB0byBzdGFydCBzb21lIG5ldyB3 b3JrIGZvcgogICogQG51bV9kd29yZHM6IG51bWJlciBvZiBEV09SRHMgdGhhdCB3ZSBwbGFuIHRv IHdyaXRlIHRvIHRoZSByaW5nYnVmZmVyLgogICoKICAqIFRoZSByaW5nYnVmZmVyIG1pZ2h0IG5v dCBiZSByZWFkeSB0byBhY2NlcHQgdGhlIGNvbW1hbmRzIHJpZ2h0IGF3YXkgKG1heWJlIGl0IG5l ZWRzIHRvCkBAIC04MDYsMzAgKzgwNiwyNiBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVw YXJlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogICoKICAqIFJldHVybjogbm9u LXplcm8gaWYgdGhlIHJpbmdidWZmZXIgaXMgbm90IHJlYWR5IHRvIGJlIHdyaXR0ZW4gdG8uCiAg Ki8KLXN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLAotCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQg bnVtX2R3b3JkcykKK3N0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAorCQkJCSAgICBpbnQgbnVtX2R3b3JkcykKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OwogCWludCByZXQ7CiAKKwlX QVJOX09OKHJlcSA9PSBOVUxMKTsKKwlkZXZfcHJpdiA9IHJlcS0+cmluZy0+ZGV2LT5kZXZfcHJp dmF0ZTsKKwogCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9y LAogCQkJCSAgIGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gbG9naWNhbF9yaW5nX3ByZXBhcmUocmluZ2J1ZiwgY3R4LCBudW1f ZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQot CS8qIFByZWFsbG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRvdWNoaW5nIHRoZSByaW5nICovCi0JcmV0 ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCBjdHgsICZyZXEpOworCXJldCA9IGxvZ2lj YWxfcmluZ19wcmVwYXJlKHJlcS0+cmluZ2J1ZiwgcmVxLT5jdHgsCisJCQkJICAgbnVtX2R3b3Jk cyAqIHNpemVvZih1aW50MzJfdCkpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyaW5n YnVmLT5zcGFjZSAtPSBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KTsKKwlyZXEtPnJpbmdi dWYtPnNwYWNlIC09IG51bV9kd29yZHMgKiBzaXplb2YodWludDMyX3QpOwogCXJldHVybiAwOwog fQogCkBAIC05MTUsNyArOTExLDcgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0 cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAKIAlpZiAocmluZyA9PSAmZGV2 X3ByaXYtPnJpbmdbUkNTXSAmJgogCSAgICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2 ZV9jb25zdGFudHNfbW9kZSkgewotCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmlu Z2J1ZiwgcGFyYW1zLT5jdHgsIDQpOworCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4o cGFyYW1zLT5yZXF1ZXN0LCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTEw NzEsNyArMTA2Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRz X2VtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXEt PmN0eCwgdy0+Y291bnQgKiAyICsgMik7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2lu KHJlcSwgdy0+Y291bnQgKiAyICsgMik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAt MTE1Myw3ICsxMTQ5LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJYm9vbCBwcGd0dCA9ICEoZGlzcGF0Y2hfZmxhZ3Mg JiBJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2lj YWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXEtPmN0eCwgNCk7CisJcmV0ID0gaW50ZWxfbG9naWNh bF9yaW5nX2JlZ2luKHJlcSwgNCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTIx MSw3ICsxMjA3LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCXVpbnQzMl90IGNtZDsKIAlpbnQgcmV0OwogCi0JcmV0 ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3QtPmN0eCwgNCk7CisJ cmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDQpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKQEAgLTEyNjksNyArMTI2NSw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0 X2ZsdXNoX3JlbmRlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJCWZs YWdzIHw9IFBJUEVfQ09OVFJPTF9HTE9CQUxfR1RUX0lWQjsKIAl9CiAKLQlyZXQgPSBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCA2KTsKKwlyZXQgPSBpbnRl bF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxdWVzdCwgNik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApAQCAtMTMwMSw3ICsxMjk3LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJdTMyIGNtZDsKIAlpbnQgcmV0 OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3QtPmN0 eCwgNik7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDYpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==