From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v2 09/28] drm/i915: Convert 'last_flip_req' to be a request not a seqno Date: Fri, 14 Nov 2014 12:19:00 +0000 Message-ID: <1415967559-17074-10-git-send-email-John.C.Harrison@Intel.com> References: <1415967559-17074-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 73D0B6EDC9 for ; Fri, 14 Nov 2014 04:19:31 -0800 (PST) In-Reply-To: <1415967559-17074-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 aWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyB8ICAgMjMgKysrKysrKysr KysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCBkYzJmNGYyLi41 ZGVmYzM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0xODIsNyArMTgy LDcgQEAgc3RydWN0IGludGVsX292ZXJsYXkgewogCXUzMiBmbGlwX2FkZHI7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKnJlZ19ibzsKIAkvKiBmbGlwIGhhbmRsaW5nICovCi0JdWludDMy X3QgbGFzdF9mbGlwX3JlcTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3RfZmxp cF9yZXE7CiAJdm9pZCAoKmZsaXBfdGFpbCkoc3RydWN0IGludGVsX292ZXJsYXkgKik7CiB9Owog CkBAIC0yMTcsMTcgKzIxNywyMCBAQCBzdGF0aWMgaW50IGludGVsX292ZXJsYXlfZG9fd2FpdF9y ZXF1ZXN0KHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LAogCWludCByZXQ7CiAKIAlCVUdf T04ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7Ci0JcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyaW5n LCAmb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CisJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJm92 ZXJsYXktPmxhc3RfZmxpcF9yZXEsCisJCQkJCSAgICAgcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9y ZXF1ZXN0KTsKKwlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKIAlvdmVybGF5LT5mbGlwX3RhaWwgPSB0YWlsOwotCXJldCA9IGk5 MTVfd2FpdF9zZXFubyhyaW5nLCBvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlyZXQgPSBpOTE1 X3dhaXRfc2Vxbm8ocmluZywKKwkJCSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhvdmVybGF5 LT5sYXN0X2ZsaXBfcmVxKSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAlpOTE1X2dlbV9y ZXRpcmVfcmVxdWVzdHMoZGV2KTsKIAotCW92ZXJsYXktPmxhc3RfZmxpcF9yZXEgPSAwOworCWk5 MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvdmVybGF5LT5sYXN0X2ZsaXBfcmVxLCBOVUxMKTsKIAly ZXR1cm4gMDsKIH0KIApAQCAtMjg2LDcgKzI4OSwxMCBAQCBzdGF0aWMgaW50IGludGVsX292ZXJs YXlfY29udGludWUoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXksCiAJaW50ZWxfcmluZ19l bWl0KHJpbmcsIGZsaXBfYWRkcik7CiAJaW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwogCi0JcmV0 dXJuIGk5MTVfYWRkX3JlcXVlc3QocmluZywgJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEpOworCVdB Uk5fT04ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CisJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24o Jm92ZXJsYXktPmxhc3RfZmxpcF9yZXEsCisJCQkJCSAgICAgcmluZy0+b3V0c3RhbmRpbmdfbGF6 eV9yZXF1ZXN0KTsKKwlyZXR1cm4gaTkxNV9hZGRfcmVxdWVzdChyaW5nLCBOVUxMKTsKIH0KIAog c3RhdGljIHZvaWQgaW50ZWxfb3ZlcmxheV9yZWxlYXNlX29sZF92aWRfdGFpbChzdHJ1Y3QgaW50 ZWxfb3ZlcmxheSAqb3ZlcmxheSkKQEAgLTM2NiwxMCArMzcyLDExIEBAIHN0YXRpYyBpbnQgaW50 ZWxfb3ZlcmxheV9yZWNvdmVyX2Zyb21faW50ZXJydXB0KHN0cnVjdCBpbnRlbF9vdmVybGF5ICpv dmVybGF5KQogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSAmZGV2X3ByaXYtPnJpbmdb UkNTXTsKIAlpbnQgcmV0OwogCi0JaWYgKG92ZXJsYXktPmxhc3RfZmxpcF9yZXEgPT0gMCkKKwlp ZiAob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAotCXJldCA9 IGk5MTVfd2FpdF9zZXFubyhyaW5nLCBvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlyZXQgPSBp OTE1X3dhaXRfc2Vxbm8ocmluZywKKwkJCSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhvdmVy bGF5LT5sYXN0X2ZsaXBfcmVxKSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAlpOTE1X2dl bV9yZXRpcmVfcmVxdWVzdHMoZGV2KTsKQEAgLTM3Nyw3ICszODQsNyBAQCBzdGF0aWMgaW50IGlu dGVsX292ZXJsYXlfcmVjb3Zlcl9mcm9tX2ludGVycnVwdChzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAq b3ZlcmxheSkKIAlpZiAob3ZlcmxheS0+ZmxpcF90YWlsKQogCQlvdmVybGF5LT5mbGlwX3RhaWwo b3ZlcmxheSk7CiAKLQlvdmVybGF5LT5sYXN0X2ZsaXBfcmVxID0gMDsKKwlpOTE1X2dlbV9yZXF1 ZXN0X2Fzc2lnbigmb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSwgTlVMTCk7CiAJcmV0dXJuIDA7CiB9 CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==