From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 04/59] drm/i915: Fix for ringbuf space wait in LRC mode Date: Thu, 19 Mar 2015 12:30:09 +0000 Message-ID: <1426768264-16996-5-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 314BF6EA01 for ; Thu, 19 Mar 2015 05:31:11 -0700 (PDT) In-Reply-To: <1426768264-16996-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBsZWdh Y3kgYW5kIExSQyBjb2RlIHBhdGhzIGhhdmUgYW4gYWxtb3N0IGlkZW50aWNhbCBwcm9jZWR1cmUg Zm9yIHdhaXRpbmcgZm9yCnNwYWNlIGluIHRoZSByaW5nIGJ1ZmZlci4gVGhleSBib3RoIHNlYXJj aCBmb3IgYSByZXF1ZXN0IGluIHRoZSBmcmVlIGxpc3QgdGhhdAp3aWxsIGFkdmFuY2UgdGhlIHRh aWwgdG8gYSBwb2ludCB3aGVyZSBzdWZmaWNpZW50IHNwYWNlIGlzIGF2YWlsYWJsZS4gVGhleSB0 aGVuCndhaXQgZm9yIHRoYXQgcmVxdWVzdCwgcmV0aXJlIGl0IGFuZCByZWNhbGN1bGF0ZSB0aGUg ZnJlZSBzcGFjZSB2YWx1ZS4KClVuZm9ydHVuYXRlbHksIGEgYnVnIGluIHRoZSBMUkMgc2lkZSBt ZWFudCB0aGF0IHRoZSByZXN1bHRpbmcgZnJlZSBzcGFjZSBtaWdodApub3QgYmUgYXMgbGFyZ2Ug YXMgZXhwZWN0ZWQgYW5kIGluZGVlZCwgbWlnaHQgbm90IGJlIHN1ZmZpY2llbnQuIFRoaXMgaXMg YmVjYXVzZQppdCB3YXMgdGVzdGluZyBhZ2FpbnN0IHRoZSB2YWx1ZSBvZiByZXF1ZXN0LT50YWls IG5vdCByZXF1ZXN0LT5wb3N0Zml4LiBXaGVyZWFzLAp3aGVuIGEgcmVxdWVzdCBpcyByZXRpcmVk LCByaW5nYnVmLT50YWlsIGlzIHVwZGF0ZWQgdG8gcmVxLT5wb3N0Zml4IG5vdApyZXEtPnRhaWwu CgpBbm90aGVyIHNpZ25pZmljYW50IGRpZmZlcmVuY2UgYmV0d2VlbiB0aGUgdHdvIGlzIHRoYXQg dGhlIExSQyBvbmUgZGlkIG5vdCB0cnVzdAp0aGUgd2FpdCBmb3IgcmVxdWVzdCB0byB3b3JrISBJ dCByZWRpZCB0aGUgaXMgdGhlcmUgZW5vdWdoIHNwYWNlIGF2YWlsYWJsZSB0ZXN0CmFuZCB3b3Vs ZCBmYWlsIHRoZSBjYWxsIGlmIGluc3VmZmljaWVudC4gV2hlcmVhcywgdGhlIGxlZ2FjeSB2ZXJz aW9uIGp1c3Qgc2FpZAoncmV0dXJuIDAnIC0gaXQgYXNzdW1lZCB0aGUgcHJlY2VlZGluZyBjb2Rl IHdvcmtzLiBUaGlzIGRpZmZlcmVuY2UgbWVhbnQgdGhhdAp0aGUgTFJDIHZlcnNpb24gc3RpbGwg d29ya2VkIGV2ZW4gd2l0aCB0aGUgYnVnIC0gaXQganVzdCBmZWxsIGJhY2sgdG8gdGhlCnBvbGxp bmcgd2FpdCBwYXRoLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29u IDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICB8ICAgMTAgKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jIHwgICAxMCArKysrKystLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEy IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpp bmRleCA2NTA0Njg5Li4xYzM4MzRmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTYz NCw3ICs2MzQsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZyA9IHJpbmdidWYtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0OwotCWludCByZXQ7CisJaW50IHJldCwgbmV3X3NwYWNlOwogCiAJaWYgKGludGVsX3Jpbmdf c3BhY2UocmluZ2J1ZikgPj0gYnl0ZXMpCiAJCXJldHVybiAwOwpAQCAtNjUwLDEwICs2NTAsMTAg QEAgc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLAogCQkJY29udGludWU7CiAKIAkJLyogV291bGQgY29tcGxldGlvbiBv ZiB0aGlzIHJlcXVlc3QgZnJlZSBlbm91Z2ggc3BhY2U/ICovCi0JCWlmIChfX2ludGVsX3Jpbmdf c3BhY2UocmVxdWVzdC0+dGFpbCwgcmluZ2J1Zi0+dGFpbCwKLQkJCQkgICAgICAgcmluZ2J1Zi0+ c2l6ZSkgPj0gYnl0ZXMpIHsKKwkJbmV3X3NwYWNlID0gX19pbnRlbF9yaW5nX3NwYWNlKHJlcXVl c3QtPnBvc3RmaXgsIHJpbmdidWYtPnRhaWwsCisJCQkJICAgICAgIHJpbmdidWYtPnNpemUpOwor CQlpZiAobmV3X3NwYWNlID49IGJ5dGVzKQogCQkJYnJlYWs7Ci0JCX0KIAl9CiAKIAlpZiAoJnJl cXVlc3QtPmxpc3QgPT0gJnJpbmctPnJlcXVlc3RfbGlzdCkKQEAgLTY2NSw2ICs2NjUsOCBAQCBz dGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYsCiAKIAlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhyaW5nKTsKIAor CVdBUk5fT04oaW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA8IG5ld19zcGFjZSk7CisKIAlyZXR1 cm4gaW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+PSBieXRlcyA/IDAgOiAtRU5PU1BDOwogfQog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggOTlmYjJmMC4uYTI2 YmRmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjA1OSwx NiArMjA1OSwxNiBAQCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQogewogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmID0gcmluZy0+YnVmZmVyOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdDsKLQlpbnQgcmV0OworCWludCByZXQsIG5ld19zcGFjZTsKIAogCWlmIChpbnRlbF9y aW5nX3NwYWNlKHJpbmdidWYpID49IG4pCiAJCXJldHVybiAwOwogCiAJbGlzdF9mb3JfZWFjaF9l bnRyeShyZXF1ZXN0LCAmcmluZy0+cmVxdWVzdF9saXN0LCBsaXN0KSB7Ci0JCWlmIChfX2ludGVs X3Jpbmdfc3BhY2UocmVxdWVzdC0+cG9zdGZpeCwgcmluZ2J1Zi0+dGFpbCwKLQkJCQkgICAgICAg cmluZ2J1Zi0+c2l6ZSkgPj0gbikgeworCQluZXdfc3BhY2UgPSBfX2ludGVsX3Jpbmdfc3BhY2Uo cmVxdWVzdC0+cG9zdGZpeCwgcmluZ2J1Zi0+dGFpbCwKKwkJCQkgICAgICAgcmluZ2J1Zi0+c2l6 ZSk7CisJCWlmIChuZXdfc3BhY2UgPj0gbikKIAkJCWJyZWFrOwotCQl9CiAJfQogCiAJaWYgKCZy ZXF1ZXN0LT5saXN0ID09ICZyaW5nLT5yZXF1ZXN0X2xpc3QpCkBAIC0yMDgwLDYgKzIwODAsOCBA QCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsIGludCBuKQogCiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3JpbmcocmluZyk7 CiAKKwlXQVJOX09OKGludGVsX3Jpbmdfc3BhY2UocmluZ2J1ZikgPCBuZXdfc3BhY2UpOworCiAJ cmV0dXJuIDA7CiB9CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==