From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH] drm/i915: Fix for reserved space WARN_ON when ring begin fails Date: Wed, 13 Jan 2016 12:52:40 +0000 Message-ID: <1452689560-36336-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AF086E77A for ; Wed, 13 Jan 2016 04:52:42 -0800 (PST) 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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSByZXNl cnZlZCBzcGFjZSBjb2RlIHdhcyBub3QgY2xlYW5pbmcgdXAgcHJvcGVybHkgaW4gdGhlIGNhc2Ug d2hlcmUKdGhlIGludGVsX3JpbmdfYmVnaW4oKSBjYWxsIGZhaWxlZC4gVGhpcyBsZWQgdG8gV0FS Tl9PTnMgZmlyaW5nIGFib3V0CmEgZG91YmxlIHJlc2VydmUgY2FsbCB3aGVuIHJ1bm5pbmcgdGhl IGdlbV9yZXNldF9zdGF0cyBJR1QgdGVzdC4KClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24g PEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgICAgICAgIHwgOCArKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIHwgOCArKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMDYxODBk Yy4uN2RjYzI5OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTgzNSw2ICs4MzUsOCBA QCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxLCBpbnQgbnVtX2R3b3JkcykKIAogaW50IGludGVsX2xvZ2ljYWxfcmluZ19yZXNlcnZl X3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKKwlpbnQgcmV0 OworCiAJLyoKIAkgKiBUaGUgZmlyc3QgY2FsbCBtZXJlbHkgbm90ZXMgdGhlIHJlc2VydmUgcmVx dWVzdCBhbmQgaXMgY29tbW9uIGZvcgogCSAqIGFsbCBiYWNrIGVuZHMuIFRoZSBzdWJzZXF1ZW50 IGxvY2FsaXNlZCBfYmVnaW4oKSBjYWxsIGFjdHVhbGx5CkBAIC04NDUsNyArODQ3LDExIEBAIGlu dCBpbnRlbF9sb2dpY2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QpCiAJICovCiAJaW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNlcnZl KHJlcXVlc3QtPnJpbmdidWYsIE1JTl9TUEFDRV9GT1JfQUREX1JFUVVFU1QpOwogCi0JcmV0dXJu IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXF1ZXN0LCAwKTsKKwlyZXQgPSBpbnRlbF9sb2dp Y2FsX3JpbmdfYmVnaW4ocmVxdWVzdCwgMCk7CisJaWYgKHJldCkKKwkJaW50ZWxfcmluZ19yZXNl cnZlZF9zcGFjZV9jYW5jZWwocmVxdWVzdC0+cmluZ2J1Zik7CisKKwlyZXR1cm4gcmV0OwogfQog CiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBjOWIwODFm Li5mMWQzYTRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0y Mjk2LDYgKzIyOTYsOCBAQCBpbnQgaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAKIGludCBpbnRlbF9yaW5nX3Jlc2Vy dmVfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogeworCWludCBy ZXQ7CisKIAkvKgogCSAqIFRoZSBmaXJzdCBjYWxsIG1lcmVseSBub3RlcyB0aGUgcmVzZXJ2ZSBy ZXF1ZXN0IGFuZCBpcyBjb21tb24gZm9yCiAJICogYWxsIGJhY2sgZW5kcy4gVGhlIHN1YnNlcXVl bnQgbG9jYWxpc2VkIF9iZWdpbigpIGNhbGwgYWN0dWFsbHkKQEAgLTIzMDYsNyArMjMwOCwxMSBA QCBpbnQgaW50ZWxfcmluZ19yZXNlcnZlX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCkKIAkgKi8KIAlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX3Jlc2VydmUocmVx dWVzdC0+cmluZ2J1ZiwgTUlOX1NQQUNFX0ZPUl9BRERfUkVRVUVTVCk7CiAKLQlyZXR1cm4gaW50 ZWxfcmluZ19iZWdpbihyZXF1ZXN0LCAwKTsKKwlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcXVl c3QsIDApOworCWlmIChyZXQpCisJCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2FuY2VsKHJl cXVlc3QtPnJpbmdidWYpOworCisJcmV0dXJuIHJldDsKIH0KIAogdm9pZCBpbnRlbF9yaW5nX3Jl c2VydmVkX3NwYWNlX3Jlc2VydmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGlu dCBzaXplKQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==