From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 39/53] drm/i915: Update ring->emit_flush() to take a request structure Date: Thu, 19 Feb 2015 17:17:51 +0000 Message-ID: <1424366285-29232-40-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 3199C88F2D for ; Thu, 19 Feb 2015 09:18:47 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+ZW1pdF9mbHVzaCgpIGltcGxlbWVudGF0aW9ucyB0byB0YWtlIGEg cmVxdWVzdCBpbnN0ZWFkCm9mIGEgcmluZ2J1Zi9jb250ZXh0IHBhaXIuCgpGb3I6IFZJWi01MTE1 ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAxNyArKysr KysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwg ICAgMyArLS0KIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGQ4MDg0YTEuLmYzYmYyY2MgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC01NjgsOCArNTY4LDcgQEAgc3RhdGljIGludCBsb2dp Y2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKQogCWlmIChyaW5nLT5ncHVfY2FjaGVzX2RpcnR5KQogCQlmbHVzaF9kb21haW5zID0g STkxNV9HRU1fR1BVX0RPTUFJTlM7CiAKLQlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJlcS0+cmlu Z2J1ZiwgcmVxLT5jdHgsCi0JCQkgICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2Rv bWFpbnMpOworCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9NQUlO UywgZmx1c2hfZG9tYWlucyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtNzc2LDcg Kzc3NSw3IEBAIGludCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAoIXJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCXJl dHVybiAwOwogCi0JcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyZXEtPnJpbmdidWYsIHJlcS0+Y3R4 LCAwLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyZXEs IDAsIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBA IC0xMjIxLDE4ICsxMjIwLDE4IEBAIHN0YXRpYyB2b2lkIGdlbjhfbG9naWNhbF9yaW5nX3B1dF9p cnEoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlzcGluX3VubG9ja19pcnFyZXN0b3Jl KCZkZXZfcHJpdi0+aXJxX2xvY2ssIGZsYWdzKTsKIH0KIAotc3RhdGljIGludCBnZW44X2VtaXRf Zmx1c2goc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkgICBzdHJ1Y3QgaW50 ZWxfY29udGV4dCAqY3R4LAorc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCQkJICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywK IAkJCSAgIHUzMiB1bnVzZWQpCiB7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYg PSByZXF1ZXN0LT5yaW5nYnVmOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5n YnVmLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1aW50MzJf dCBjbWQ7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5n YnVmLCBjdHgsIDQpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBy ZXF1ZXN0LT5jdHgsIDQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEyNjIsMTEg KzEyNjEsMTEgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9lbWl0X2Zs dXNoX3JlbmRlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCitzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaF9yZW5kZXIo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCQkJCSAgdTMyIGludmFsaWRh dGVfZG9tYWlucywKIAkJCQkgIHUzMiBmbHVzaF9kb21haW5zKQogeworCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gcmVxdWVzdC0+cmluZ2J1ZjsKIAlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKIAl1MzIgc2NyYXRjaF9hZGRyID0gcmluZy0+ c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAqIENBQ0hFTElORV9CWVRFUzsKIAl1MzIgZmxhZ3MgPSAw OwpAQCAtMTI5MCw3ICsxMjg5LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVy KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlmbGFncyB8PSBQSVBFX0NPTlRS T0xfR0xPQkFMX0dUVF9JVkI7CiAJfQogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2lu KHJpbmdidWYsIGN0eCwgNik7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdi dWYsIHJlcXVlc3QtPmN0eCwgNik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGMwOGUyZGMuLjZmN2M3OWMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTIzNSw4ICsyMzUsNyBA QCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJdTMyICAgICAgICAgICAgIGlycV9rZWVwX21h c2s7IC8qIGJpdG1hc2sgZm9yIGludGVycnVwdHMgdGhhdCBzaG91bGQgbm90IGJlIG1hc2tlZCAq LwogCWludAkJKCplbWl0X3JlcXVlc3QpKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm LAogCQkJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwotCWludAkJKCpl bWl0X2ZsdXNoKShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkgICAgICBz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCWludAkJKCplbWl0X2ZsdXNoKShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJCQkJICAgICAgdTMyIGludmFsaWRhdGVfZG9t YWlucywKIAkJCQkgICAgICB1MzIgZmx1c2hfZG9tYWlucyk7CiAJaW50CQkoKmVtaXRfYmJfc3Rh cnQpKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAotLSAKMS43LjkuNQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK