From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v4 1/4] drm/i915: Fix up seqno -> request merge issues Date: Fri, 5 Dec 2014 13:49:33 +0000 Message-ID: <1417787376-17253-2-git-send-email-John.C.Harrison@Intel.com> References: <1416854990-1920-1-git-send-email-John.C.Harrison@Intel.com> <1417787376-17253-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 7F38A6E7EC for ; Fri, 5 Dec 2014 05:49:46 -0800 (PST) In-Reply-To: <1417787376-17253-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBkaXNw bGF5IHJlbGF0ZWQgcGF0Y2hlcyBlYXJsaWVyIGluIHRoaXMgc2VyaWVzIHdlcmUgZWRpdGVkIGR1 cmluZyBtZXJnZSB0bwppbXByb3ZlIHRoZSByZXF1ZXN0IHVucmVmZXJlbmNpbmcuIFNwZWNpZmlj YWxseSwgdGhlIG5lZWQgZm9yIGRlLXJlZmVyZW5jaW5nIGF0CmludGVycnVwdCB0aW1lIHdhcyBy ZW1vdmVkLiBIb3dldmVyLCB0aGUgcmVzdWx0aW5nIGNvZGUgZGlkIGEgJ2RlcmVmKHJlcSkgOyBy ZXEKPSBOVUxMJyBzZXF1ZW5jZSByYXRoZXIgdGhhbiB1c2luZyB0aGUgJ3JlcV9hc3NpZ24ocmVx LCBOVUxMKScgd3JhcHBlci4gVGhlIHR3bwphcmUgZnVuY3Rpb25hbGx5IGVxdWl2YWxlbnQsIGJ1 dCB1c2luZyB0aGUgd3JhcHBlciBpcyBtb3JlIGNvbnNpc3RlbnQgd2l0aCBhbGwKdGhlIG90aGVy IHBsYWNlcyB3aGVyZSByZXF1ZXN0cyBhcmUgYXNzaWduZWQuCgpOb3RlIHRoYXQgdGhlIHdob2xl IHBvaW50IG9mIHRoZSB3cmFwcGVyIGlzIHRoYXQgdXNpbmcgaXQgZXZlcnl3aGVyZSB0aGF0CnJl cXVlc3QgcG9pbnRlcnMgYXJlIGFzc2lnbmVkIG1lYW5zIHRoYXQgdGhlIHJlZmVyZW5jZSBjb3Vu dGluZyBpcyBkb25lCmF1dG9tYXRpY2FsbHkgYW5kIGNhbid0IGJlIGFjY2lkZW50YWxseSBmb3Jn b3R0ZW4gYWJvdXQuIFBsdXMgaXQgYWxsb3dzIHNpbXBsZXIKZnV0dXJlIG1haW50YWluYW5jZSBp ZiB0aGUgcmVmZXJlbmNlIGNvdW50aW5nIG1lY2hhbmlzbXMgZXZlciBuZWVkIHRvIGNoYW5nZS4K CkZvcjogVklaLTQzNzcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJp c29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAgICA2ICsrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOTFmMGMxOS4uNDNk ODAyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtOTEyNyw4ICs5MTI3 LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdW5waW5fd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3Qg Kl9fd29yaykKIAlpbnRlbF91cGRhdGVfZmJjKGRldik7CiAKIAlpZiAod29yay0+ZmxpcF9xdWV1 ZWRfcmVxKQotCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHdvcmstPmZsaXBfcXVldWVk X3JlcSk7Ci0Jd29yay0+ZmxpcF9xdWV1ZWRfcmVxICA9IE5VTEw7CisJCWk5MTVfZ2VtX3JlcXVl c3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsIE5VTEwpOwogCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJaW50ZWxfZnJvbnRidWZmZXJfZmxpcF9jb21wbGV0ZShk ZXYsIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwpAQCAtOTYyNiwxMCArOTYyNSw5 IEBAIHN0YXRpYyB2b2lkIGludGVsX21taW9fZmxpcF93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQogCWludGVsX2RvX21taW9fZmxpcChjcnRjKTsKIAlpZiAobW1pb19mbGlwLT5y ZXEpIHsKIAkJbXV0ZXhfbG9jaygmY3J0Yy0+YmFzZS5kZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWk5 MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UobW1pb19mbGlwLT5yZXEpOworCQlpOTE1X2dlbV9y ZXF1ZXN0X2Fzc2lnbigmbW1pb19mbGlwLT5yZXEsIE5VTEwpOwogCQltdXRleF91bmxvY2soJmNy dGMtPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCX0KLQltbWlvX2ZsaXAtPnJlcSA9IE5VTEw7 CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfcXVldWVfbW1pb19mbGlwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=