From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 41/59] drm/i915: Update ring->emit_flush() to take a request structure Date: Thu, 19 Mar 2015 12:30:46 +0000 Message-ID: <1426768264-16996-42-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 9916C6EA38 for ; Thu, 19 Mar 2015 05:31:55 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+ZW1pdF9mbHVzaCgpIGltcGxlbWVudGF0aW9ucyB0byB0YWtlIGEg cmVxdWVzdCBpbnN0ZWFkCm9mIGEgcmluZ2J1Zi9jb250ZXh0IHBhaXIuCgpGb3I6IFZJWi01MTE1 ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ ClJldmlld2VkLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAxNyArKysrKysrKy0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMyArLS0KIDIg ZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCmluZGV4IGZkODBhZjUuLmJhNDlmNTAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC01NjksOCArNTY5LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52 YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlm IChyaW5nLT5ncHVfY2FjaGVzX2RpcnR5KQogCQlmbHVzaF9kb21haW5zID0gSTkxNV9HRU1fR1BV X0RPTUFJTlM7CiAKLQlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJlcS0+cmluZ2J1ZiwgcmVxLT5j dHgsCi0JCQkgICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOworCXJl dCA9IHJpbmctPmVtaXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1c2hfZG9t YWlucyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTAwMyw3ICsxMDAyLDcgQEAg aW50IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKQogCWlmICghcmluZy0+Z3B1X2NhY2hlc19kaXJ0eSkKIAkJcmV0dXJuIDA7CiAK LQlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJlcS0+cmluZ2J1ZiwgcmVxLT5jdHgsIDAsIEk5MTVf R0VNX0dQVV9ET01BSU5TKTsKKwlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJlcSwgMCwgSTkxNV9H RU1fR1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEyMDEsMTgg KzEyMDAsMTggQEAgc3RhdGljIHZvaWQgZ2VuOF9sb2dpY2FsX3JpbmdfcHV0X2lycShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2 LT5pcnFfbG9jaywgZmxhZ3MpOwogfQogCi1zdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1 Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgsCitzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QsCiAJCQkgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLAogCQkJICAgdTMy IHVudXNlZCkKIHsKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJlcXVlc3Qt PnJpbmdidWY7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXVpbnQzMl90IGNtZDsKIAlp bnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIGN0eCwg NCk7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3QtPmN0 eCwgNCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTI0MiwxMSArMTI0MSwxMSBA QCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZiwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVy KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAotCQkJCSAgc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCwKK3N0YXRpYyBpbnQgZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcihzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJCQkJICB1MzIgaW52YWxpZGF0ZV9kb21haW5z LAogCQkJCSAgdTMyIGZsdXNoX2RvbWFpbnMpCiB7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmdidWYgPSByZXF1ZXN0LT5yaW5nYnVmOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcgPSByaW5nYnVmLT5yaW5nOwogCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0 dF9vZmZzZXQgKyAyICogQ0FDSEVMSU5FX0JZVEVTOwogCXUzMiBmbGFncyA9IDA7CkBAIC0xMjcw LDcgKzEyNjksNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaF9yZW5kZXIoc3RydWN0IGlu dGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCWZsYWdzIHw9IFBJUEVfQ09OVFJPTF9HTE9CQUxf R1RUX0lWQjsKIAl9CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1Ziwg Y3R4LCA2KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVz dC0+Y3R4LCA2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNTVmNmYzNS4uOTQxODJkZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMjM4LDggKzIzOCw3IEBAIHN0cnVjdCAg aW50ZWxfZW5naW5lX2NzIHsKIAl1MzIgICAgICAgICAgICAgaXJxX2tlZXBfbWFzazsgLyogYml0 bWFzayBmb3IgaW50ZXJydXB0cyB0aGF0IHNob3VsZCBub3QgYmUgbWFza2VkICovCiAJaW50CQko KmVtaXRfcmVxdWVzdCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQkJCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCk7Ci0JaW50CQkoKmVtaXRfZmx1c2gp KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAotCQkJCSAgICAgIHN0cnVjdCBpbnRl bF9jb250ZXh0ICpjdHgsCisJaW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCwKIAkJCQkgICAgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLAogCQkJ CSAgICAgIHUzMiBmbHVzaF9kb21haW5zKTsKIAlpbnQJCSgqZW1pdF9iYl9zdGFydCkoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=