From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 37/53] drm/i915: Update ring->flush() to take a requests structure Date: Thu, 19 Feb 2015 17:17:49 +0000 Message-ID: <1424366285-29232-38-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FA0872095 for ; Thu, 19 Feb 2015 09:18:45 -0800 (PST) In-Reply-To: <1424366285-29232-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 bmRleCBjMzQwOGYyLi5hMWFmNjQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpA QCAtNzg0LDcgKzc4NCw3IEBAIHN0YXRpYyBpbnQgaHN3X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCiAJaW50IHJldDsKIAogCS8qIE5COiBUTEJzIG11c3QgYmUgZmx1c2hl ZCBhbmQgaW52YWxpZGF0ZWQgYmVmb3JlIGEgc3dpdGNoICovCi0JcmV0ID0gcmluZy0+Zmx1c2go cmluZywgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKKwlyZXQg PSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBJOTE1X0dFTV9HUFVfRE9N QUlOUyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtODIxLDcgKzgyMSw3IEBAIHN0 YXRpYyBpbnQgZ2VuN19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCWlu dCByZXQ7CiAKIAkvKiBOQjogVExCcyBtdXN0IGJlIGZsdXNoZWQgYW5kIGludmFsaWRhdGVkIGJl Zm9yZSBhIHN3aXRjaCAqLwotCXJldCA9IHJpbmctPmZsdXNoKHJpbmcsIEk5MTVfR0VNX0dQVV9E T01BSU5TLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmluZy0+Zmx1c2gocmVxLCBJ OTE1X0dFTV9HUFVfRE9NQUlOUywgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKQEAgLTgzOSw3ICs4MzksNyBAQCBzdGF0aWMgaW50IGdlbjdfbW1fc3dp dGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAogCS8qIFhYWDogUkNTIGlzIHRoZSBv bmx5IG9uZSB0byBhdXRvIGludmFsaWRhdGUgdGhlIFRMQnM/ICovCiAJaWYgKHJpbmctPmlkICE9 IFJDUykgewotCQlyZXQgPSByaW5nLT5mbHVzaChyaW5nLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywg STkxNV9HRU1fR1BVX0RPTUFJTlMpOworCQlyZXQgPSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VN X0dQVV9ET01BSU5TLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1 cm4gcmV0OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA5 MWE5MTMxLi5jYThmMDM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y 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 Q0hFTElORV9CWVRFUzsKIAlpbnQgcmV0OwpAQCAtMTUyNywxMCArMTUzMiwxMSBAQCBpOHh4X3Jp bmdfcHV0X2lycShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiBzdGF0aWMgaW50 Ci1ic2RfcmluZ19mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorYnNkX3Jpbmdf Zmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJICAgICAgIHUzMiAgICAg aW52YWxpZGF0ZV9kb21haW5zLAogCSAgICAgICB1MzIgICAgIGZsdXNoX2RvbWFpbnMpCiB7CisJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJ cmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCAyKTsKQEAgLTIzMTgsOSArMjMyNCwxMCBAQCBz dGF0aWMgdm9pZCBnZW42X2JzZF9yaW5nX3dyaXRlX3RhaWwoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKIAkJICAgX01BU0tFRF9CSVRfRElTQUJMRShHRU42X0JTRF9TTEVFUF9NU0dfRElT QUJMRSkpOwogfQogCi1zdGF0aWMgaW50IGdlbjZfYnNkX3JpbmdfZmx1c2goc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZywKK3N0YXRpYyBpbnQgZ2VuNl9ic2RfcmluZ19mbHVzaChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCSAgICAgICB1MzIgaW52YWxpZGF0ZSwgdTMy IGZsdXNoKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJ dWludDMyX3QgY21kOwogCWludCByZXQ7CiAKQEAgLTI0MzAsOSArMjQzNywxMCBAQCBnZW42X3Jp bmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAv KiBCbGl0dGVyIHN1cHBvcnQgKFNhbmR5QnJpZGdlKykgKi8KIAotc3RhdGljIGludCBnZW42X3Jp bmdfZmx1c2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKK3N0YXRpYyBpbnQgZ2VuNl9y aW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJICAgdTMyIGlu dmFsaWRhdGUsIHUzMiBmbHVzaCkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0g cmVxLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1aW50MzJf dCBjbWQ7CkBAIC0yODU0LDcgKzI4NjIsNyBAQCBpbnRlbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKCFyaW5nLT5ncHVfY2FjaGVz X2RpcnR5KQogCQlyZXR1cm4gMDsKIAotCXJldCA9IHJpbmctPmZsdXNoKHJpbmcsIDAsIEk5MTVf R0VNX0dQVV9ET01BSU5TKTsKKwlyZXQgPSByaW5nLT5mbHVzaChyZXEsIDAsIEk5MTVfR0VNX0dQ VV9ET01BSU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0yODc1LDcgKzI4ODMs NyBAQCBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSkKIAlpZiAocmluZy0+Z3B1X2NhY2hlc19kaXJ0eSkKIAkJZmx1c2hfZG9t YWlucyA9IEk5MTVfR0VNX0dQVV9ET01BSU5TOwogCi0JcmV0ID0gcmluZy0+Zmx1c2gocmluZywg STkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOworCXJldCA9IHJpbmctPmZsdXNo KHJlcSwgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRl eCAwZWYyOWZiLi5jMDhlMmRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCkBAIC0xNDcsNyArMTQ3LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3MgewogCiAJdm9p ZAkJKCp3cml0ZV90YWlsKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgICAg IHUzMiB2YWx1ZSk7Ci0JaW50IF9fbXVzdF9jaGVjayAoKmZsdXNoKShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nLAorCWludCBfX211c3RfY2hlY2sgKCpmbHVzaCkoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkJICB1MzIJaW52YWxpZGF0ZV9kb21haW5zLAogCQkJCSAg dTMyCWZsdXNoX2RvbWFpbnMpOwogCWludAkJKCphZGRfcmVxdWVzdCkoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZyk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=