From: Dave Gordon Subject: [PATCH 2/3] drm/i915: recheck ringspace after wait+retire Date: Fri, 12 Dec 2014 16:13:02 +0000 Message-ID: <1418400783-5524-3-git-send-email-david.s.gordon@intel.com> References: <1418400783-5524-1-git-send-email-david.s.gordon@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 269776E9AC for ; Fri, 12 Dec 2014 08:13:28 -0800 (PST) In-Reply-To: <1418400783-5524-1-git-send-email-david.s.gordon@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 SW4ge2ludGVsLGxvZ2ljYWx9X3Jpbmdfd2FpdF9yZXF1ZXN0KCksIHdlIHRyeSB0byBmaW5kIGEg cmVxdWVzdAp3aG9zZSBjb21wbGV0aW9uIHdpbGwgcmVsZWFzZSB0aGUgYW1vdW50IG9mIHJpbmcg c3BhY2UgcmVxdWlyZWQuCklmIHdlIGZpbmQgc3VjaCBhIHJlcXVlc3QsIHdlIHdhaXQgZm9yIGl0 LCBhbmQgdGhlbiByZXRpcmUgaXQsIGluCnRoZSBleHBlY3RhdGlvbiB0aGF0IHdlIHdpbGwgbm93 IGhhdmUgYXQgbGVhc3QgdGhlIHJlcXVpcmVkIGFtb3VudApvZiBmcmVlIHNwYWNlIGluIHRoZSBy aW5nLiBCdXQgaXQncyBnb29kIHRvIGNoZWNrIHRoYXQgdGhpcyBoYXMKYWN0dWFsbHkgaGFwcGVu ZWQsIHNvIHdlIGNhbiBiYWNrIG91dCB3aXRoIGEgbWVhbmluZ2Z1bCBlcnJvcgpjb2RlIGlmIHNv bWV0aGluZyB1bmV4cGVjdGVkIGhhcyBoYXBwZW5lZCwgc3VjaCBhcyB3YWl0X3JlcXVlc3QKcmV0 dXJuaW5nIGVhcmx5LgoKVGhpcyBjb2RlIHdhcyBhbHJlYWR5IGluIHRoZSBleGVjbGlzdCB2ZXJz aW9uLCBzbyB0aGUgY2hhbmdlIHRvCmludGVsX2xyYy5jIGlzIGp1c3QgdG8gYWRkIGEgY29tbWVu dDsgYnV0IHdlIHdhbnQgdGhlIHNhbWUgY2hlY2sKaW4gdGhlIGxlZ2FjeSByaW5nYnVmZmVyIG1v ZGUgdG9vLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgICA5 ICsrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgICAx MiArKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMSBkZWxl dGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggODU0NWRiZC4uNjliMDQyZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTk1Niw2ICs5NTYsMTUgQEAgc3RhdGljIGlu dCBsb2dpY2FsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAogCiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3JpbmcocmluZyk7CiAKKwkvKgorCSAq IEFjY29yZGluZyB0byBvdXIgY2FsY3VsYXRpb24gYWJvdmUsIHJldGlyaW5nIHRoZSByZXF1ZXN0 IHdlIGp1c3QKKwkgKiB3YWl0ZWQgZm9yIHNob3VsZCBoYXZlIHJlc3VsdGVkIGluIHRoZXJlIGJl aW5nIGVub3VnaCBzcGFjZSBpbgorCSAqIHRoZSByaW5nYnVmZmVyOyBidXQgbGV0J3MgY2hlY2su CisJICoKKwkgKiBJZiB0aGVyZSBpcyBub3Qgbm93IGVub3VnaCBzcGFjZSwgc29tZXRoaW5nIGhh cyBnb25lIGhvcnJpYmx5IHdvcm5nCisJICogKHN1Y2ggYXMgd2FpdF9yZXF1ZXN0IHJldHVybmlu ZyBlYXJseSwgYnV0IHdpdGggbm8gZXJyb3IsIG9yCisJICogcmV0aXJlX3JlcXVlc3RzIGZhaWxp bmcgdG8gcmV0aXJlIHRoZSByZXF1ZXN0IHdlIGV4cGVjdGVkIGl0IHRvKS4KKwkgKi8KIAlyZXR1 cm4gaW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+PSBieXRlcyA/IDAgOiAtRU5PU1BDOwogfQog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggOWRlZjgzYy4uNjYw ZDEwZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTkxMiw2 ICsxOTEyLDcgQEAgc3RhdGljIGludCBpbnRlbF9yaW5nX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgbikKIAkJcmV0dXJuIDA7CiAKIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KHJlcXVlc3QsICZyaW5nLT5yZXF1ZXN0X2xpc3QsIGxpc3QpIHsKKwkJLyogV291bGQg Y29tcGxldGlvbiBvZiB0aGlzIHJlcXVlc3QgZnJlZSBlbm91Z2ggc3BhY2U/ICovCiAJCWlmIChf X2ludGVsX3Jpbmdfc3BhY2UocmVxdWVzdC0+dGFpbCwgcmluZ2J1Zi0+dGFpbCwKIAkJCQkgICAg ICAgcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUpID49IG4pIHsKIAkJCWJyZWFrOwpAQCAtMTkyNyw3 ICsxOTI4LDE2IEBAIHN0YXRpYyBpbnQgaW50ZWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZywgaW50IG4pCiAKIAlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNf cmluZyhyaW5nKTsKIAotCXJldHVybiAwOworCS8qCisJICogQWNjb3JkaW5nIHRvIG91ciBjYWxj dWxhdGlvbiBhYm92ZSwgcmV0aXJpbmcgdGhlIHJlcXVlc3Qgd2UganVzdAorCSAqIHdhaXRlZCBm b3Igc2hvdWxkIGhhdmUgcmVzdWx0ZWQgaW4gdGhlcmUgYmVpbmcgZW5vdWdoIHNwYWNlIGluCisJ ICogdGhlIHJpbmdidWZmZXI7IGJ1dCBsZXQncyBjaGVjay4KKwkgKgorCSAqIElmIHRoZXJlIGlz IG5vdCBub3cgZW5vdWdoIHNwYWNlLCBzb21ldGhpbmcgaGFzIGdvbmUgaG9ycmlibHkgd29ybmcK KwkgKiAoc3VjaCBhcyB3YWl0X3JlcXVlc3QgcmV0dXJuaW5nIGVhcmx5LCBidXQgd2l0aCBubyBl cnJvciwgb3IKKwkgKiByZXRpcmVfcmVxdWVzdHMgZmFpbGluZyB0byByZXRpcmUgdGhlIHJlcXVl c3Qgd2UgZXhwZWN0ZWQgaXQgdG8pLgorCSAqLworCXJldHVybiBpbnRlbF9yaW5nX3NwYWNlKHJp bmdidWYpID49IG4gPyAwIDogLUVOT1NQQzsKIH0KIAogc3RhdGljIGludCByaW5nX3dhaXRfZm9y X3NwYWNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQotLSAKMS43LjkuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK