From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 10/29] drm/i915: Convert 'last_flip_req' to be a request not a seqno Date: Thu, 30 Oct 2014 18:41:02 +0000 Message-ID: <1414694481-15724-11-git-send-email-John.C.Harrison@Intel.com> References: <1414694481-15724-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DA936E55C for ; Thu, 30 Oct 2014 11:41:35 -0700 (PDT) In-Reply-To: <1414694481-15724-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 LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyB8ICAgMTkgKysrKysrKysr KystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCmluZGV4IGRjMmY0ZjIuLmU2Y2Rh N2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKQEAgLTE4Miw3ICsxODIsNyBA QCBzdHJ1Y3QgaW50ZWxfb3ZlcmxheSB7CiAJdTMyIGZsaXBfYWRkcjsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqcmVnX2JvOwogCS8qIGZsaXAgaGFuZGxpbmcgKi8KLQl1aW50MzJfdCBs YXN0X2ZsaXBfcmVxOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqbGFzdF9mbGlwX3Jl cTsKIAl2b2lkICgqZmxpcF90YWlsKShzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqKTsKIH07CiAKQEAg LTIxNywxNyArMjE3LDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9kb193YWl0X3JlcXVl c3Qoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXksCiAJaW50IHJldDsKIAogCUJVR19PTihv dmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKLQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsICZv dmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb3Zlcmxh eS0+bGFzdF9mbGlwX3JlcSwgcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKKwlyZXQg PSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7 CiAKIAlvdmVybGF5LT5mbGlwX3RhaWwgPSB0YWlsOwotCXJldCA9IGk5MTVfd2FpdF9zZXFubyhy aW5nLCBvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKKwlyZXQgPSBpOTE1X3dhaXRfc2Vxbm8ocmlu ZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSkpOwog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKGRldik7 CiAKLQlvdmVybGF5LT5sYXN0X2ZsaXBfcmVxID0gMDsKKwlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2ln bigmb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSwgTlVMTCk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTI4 Niw3ICsyODcsOSBAQCBzdGF0aWMgaW50IGludGVsX292ZXJsYXlfY29udGludWUoc3RydWN0IGlu dGVsX292ZXJsYXkgKm92ZXJsYXksCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIGZsaXBfYWRkcik7 CiAJaW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwogCi0JcmV0dXJuIGk5MTVfYWRkX3JlcXVlc3Qo cmluZywgJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEpOworCVdBUk5fT04ob3ZlcmxheS0+bGFzdF9m bGlwX3JlcSk7CisJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJm92ZXJsYXktPmxhc3RfZmxpcF9y ZXEsIHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7CisJcmV0dXJuIGk5MTVfYWRkX3Jl cXVlc3QocmluZywgTlVMTCk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX292ZXJsYXlfcmVsZWFz ZV9vbGRfdmlkX3RhaWwoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXkpCkBAIC0zNjYsMTAg KzM2OSwxMCBAQCBzdGF0aWMgaW50IGludGVsX292ZXJsYXlfcmVjb3Zlcl9mcm9tX2ludGVycnVw dChzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSkKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nID0gJmRldl9wcml2LT5yaW5nW1JDU107CiAJaW50IHJldDsKIAotCWlmIChvdmVybGF5 LT5sYXN0X2ZsaXBfcmVxID09IDApCisJaWYgKG92ZXJsYXktPmxhc3RfZmxpcF9yZXEgPT0gTlVM TCkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBpOTE1X3dhaXRfc2Vxbm8ocmluZywgb3ZlcmxheS0+ bGFzdF9mbGlwX3JlcSk7CisJcmV0ID0gaTkxNV93YWl0X3NlcW5vKHJpbmcsIGk5MTVfZ2VtX3Jl cXVlc3RfZ2V0X3NlcW5vKG92ZXJsYXktPmxhc3RfZmxpcF9yZXEpKTsKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwogCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhkZXYpOwpAQCAtMzc3LDcgKzM4 MCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9yZWNvdmVyX2Zyb21faW50ZXJydXB0KHN0 cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5KQogCWlmIChvdmVybGF5LT5mbGlwX3RhaWwpCiAJ CW92ZXJsYXktPmZsaXBfdGFpbChvdmVybGF5KTsKIAotCW92ZXJsYXktPmxhc3RfZmxpcF9yZXEg PSAwOworCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvdmVybGF5LT5sYXN0X2ZsaXBfcmVxLCBO VUxMKTsKIAlyZXR1cm4gMDsKIH0KIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK