From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 38/55] drm/i915: Update ring->emit_flush() to take a request structure Date: Fri, 29 May 2015 17:43:59 +0100 Message-ID: <1432917856-12261-39-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-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 74FCD6EDF9 for ; Fri, 29 May 2015 09:44:59 -0700 (PDT) In-Reply-To: <1432917856-12261-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 OTE1L2ludGVsX2xyYy5jCmluZGV4IGMwNjdjYmIuLmU0NmQ2YmUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC02MTUsOCArNjE1LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52 YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlm IChyaW5nLT5ncHVfY2FjaGVzX2RpcnR5KQogCQlmbHVzaF9kb21haW5zID0gSTkxNV9HRU1fR1BV X0RPTUFJTlM7CiAKLQlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJlcS0+cmluZ2J1ZiwgcmVxLT5j dHgsCi0JCQkgICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOworCXJl dCA9IHJpbmctPmVtaXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1c2hfZG9t YWlucyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtOTk0LDcgKzk5Myw3IEBAIGlu dCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSkKIAlpZiAoIXJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCXJldHVybiAwOwogCi0J cmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyZXEtPnJpbmdidWYsIHJlcS0+Y3R4LCAwLCBJOTE1X0dF TV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyZXEsIDAsIEk5MTVfR0VN X0dQVV9ET01BSU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTkyLDE4ICsx MTkxLDE4IEBAIHN0YXRpYyB2b2lkIGdlbjhfbG9naWNhbF9yaW5nX3B1dF9pcnEoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+ aXJxX2xvY2ssIGZsYWdzKTsKIH0KIAotc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4LAorc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0LAogCQkJICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywKIAkJCSAgIHUzMiB1 bnVzZWQpCiB7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByZXF1ZXN0LT5y aW5nYnVmOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1aW50MzJfdCBjbWQ7CiAJaW50 IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgsIDQp OworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXF1ZXN0LT5jdHgs IDQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEyMzMsMTEgKzEyMzIsMTEgQEAg c3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcihz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkgIHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCitzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaF9yZW5kZXIoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCQkJCSAgdTMyIGludmFsaWRhdGVfZG9tYWlucywK IAkJCQkgIHUzMiBmbHVzaF9kb21haW5zKQogeworCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmID0gcmVxdWVzdC0+cmluZ2J1ZjsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n ID0gcmluZ2J1Zi0+cmluZzsKIAl1MzIgc2NyYXRjaF9hZGRyID0gcmluZy0+c2NyYXRjaC5ndHRf b2Zmc2V0ICsgMiAqIENBQ0hFTElORV9CWVRFUzsKIAlib29sIHZmX2ZsdXNoX3dhOwpAQCAtMTI2 OSw3ICsxMjY4LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXZmX2ZsdXNoX3dhID0gSU5URUxfSU5GTyhyaW5n LT5kZXYpLT5nZW4gPj0gOSAmJgogCQkgICAgICBmbGFncyAmIFBJUEVfQ09OVFJPTF9WRl9DQUNI RV9JTlZBTElEQVRFOwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYs IGN0eCwgdmZfZmx1c2hfd2EgPyAxMiA6IDYpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19i ZWdpbihyaW5nYnVmLCByZXF1ZXN0LT5jdHgsIHZmX2ZsdXNoX3dhID8gMTIgOiA2KTsKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKaW5kZXggODcxMTNlMy4uMGI5ZmVjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaApAQCAtMjQ2LDggKzI0Niw3IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsK IAl1MzIgICAgICAgICAgICAgaXJxX2tlZXBfbWFzazsgLyogYml0bWFzayBmb3IgaW50ZXJydXB0 cyB0aGF0IHNob3VsZCBub3QgYmUgbWFza2VkICovCiAJaW50CQkoKmVtaXRfcmVxdWVzdCkoc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQkJCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCk7Ci0JaW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLAotCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJ aW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwK IAkJCQkgICAgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLAogCQkJCSAgICAgIHUzMiBmbHVzaF9k b21haW5zKTsKIAlpbnQJCSgqZW1pdF9iYl9zdGFydCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmdidWYsCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=