From: John.C.Harrison@Intel.com Subject: [PATCH 49/51] drm/i915: Update intel_logical_ring_begin() to take a request structure Date: Fri, 13 Feb 2015 11:48:58 +0000 Message-ID: <1423828140-10653-50-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 89D09720E4 for ; Fri, 13 Feb 2015 03:49:53 -0800 (PST) In-Reply-To: <1423828140-10653-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 dS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8ICAgMzUgKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIHwgICAgMyAtLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwppbmRleCA1NGU2YTI1Li5jNTQwOGJjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwpAQCAtMjAzLDYgKzIwMyw4IEBAIGVudW0gewogfTsKICNkZWZpbmUgR0VOOF9D VFhfSURfU0hJRlQgMzIKIAorc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJICAgIGludCBudW1fZHdvcmRzKTsK IHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGlu KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHgpOwpAQCAtNjgwLDcgKzY4Miw3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihz dHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCiAJaWYgKHJpbmcgPT0gJmRl dl9wcml2LT5yaW5nW1JDU10gJiYKIAkgICAgaW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRp dmVfY29uc3RhbnRzX21vZGUpIHsKLQkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJp bmdidWYsIHBhcmFtcy0+Y3R4LCA0KTsKKwkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2lu KHBhcmFtcy0+cmVxdWVzdCwgNCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCkBAIC0x MDI4LDcgKzEwMzAsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogLyoqCiAgKiBpbnRlbF9sb2dpY2FsX3JpbmdfYmVn aW4oKSAtIHByZXBhcmUgdGhlIGxvZ2ljYWwgcmluZ2J1ZmZlciB0byBhY2NlcHQgc29tZSBjb21t YW5kcwogICoKLSAqIEByaW5nYnVmOiBMb2dpY2FsIHJpbmdidWZmZXIuCisgKiBAcmVxdWVzdDog VGhlIHJlcXVlc3QgdG8gc3RhcnQgc29tZSBuZXcgd29yayBmb3IKICAqIEBudW1fZHdvcmRzOiBu dW1iZXIgb2YgRFdPUkRzIHRoYXQgd2UgcGxhbiB0byB3cml0ZSB0byB0aGUgcmluZ2J1ZmZlci4K ICAqCiAgKiBUaGUgcmluZ2J1ZmZlciBtaWdodCBub3QgYmUgcmVhZHkgdG8gYWNjZXB0IHRoZSBj b21tYW5kcyByaWdodCBhd2F5IChtYXliZSBpdCBuZWVkcyB0bwpAQCAtMTAzOCwzMCArMTA0MCwy NyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmLAogICoKICAqIFJldHVybjogbm9uLXplcm8gaWYgdGhlIHJpbmdidWZmZXIg aXMgbm90IHJlYWR5IHRvIGJlIHdyaXR0ZW4gdG8uCiAgKi8KLWludCBpbnRlbF9sb2dpY2FsX3Jp bmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkgICAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsIGludCBudW1fZHdvcmRzKQorc3RhdGljIGludCBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJ ICAgIGludCBudW1fZHdvcmRzKQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx OwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOworCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCWludCByZXQ7CiAKKwlXQVJOX09OKHJlcSA9PSBOVUxMKTsKKwog CXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLAogCQkJCSAg IGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog Ci0JcmV0ID0gbG9naWNhbF9yaW5nX3ByZXBhcmUocmluZ2J1ZiwgY3R4LCBudW1fZHdvcmRzICog c2l6ZW9mKHVpbnQzMl90KSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCS8qIFByZWFs bG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRvdWNoaW5nIHRoZSByaW5nICovCi0JcmV0ID0gaW50ZWxf bG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZywgY3R4LCAmcmVxKTsKKwlyZXQgPSBsb2dp Y2FsX3JpbmdfcHJlcGFyZShyZXEtPnJpbmdidWYsIHJlcS0+Y3R4LAorCQkJCSAgIG51bV9kd29y ZHMgKiBzaXplb2YodWludDMyX3QpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0Jcmlu Z2J1Zi0+c3BhY2UgLT0gbnVtX2R3b3JkcyAqIHNpemVvZih1aW50MzJfdCk7CisJcmVxLT5yaW5n YnVmLT5zcGFjZSAtPSBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KTsKIAlyZXR1cm4gMDsK IH0KIApAQCAtMTA4Miw3ICsxMDgxLDcgQEAgc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3Jpbmdf d29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJp bmdidWYsIHJlcS0+Y3R4LCB3LT5jb3VudCAqIDIgKyAyKTsKKwlyZXQgPSBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4ocmVxLCB3LT5jb3VudCAqIDIgKyAyKTsKIAlpZiAocmV0KQogCQlyZXR1cm4g cmV0OwogCkBAIC0xMTUzLDcgKzExNTIsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFy dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAlib29sIHBwZ3R0ID0gIShkaXNw YXRjaF9mbGFncyAmIEk5MTVfRElTUEFUQ0hfU0VDVVJFKTsKIAlpbnQgcmV0OwogCi0JcmV0ID0g aW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcS0+Y3R4LCA0KTsKKwlyZXQgPSBp bnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxLCA0KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0 OwogCkBAIC0xMjExLDcgKzEyMTAsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJdWludDMyX3QgY21kOwogCWludCBy ZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+ Y3R4LCA0KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxdWVzdCwgNCk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTI2Nyw3ICsxMjY2LDcgQEAgc3RhdGljIGlu dCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCwKIAkJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0dMT0JBTF9HVFRfSVZCOwogCX0KIAotCXJl dCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXF1ZXN0LT5jdHgsIDYpOwor CXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXF1ZXN0LCA2KTsKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCkBAIC0xMjk5LDcgKzEyOTgsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1p dF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAl1MzIgY21k OwogCWludCByZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1Ziwg cmVxdWVzdC0+Y3R4LCA2KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxdWVz dCwgNik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu aAppbmRleCA0NzQ1OTdlLi40MjA4OGMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAt NjcsOSArNjcsNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQo c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJaW93cml0ZTMyKGRhdGEsIHJpbmdi dWYtPnZpcnR1YWxfc3RhcnQgKyByaW5nYnVmLT50YWlsKTsKIAlyaW5nYnVmLT50YWlsICs9IDQ7 CiB9Ci1pbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLAotCQkJICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJICAgICBp bnQgbnVtX2R3b3Jkcyk7CiAKIC8qIExvZ2ljYWwgUmluZyBDb250ZXh0cyAqLwogdm9pZCBpbnRl bF9scl9jb250ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7Ci0tIAoxLjcuOS41 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=