From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v3 09/28] drm/i915: Convert 'last_flip_req' to be a request not a seqno Date: Mon, 24 Nov 2014 18:49:31 +0000 Message-ID: <1416854990-1920-10-git-send-email-John.C.Harrison@Intel.com> References: <1416854990-1920-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 A056B6EE16 for ; Mon, 24 Nov 2014 10:50:17 -0800 (PST) In-Reply-To: <1416854990-1920-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkNvbnZlcnRl ZCAnbGFzdF9mbGlwX3JlcScgdG8gYmUgYW4gYWN0dWFsIHJlcXVlc3QgcmF0aGVyIHRoYW4gYSBz ZXFubyB2YWx1ZSBhcwpwYXJ0IG9mIHRoZSBvbiBnb2luZyBzZXFubyB0byByZXF1ZXN0IGNoYW5n ZXMuIFRoaXMgaW5jbHVkZXMgcmVmZXJlbmNlIGNvdW50aW5nCnRoZSByZXF1ZXN0IGJlaW5nIHNh dmVkIGF3YXkgdG8gZW5zdXJlIGl0IGNhbiBub3QgYmUgcmV0aXJlZCBhbmQgZnJlZWQgd2hpbGUg dGhlCm92ZXJsYXkgY29kZSBpcyBzdGlsbCB3YWl0aW5nIG9uIGl0LgoKRm9yOiBWSVotNDM3NwpT aWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpS ZXZpZXdlZC1ieTogVGhvbWFzIERhbmllbCA8VGhvbWFzLkRhbmllbEBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIHwgICAyMyArKysrKysrKysrKysr KystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCmluZGV4IGRjMmY0ZjIuLjVkZWZj MzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKQEAgLTE4Miw3ICsxODIsNyBA QCBzdHJ1Y3QgaW50ZWxfb3ZlcmxheSB7CiAJdTMyIGZsaXBfYWRkcjsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqcmVnX2JvOwogCS8qIGZsaXAgaGFuZGxpbmcgKi8KLQl1aW50MzJfdCBs YXN0X2ZsaXBfcmVxOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqbGFzdF9mbGlwX3Jl cTsKIAl2b2lkICgqZmxpcF90YWlsKShzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqKTsKIH07CiAKQEAg LTIxNywxNyArMjE3LDIwIEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9kb193YWl0X3JlcXVl c3Qoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXksCiAJaW50IHJldDsKIAogCUJVR19PTihv dmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKLQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsICZv dmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb3Zlcmxh eS0+bGFzdF9mbGlwX3JlcSwKKwkJCQkJICAgICByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpOworCXJldCA9IGk5MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCk7CiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAogCW92ZXJsYXktPmZsaXBfdGFpbCA9IHRhaWw7Ci0JcmV0ID0gaTkxNV93 YWl0X3NlcW5vKHJpbmcsIG92ZXJsYXktPmxhc3RfZmxpcF9yZXEpOworCXJldCA9IGk5MTVfd2Fp dF9zZXFubyhyaW5nLAorCQkJIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG92ZXJsYXktPmxh c3RfZmxpcF9yZXEpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCWk5MTVfZ2VtX3JldGly ZV9yZXF1ZXN0cyhkZXYpOwogCi0Jb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSA9IDA7CisJaTkxNV9n ZW1fcmVxdWVzdF9hc3NpZ24oJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEsIE5VTEwpOwogCXJldHVy biAwOwogfQogCkBAIC0yODYsNyArMjg5LDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9j b250aW51ZShzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwKIAlpbnRlbF9yaW5nX2VtaXQo cmluZywgZmxpcF9hZGRyKTsKIAlpbnRlbF9yaW5nX2FkdmFuY2UocmluZyk7CiAKLQlyZXR1cm4g aTkxNV9hZGRfcmVxdWVzdChyaW5nLCAmb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CisJV0FSTl9P TihvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb3Zl cmxheS0+bGFzdF9mbGlwX3JlcSwKKwkJCQkJICAgICByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3Jl cXVlc3QpOworCXJldHVybiBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwpOwogfQogCiBzdGF0 aWMgdm9pZCBpbnRlbF9vdmVybGF5X3JlbGVhc2Vfb2xkX3ZpZF90YWlsKHN0cnVjdCBpbnRlbF9v dmVybGF5ICpvdmVybGF5KQpAQCAtMzY2LDEwICszNzIsMTEgQEAgc3RhdGljIGludCBpbnRlbF9v dmVybGF5X3JlY292ZXJfZnJvbV9pbnRlcnJ1cHQoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJs YXkpCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZkZXZfcHJpdi0+cmluZ1tSQ1Nd OwogCWludCByZXQ7CiAKLQlpZiAob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSA9PSAwKQorCWlmIChv dmVybGF5LT5sYXN0X2ZsaXBfcmVxID09IE5VTEwpCiAJCXJldHVybiAwOwogCi0JcmV0ID0gaTkx NV93YWl0X3NlcW5vKHJpbmcsIG92ZXJsYXktPmxhc3RfZmxpcF9yZXEpOworCXJldCA9IGk5MTVf d2FpdF9zZXFubyhyaW5nLAorCQkJIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG92ZXJsYXkt Pmxhc3RfZmxpcF9yZXEpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCWk5MTVfZ2VtX3Jl dGlyZV9yZXF1ZXN0cyhkZXYpOwpAQCAtMzc3LDcgKzM4NCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf b3ZlcmxheV9yZWNvdmVyX2Zyb21faW50ZXJydXB0KHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVy bGF5KQogCWlmIChvdmVybGF5LT5mbGlwX3RhaWwpCiAJCW92ZXJsYXktPmZsaXBfdGFpbChvdmVy bGF5KTsKIAotCW92ZXJsYXktPmxhc3RfZmxpcF9yZXEgPSAwOworCWk5MTVfZ2VtX3JlcXVlc3Rf YXNzaWduKCZvdmVybGF5LT5sYXN0X2ZsaXBfcmVxLCBOVUxMKTsKIAlyZXR1cm4gMDsKIH0KIAot LSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK