From: John.C.Harrison@Intel.com Subject: [PATCH 37/51] drm/i915: Update ring->flush() to take a requests structure Date: Fri, 13 Feb 2015 11:48:46 +0000 Message-ID: <1423828140-10653-38-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 62AE3720DB for ; Fri, 13 Feb 2015 03:49:41 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVkcGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+Zmx1c2goKSBmdW5jdGlvbnMgdG8gdGFrZSBhIHJlcXVlc3QgaW5z dGVhZCBvZiBhIHJpbmcuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlz b24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgICAgIHwgICAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYyB8ICAgMzAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgICAyICstCiA0IGZpbGVzIGNoYW5n ZWQsIDI0IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA4MTZhNDQyLi4zODRmNDgxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC00ODksNyArNDg5LDcgQEAgbWlfc2V0X2Nv bnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiBod19mbGFncykKIAkg KiBpdGxiX2JlZm9yZV9jdHhfc3dpdGNoLgogCSAqLwogCWlmIChJU19HRU42KHJpbmctPmRldikp IHsKLQkJcmV0ID0gcmluZy0+Zmx1c2gocmluZywgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIDApOwor CQlyZXQgPSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCAwKTsKIAkJaWYg KHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCA4OWJiYzJjLi5lM2E2NWMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpA QCAtNzgwLDcgKzc4MCw3IEBAIHN0YXRpYyBpbnQgaHN3X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCiAJaW50IHJldDsKIAogCS8qIE5COiBUTEJzIG11c3QgYmUgZmx1c2hl ZCBhbmQgaW52YWxpZGF0ZWQgYmVmb3JlIGEgc3dpdGNoICovCi0JcmV0ID0gcmluZy0+Zmx1c2go cmluZywgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKKwlyZXQg PSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBJOTE1X0dFTV9HUFVfRE9N QUlOUyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtODA2LDcgKzgwNiw3IEBAIHN0 YXRpYyBpbnQgZ2VuN19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCWlu dCByZXQ7CiAKIAkvKiBOQjogVExCcyBtdXN0IGJlIGZsdXNoZWQgYW5kIGludmFsaWRhdGVkIGJl Zm9yZSBhIHN3aXRjaCAqLwotCXJldCA9IHJpbmctPmZsdXNoKHJpbmcsIEk5MTVfR0VNX0dQVV9E T01BSU5TLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmluZy0+Zmx1c2gocmVxLCBJ OTE1X0dFTV9HUFVfRE9NQUlOUywgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKQEAgLTgyNCw3ICs4MjQsNyBAQCBzdGF0aWMgaW50IGdlbjdfbW1fc3dp dGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAogCS8qIFhYWDogUkNTIGlzIHRoZSBv bmx5IG9uZSB0byBhdXRvIGludmFsaWRhdGUgdGhlIFRMQnM/ICovCiAJaWYgKHJpbmctPmlkICE9 IFJDUykgewotCQlyZXQgPSByaW5nLT5mbHVzaChyaW5nLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywg STkxNV9HRU1fR1BVX0RPTUFJTlMpOworCQlyZXQgPSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VN X0dQVV9ET01BSU5TLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1 cm4gcmV0OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2 YTUzYmZjLi5iYzNjMGU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j CkBAIC05MSwxMCArOTEsMTEgQEAgc3RhdGljIHZvaWQgX19pbnRlbF9yaW5nX2FkdmFuY2Uoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIH0KIAogc3RhdGljIGludAotZ2VuMl9yZW5kZXJf cmluZ19mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorZ2VuMl9yZW5kZXJfcmlu Z19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJICAgICAgIHUzMglp bnZhbGlkYXRlX2RvbWFpbnMsCiAJCSAgICAgICB1MzIJZmx1c2hfZG9tYWlucykKIHsKKwlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCXUzMiBjbWQ7CiAJaW50IHJl dDsKIApAQCAtMTE3LDEwICsxMTgsMTEgQEAgZ2VuMl9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogfQogCiBzdGF0aWMgaW50Ci1nZW40X3JlbmRlcl9yaW5n X2ZsdXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitnZW40X3JlbmRlcl9yaW5nX2Zs dXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkgICAgICAgdTMyCWludmFs aWRhdGVfZG9tYWlucywKIAkJICAgICAgIHUzMglmbHVzaF9kb21haW5zKQogeworCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHJpbmctPmRldjsKIAl1MzIgY21kOwogCWludCByZXQ7CkBAIC0yNDcsOSArMjQ5LDEwIEBA IGludGVsX2VtaXRfcG9zdF9zeW5jX25vbnplcm9fZmx1c2goc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKIH0KIAogc3RhdGljIGludAotZ2VuNl9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAotICAgICAgICAgICAgICAgICAgICAgICAgIHUzMiBpbnZh bGlkYXRlX2RvbWFpbnMsIHUzMiBmbHVzaF9kb21haW5zKQorZ2VuNl9yZW5kZXJfcmluZ19mbHVz aChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKKwkJICAgICAgIHUzMiBpbnZhbGlk YXRlX2RvbWFpbnMsIHUzMiBmbHVzaF9kb21haW5zKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJdTMyIGZsYWdzID0gMDsKIAl1MzIgc2NyYXRjaF9hZGRy ID0gcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAqIENBQ0hFTElORV9CWVRFUzsKIAlpbnQg cmV0OwpAQCAtMzQxLDkgKzM0NCwxMCBAQCBzdGF0aWMgaW50IGdlbjdfcmluZ19mYmNfZmx1c2go c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHZhbHVlKQogfQogCiBzdGF0aWMgaW50 Ci1nZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitn ZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CQkgICAgICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywgdTMyIGZsdXNoX2RvbWFpbnMpCiB7CisJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAl1MzIgZmxhZ3MgPSAw OwogCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0dF9vZmZzZXQgKyAyICogQ0FD SEVMSU5FX0JZVEVTOwogCWludCByZXQ7CkBAIC00MjYsOSArNDMwLDEwIEBAIGdlbjhfZW1pdF9w aXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIH0KIAogc3RhdGljIGlu dAotZ2VuOF9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAor Z2VuOF9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK IAkJICAgICAgIHUzMiBpbnZhbGlkYXRlX2RvbWFpbnMsIHUzMiBmbHVzaF9kb21haW5zKQogewor CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJdTMyIGZsYWdzID0g MDsKIAl1MzIgc2NyYXRjaF9hZGRyID0gcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAqIENB Q0hFTElORV9CWVRFUzsKIAlpbnQgcmV0OwpAQCAtMTQ0OCwxMCArMTQ1MywxMSBAQCB2b2lkIGlu dGVsX3Jpbmdfc2V0dXBfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykK IH0KIAogc3RhdGljIGludAotYnNkX3JpbmdfZmx1c2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKK2JzZF9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CSAgICAgICB1MzIgICAgIGludmFsaWRhdGVfZG9tYWlucywKIAkgICAgICAgdTMyICAgICBmbHVz aF9kb21haW5zKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7 CiAJaW50IHJldDsKIAogCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmluZywgMik7CkBAIC0yMjM5 LDkgKzIyNDUsMTAgQEAgc3RhdGljIHZvaWQgZ2VuNl9ic2RfcmluZ193cml0ZV90YWlsKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCSAgIF9NQVNLRURfQklUX0RJU0FCTEUoR0VONl9C U0RfU0xFRVBfTVNHX0RJU0FCTEUpKTsKIH0KIAotc3RhdGljIGludCBnZW42X2JzZF9yaW5nX2Zs dXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitzdGF0aWMgaW50IGdlbjZfYnNkX3Jp bmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkgICAgICAgdTMy IGludmFsaWRhdGUsIHUzMiBmbHVzaCkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n ID0gcmVxLT5yaW5nOwogCXVpbnQzMl90IGNtZDsKIAlpbnQgcmV0OwogCkBAIC0yMzQzLDkgKzIz NTAsMTAgQEAgZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXIoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKIAogLyogQmxpdHRlciBzdXBwb3J0IChTYW5keUJyaWRnZSspICovCiAKLXN0 YXRpYyBpbnQgZ2VuNl9yaW5nX2ZsdXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitz dGF0aWMgaW50IGdlbjZfcmluZ19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSwKIAkJCSAgIHUzMiBpbnZhbGlkYXRlLCB1MzIgZmx1c2gpCiB7CisJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmlu Zy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJdWludDMyX3QgY21kOwpAQCAtMjc2Niw3ICsyNzc0LDcgQEAgaW50ZWxfcmluZ19m bHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlmICgh cmluZy0+Z3B1X2NhY2hlc19kaXJ0eSkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSByaW5nLT5mbHVz aChyaW5nLCAwLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmluZy0+Zmx1c2gocmVx LCAwLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApA QCAtMjc4Nyw3ICsyNzk1LDcgQEAgaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJpbmctPmdwdV9jYWNoZXNfZGly dHkpCiAJCWZsdXNoX2RvbWFpbnMgPSBJOTE1X0dFTV9HUFVfRE9NQUlOUzsKIAotCXJldCA9IHJp bmctPmZsdXNoKHJpbmcsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBmbHVzaF9kb21haW5zKTsKKwly ZXQgPSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBmbHVzaF9kb21haW5z KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKaW5kZXggOGE2NzJiMS4uODI0YzcxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMTQ3LDcgKzE0Nyw3IEBAIHN0cnVjdCAgaW50ZWxfZW5n aW5lX2NzIHsKIAogCXZvaWQJCSgqd3JpdGVfdGFpbCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKIAkJCQkgICAgICB1MzIgdmFsdWUpOwotCWludCBfX211c3RfY2hlY2sgKCpmbHVzaCko c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwlpbnQgX19tdXN0X2NoZWNrICgqZmx1c2gp KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJCSAgdTMyCWludmFsaWRhdGVf ZG9tYWlucywKIAkJCQkgIHUzMglmbHVzaF9kb21haW5zKTsKIAlpbnQJCSgqYWRkX3JlcXVlc3Qp KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK