From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v2] drm/i915: recheck ringspace after wait+retire
Date: Thu, 18 Dec 2014 17:03:41 +0000
Message-ID: <1418922221-18789-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 1D87D89BFF
 for <intel-gfx@lists.freedesktop.org>; Thu, 18 Dec 2014 09:11:22 -0800 (PST)
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SW4ge2ludGVsLGxvZ2ljYWx9X3Jpbmdfd2FpdF9yZXF1ZXN0KCksIHdlIHRyeSB0byBmaW5kIGEg
cmVxdWVzdAp3aG9zZSBjb21wbGV0aW9uIHdpbGwgcmVsZWFzZSB0aGUgYW1vdW50IG9mIHJpbmcg
c3BhY2UgcmVxdWlyZWQuCklmIHdlIGZpbmQgc3VjaCBhIHJlcXVlc3QsIHdlIHdhaXQgZm9yIGl0
LCBhbmQgdGhlbiByZXRpcmUgaXQsIGluCnRoZSBleHBlY3RhdGlvbiB0aGF0IHdlIHdpbGwgbm93
IGhhdmUgYXQgbGVhc3QgdGhlIHJlcXVpcmVkIGFtb3VudApvZiBmcmVlIHNwYWNlIGluIHRoZSBy
aW5nLiBCdXQgaXQncyBnb29kIHRvIGNoZWNrIHRoYXQgdGhpcyBoYXMKYWN0dWFsbHkgaGFwcGVu
ZWQsIHNvIHdlIGNhbiBiYWNrIG91dCB3aXRoIGEgbWVhbmluZ2Z1bCBlcnJvcgpjb2RlIGlmIHNv
bWV0aGluZyB1bmV4cGVjdGVkIGhhcyBoYXBwZW5lZCwgc3VjaCBhcyB3YWl0X3JlcXVlc3QKcmV0
dXJuaW5nIGVhcmx5LgoKVGhpcyBjb2RlIHdhcyBhbHJlYWR5IGluIHRoZSBleGVjbGlzdCB2ZXJz
aW9uLCBzbyB0aGUgY2hhbmdlIHRvCmludGVsX2xyYy5jIGlzIGp1c3QgdG8gYWRkIGEgY29tbWVu
dDsgYnV0IHdlIHdhbnQgdGhlIHNhbWUgY2hlY2sKaW4gdGhlIGxlZ2FjeSByaW5nYnVmZmVyIG1v
ZGUgdG9vLgoKdjI6IHJlYmFzZSB0byBsYXRlc3QgZHJtLWludGVsLW5pZ2h0bHkKClNpZ25lZC1v
ZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAgOSArKysrKysrKysKIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICAgMTIgKysrKysrKysrKystCiAy
IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2xyYy5jCmluZGV4IDkwODY3YjIuLjMyOWNiNWMgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2xyYy5jCkBAIC05NTUsNiArOTU1LDE1IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dh
aXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAogCWk5MTVfZ2Vt
X3JldGlyZV9yZXF1ZXN0c19yaW5nKHJpbmcpOwogCisJLyoKKwkgKiBBY2NvcmRpbmcgdG8gb3Vy
IGNhbGN1bGF0aW9uIGFib3ZlLCByZXRpcmluZyB0aGUgcmVxdWVzdCB3ZSBqdXN0CisJICogd2Fp
dGVkIGZvciBzaG91bGQgaGF2ZSByZXN1bHRlZCBpbiB0aGVyZSBiZWluZyBlbm91Z2ggc3BhY2Ug
aW4KKwkgKiB0aGUgcmluZ2J1ZmZlcjsgYnV0IGxldCdzIGNoZWNrLgorCSAqCisJICogSWYgdGhl
cmUgaXMgbm90IG5vdyBlbm91Z2ggc3BhY2UsIHNvbWV0aGluZyBoYXMgZ29uZSBob3JyaWJseSB3
b3JuZworCSAqIChzdWNoIGFzIHdhaXRfcmVxdWVzdCByZXR1cm5pbmcgZWFybHksIGJ1dCB3aXRo
IG5vIGVycm9yLCBvcgorCSAqIHJldGlyZV9yZXF1ZXN0cyBmYWlsaW5nIHRvIHJldGlyZSB0aGUg
cmVxdWVzdCB3ZSBleHBlY3RlZCBpdCB0bykuCisJICovCiAJcmV0dXJuIGludGVsX3Jpbmdfc3Bh
Y2UocmluZ2J1ZikgPj0gYnl0ZXMgPyAwIDogLUVOT1NQQzsKIH0KIApkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDAxOGEzN2UuLmM5NWJmM2EgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTE5MzIsNiArMTkzMiw3IEBAIHN0YXRp
YyBpbnQgaW50ZWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZywgaW50IG4pCiAJCXJldHVybiAwOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShyZXF1ZXN0LCAm
cmluZy0+cmVxdWVzdF9saXN0LCBsaXN0KSB7CisJCS8qIFdvdWxkIGNvbXBsZXRpb24gb2YgdGhp
cyByZXF1ZXN0IGZyZWUgZW5vdWdoIHNwYWNlPyAqLwogCQlpZiAoX19pbnRlbF9yaW5nX3NwYWNl
KHJlcXVlc3QtPnRhaWwsIHJpbmdidWYtPnRhaWwsCiAJCQkJICAgICAgIHJpbmdidWYtPmVmZmVj
dGl2ZV9zaXplKSA+PSBuKSB7CiAJCQlicmVhazsKQEAgLTE5NDcsNyArMTk0OCwxNiBAQCBzdGF0
aWMgaW50IGludGVsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp
bmcsIGludCBuKQogCiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3JpbmcocmluZyk7CiAKLQly
ZXR1cm4gMDsKKwkvKgorCSAqIEFjY29yZGluZyB0byBvdXIgY2FsY3VsYXRpb24gYWJvdmUsIHJl
dGlyaW5nIHRoZSByZXF1ZXN0IHdlIGp1c3QKKwkgKiB3YWl0ZWQgZm9yIHNob3VsZCBoYXZlIHJl
c3VsdGVkIGluIHRoZXJlIGJlaW5nIGVub3VnaCBzcGFjZSBpbgorCSAqIHRoZSByaW5nYnVmZmVy
OyBidXQgbGV0J3MgY2hlY2suCisJICoKKwkgKiBJZiB0aGVyZSBpcyBub3Qgbm93IGVub3VnaCBz
cGFjZSwgc29tZXRoaW5nIGhhcyBnb25lIGhvcnJpYmx5IHdvcm5nCisJICogKHN1Y2ggYXMgd2Fp
dF9yZXF1ZXN0IHJldHVybmluZyBlYXJseSwgYnV0IHdpdGggbm8gZXJyb3IsIG9yCisJICogcmV0
aXJlX3JlcXVlc3RzIGZhaWxpbmcgdG8gcmV0aXJlIHRoZSByZXF1ZXN0IHdlIGV4cGVjdGVkIGl0
IHRvKS4KKwkgKi8KKwlyZXR1cm4gaW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+PSBuID8gMCA6
IC1FTk9TUEM7CiB9CiAKIHN0YXRpYyBpbnQgcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgbikKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50
ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==