From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 55/59] drm/i915: Remove fallback poll for ring buffer space Date: Thu, 19 Mar 2015 12:31:00 +0000 Message-ID: <1426768264-16996-56-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 BDDED6EA3B for ; Thu, 19 Mar 2015 05:32:14 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCldoZW4gdGhl IHJpbmcgYnVmZmVyIGlzIGZ1bGwsIHRoZSBkcml2ZXIgZmluZHMgYW4gb3V0c3RhbmRpbmcgcmVx dWVzdCB0aGF0IHdpbGwKZnJlZSB1cCBzdWZmaWNpZW50IHNwYWNlIGZvciB0aGUgY3VycmVudCBv cGVyYXRpb24gYW5kIHdhaXRzIGZvciBpdCB0byBjb21wbGV0ZS4KSWYgbm8gc3VjaCByZXF1ZXN0 IGNhbiBiZSBmb3VuZCwgdGhlcmUgaXMgYSBmYWxsIGJhY2sgcGF0aCBvZiBqdXN0IHBvbGxpbmcg dW50aWwKc3VmZmljaWVudCBzcGFjZSBpcyBhdmFpbGFibGUuCgpUaGlzIHBhdGggc2hvdWxkIG5v dCBiZSByZXF1aXJlZCBhbnkgbW9yZS4gSXQgaXMgYSBoYW5nb3ZlciBmcm9tIHRoZSBiYWQgZGF5 cyBvZgpPTFIgc3VjaCB0aGF0IGl0IHdhcyBwb3NzaWJsZSBmb3IgdGhlIHJpbmcgdG8gYmUgY29t cGxldGVseSBmaWxsZWQgd2l0aG91dCBldmVyCmhhdmluZyBzdWJtaXR0ZWQgYSByZXF1ZXN0LiBU aGlzIGNhbiBubyBsb25nZXIgaGFwcGVuIGFzIHJlcXVlc3RzIGFyZSBub3cKc3VibWl0dGVkIGlu IGEgdGltZWx5IG1hbm5lci4gSGVuY2UgdGhlIGVudGlyZSBwb2xsaW5nIHBhdGggaXMgb2Jzb2xl dGUuIEFzIGl0CmFsc28gY2F1c2VzIGhlYWRhY2hlcyBpbiBMUkMgbGFuZCBkdWUgdG8gbmVzdGlu ZyBmYWtlZCByZXF1ZXN0cywgaXQgaXMgYmVpbmcKcmVtb3ZlZCBlbnRpcmVseS4KCkZvcjogVkla LTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgIDY1 ICsrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYyB8ICAgNjIgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTE0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNjBiY2Y5YS4uZjIxZjQ0OSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKQEAgLTYyMiw4ICs2MjIsOSBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2Fs bG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdAog CXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkJICAgICBpbnQgYnl0ZXMpCitzdGF0 aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZiwKKwkJCQkgICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkg ICAgICAgaW50IGJ5dGVzKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5n YnVmLT5yaW5nOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKQEAgLTY1 Miw4ICs2NTMsMTEgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQkJYnJlYWs7CiAJfQogCi0JaWYgKCZyZXF1 ZXN0LT5saXN0ID09ICZyaW5nLT5yZXF1ZXN0X2xpc3QpCisJLyogSXQgc2hvdWxkIGFsd2F5cyBi ZSBwb3NzaWJsZSB0byBmaW5kIGEgc3VpdGFibGUgcmVxdWVzdCEgKi8KKwlpZiAoJnJlcXVlc3Qt Pmxpc3QgPT0gJnJpbmctPnJlcXVlc3RfbGlzdCkgeworCQlXQVJOX09OKHRydWUpOwogCQlyZXR1 cm4gLUVOT1NQQzsKKwl9CiAKIAlyZXQgPSBpOTE1X3dhaXRfcmVxdWVzdChyZXF1ZXN0KTsKIAlp ZiAocmV0KQpAQCAtNjYzLDcgKzY2Nyw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRf cmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAogCVdBUk5fT04oaW50 ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA8IG5ld19zcGFjZSk7CiAKLQlyZXR1cm4gaW50ZWxfcmlu Z19zcGFjZShyaW5nYnVmKSA+PSBieXRlcyA/IDAgOiAtRU5PU1BDOworCXJldHVybiAwOwogfQog CiAvKgpAQCAtNjkwLDU5ICs2OTQsNiBAQCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRf c3VibWl0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCWV4ZWNsaXN0c19jb250 ZXh0X3F1ZXVlKHJpbmcsIGN0eCwgcmluZ2J1Zi0+dGFpbCwgcmVxdWVzdCk7CiB9CiAKLXN0YXRp YyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLAotCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJCSAg ICAgICBpbnQgYnl0ZXMpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdi dWYtPnJpbmc7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXVuc2lnbmVk IGxvbmcgZW5kOwotCWludCByZXQ7Ci0KLQkvKiBUaGUgd2hvbGUgcG9pbnQgb2YgcmVzZXJ2aW5n IHNwYWNlIGlzIHRvIG5vdCB3YWl0ISAqLwotCVdBUk5fT04ocmluZ2J1Zi0+cmVzZXJ2ZWRfaW5f dXNlKTsKLQotCXJldCA9IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3QocmluZ2J1ZiwgYnl0ZXMp OwotCWlmIChyZXQgIT0gLUVOT1NQQykKLQkJcmV0dXJuIHJldDsKLQotCS8qIEZvcmNlIHRoZSBj b250ZXh0IHN1Ym1pc3Npb24gaW4gY2FzZSB3ZSBoYXZlIGJlZW4gc2tpcHBpbmcgaXQgKi8KLQlp bnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHJpbmdidWYsIGN0eCwgTlVMTCk7 Ci0KLQkvKiBXaXRoIEdFTSB0aGUgaGFuZ2NoZWNrIHRpbWVyIHNob3VsZCBraWNrIHVzIG91dCBv ZiB0aGUgbG9vcCwKLQkgKiBsZWF2aW5nIGl0IGVhcmx5IHJ1bnMgdGhlIHJpc2sgb2YgY29ycnVw dGluZyBHRU0gc3RhdGUgKGR1ZQotCSAqIHRvIHJ1bm5pbmcgb24gYWxtb3N0IHVudGVzdGVkIGNv ZGVwYXRocykuIEJ1dCBvbiByZXN1bWUKLQkgKiB0aW1lcnMgZG9uJ3Qgd29yayB5ZXQsIHNvIHBy ZXZlbnQgYSBjb21wbGV0ZSBoYW5nIGluIHRoYXQKLQkgKiBjYXNlIGJ5IGNob29zaW5nIGFuIGlu c2FuZWx5IGxhcmdlIHRpbWVvdXQuICovCi0JZW5kID0gamlmZmllcyArIDYwICogSFo7Ci0KLQly ZXQgPSAwOwotCWRvIHsKLQkJaWYgKGludGVsX3Jpbmdfc3BhY2UocmluZ2J1ZikgPj0gYnl0ZXMp Ci0JCQlicmVhazsKLQotCQltc2xlZXAoMSk7Ci0KLQkJaWYgKGRldl9wcml2LT5tbS5pbnRlcnJ1 cHRpYmxlICYmIHNpZ25hbF9wZW5kaW5nKGN1cnJlbnQpKSB7Ci0JCQlyZXQgPSAtRVJFU1RBUlRT WVM7Ci0JCQlicmVhazsKLQkJfQotCi0JCXJldCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZf cHJpdi0+Z3B1X2Vycm9yLAotCQkJCQkgICBkZXZfcHJpdi0+bW0uaW50ZXJydXB0aWJsZSk7Ci0J CWlmIChyZXQpCi0JCQlicmVhazsKLQotCQlpZiAodGltZV9hZnRlcihqaWZmaWVzLCBlbmQpKSB7 Ci0JCQlyZXQgPSAtRUJVU1k7Ci0JCQlicmVhazsKLQkJfQotCX0gd2hpbGUgKDEpOwotCi0JcmV0 dXJuIHJldDsKLX0KLQogc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQkJICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggYzU3 NTJjNC4uNjA5OWZjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpA QCAtMjA2Myw3ICsyMDYzLDcgQEAgdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmluZy0+YnVmZmVyID0gTlVMTDsKIH0KIAotc3Rh dGljIGludCBpbnRlbF9yaW5nX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLCBpbnQgbikKK3N0YXRpYyBpbnQgcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLCBpbnQgbikKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZiA9IHJpbmctPmJ1ZmZlcjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3Q7CkBAIC0yMDgyLDggKzIwODIsMTEgQEAgc3RhdGljIGludCBpbnRlbF9yaW5nX3dhaXRfcmVx dWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgbikKIAkJCWJyZWFrOwogCX0K IAotCWlmICgmcmVxdWVzdC0+bGlzdCA9PSAmcmluZy0+cmVxdWVzdF9saXN0KQorCS8qIEl0IHNo b3VsZCBhbHdheXMgYmUgcG9zc2libGUgdG8gZmluZCBhIHN1aXRhYmxlIHJlcXVlc3QhICovCisJ aWYgKCZyZXF1ZXN0LT5saXN0ID09ICZyaW5nLT5yZXF1ZXN0X2xpc3QpIHsKKwkJV0FSTl9PTih0 cnVlKTsKIAkJcmV0dXJuIC1FTk9TUEM7CisJfQogCiAJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3Qo cmVxdWVzdCk7CiAJaWYgKHJldCkKQEAgLTIwOTYsNjEgKzIwOTksNiBAQCBzdGF0aWMgaW50IGlu dGVsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBu KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IHJpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IG4pCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHJpbmctPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+ YnVmZmVyOwotCXVuc2lnbmVkIGxvbmcgZW5kOwotCWludCByZXQ7Ci0KLQkvKiBUaGUgd2hvbGUg cG9pbnQgb2YgcmVzZXJ2aW5nIHNwYWNlIGlzIHRvIG5vdCB3YWl0ISAqLwotCVdBUk5fT04ocmlu Z2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKTsKLQotCXJldCA9IGludGVsX3Jpbmdfd2FpdF9yZXF1ZXN0 KHJpbmcsIG4pOwotCWlmIChyZXQgIT0gLUVOT1NQQykKLQkJcmV0dXJuIHJldDsKLQotCS8qIGZv cmNlIHRoZSB0YWlsIHdyaXRlIGluIGNhc2Ugd2UgaGF2ZSBiZWVuIHNraXBwaW5nIHRoZW0gKi8K LQlfX2ludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKLQotCS8qIFdpdGggR0VNIHRoZSBoYW5nY2hl Y2sgdGltZXIgc2hvdWxkIGtpY2sgdXMgb3V0IG9mIHRoZSBsb29wLAotCSAqIGxlYXZpbmcgaXQg ZWFybHkgcnVucyB0aGUgcmlzayBvZiBjb3JydXB0aW5nIEdFTSBzdGF0ZSAoZHVlCi0JICogdG8g cnVubmluZyBvbiBhbG1vc3QgdW50ZXN0ZWQgY29kZXBhdGhzKS4gQnV0IG9uIHJlc3VtZQotCSAq IHRpbWVycyBkb24ndCB3b3JrIHlldCwgc28gcHJldmVudCBhIGNvbXBsZXRlIGhhbmcgaW4gdGhh dAotCSAqIGNhc2UgYnkgY2hvb3NpbmcgYW4gaW5zYW5lbHkgbGFyZ2UgdGltZW91dC4gKi8KLQll bmQgPSBqaWZmaWVzICsgNjAgKiBIWjsKLQotCXJldCA9IDA7Ci0JdHJhY2VfaTkxNV9yaW5nX3dh aXRfYmVnaW4ocmluZyk7Ci0JZG8gewotCQlpZiAoaW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+ PSBuKQotCQkJYnJlYWs7Ci0JCXJpbmdidWYtPmhlYWQgPSBJOTE1X1JFQURfSEVBRChyaW5nKTsK LQkJaWYgKGludGVsX3Jpbmdfc3BhY2UocmluZ2J1ZikgPj0gbikKLQkJCWJyZWFrOwotCi0JCW1z bGVlcCgxKTsKLQotCQlpZiAoZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUgJiYgc2lnbmFsX3Bl bmRpbmcoY3VycmVudCkpIHsKLQkJCXJldCA9IC1FUkVTVEFSVFNZUzsKLQkJCWJyZWFrOwotCQl9 Ci0KLQkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3IsCi0J CQkJCSAgIGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKLQkJaWYgKHJldCkKLQkJCWJyZWFr OwotCi0JCWlmICh0aW1lX2FmdGVyKGppZmZpZXMsIGVuZCkpIHsKLQkJCXJldCA9IC1FQlVTWTsK LQkJCWJyZWFrOwotCQl9Ci0JfSB3aGlsZSAoMSk7Ci0JdHJhY2VfaTkxNV9yaW5nX3dhaXRfZW5k KHJpbmcpOwotCXJldHVybiByZXQ7Ci19Ci0KIHN0YXRpYyBpbnQgaW50ZWxfd3JhcF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXVpbnQzMl90IF9faW9tZW0g KnZpcnQ7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=