From: Dave Gordon Subject: [PATCH v2] drm/i915: FIFO space query code refactor Date: Thu, 18 Dec 2014 16:45:41 +0000 Message-ID: <1418921141-18035-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B26789B70 for ; Thu, 18 Dec 2014 08:55:04 -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 V2hlbiBxdWVyeWluZyB0aGUgR1RGSUZPQ1RMIHJlZ2lzdGVyIHRvIGNoZWNrIHRoZSBGSUZPIHNw YWNlLCB0aGUgcmVhZCB2YWx1ZQptdXN0IGJlIG1hc2tlZC4gVGhlIG9wZXJhdGlvbiBpcyByZXBl YXRlZCBleHBsaWNpdGx5IGluIHNldmVyYWwgcGxhY2VzLiBUaGlzCmNoYW5nZSByZWZhY3RvcnMg dGhlIHJlYWQtYW5kLW1hc2sgY29kZSBpbnRvIGEgZnVuY3Rpb24gY2FsbC4KCnYyOiByZWJhc2Ug dG8gbGF0ZXN0IGRybS1pbnRlbC1uaWdodGx5CgpDaGFuZ2UtSWQ6IElkMWE5ZjM3ODVjYjIwYjgy ZDRjYWEzMzBjMzdiMzFlNGUzODRhM2VmClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZp ZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5j b3JlLmMgfCAgIDE5ICsrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNl cnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK aW5kZXggZTk1NjFkZS4uZDI5YjRkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK QEAgLTE0Nyw2ICsxNDcsMTMgQEAgc3RhdGljIHZvaWQgX19nZW43X2d0X2ZvcmNlX3dha2VfbXRf cHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZ2VuNl9ndF9jaGVja19m aWZvZGJnKGRldl9wcml2KTsKIH0KIAorc3RhdGljIGlubGluZSB1MzIgZmlmb19mcmVlX2VudHJp ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXUzMiBjb3VudCA9IF9f cmF3X2k5MTVfcmVhZDMyKGRldl9wcml2LCBHVEZJRk9DVEwpOworCisJcmV0dXJuIGNvdW50ICYg R1RfRklGT19GUkVFX0VOVFJJRVNfTUFTSzsKK30KKwogc3RhdGljIGludCBfX2dlbjZfZ3Rfd2Fp dF9mb3JfZmlmbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IHJl dCA9IDA7CkBAIC0xNTQsMTYgKzE2MSwxNSBAQCBzdGF0aWMgaW50IF9fZ2VuNl9ndF93YWl0X2Zv cl9maWZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkvKiBPbiBWTFYsIEZJ Rk8gd2lsbCBiZSBzaGFyZWQgYnkgYm90aCBTVyBhbmQgSFcuCiAJICogU28sIHdlIG5lZWQgdG8g cmVhZCB0aGUgRlJFRV9FTlRSSUVTIGV2ZXJ5dGltZSAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2LT5kZXYpKQotCQlkZXZfcHJpdi0+dW5jb3JlLmZpZm9fY291bnQgPQotCQkJX19yYXdf aTkxNV9yZWFkMzIoZGV2X3ByaXYsIEdURklGT0NUTCkgJgotCQkJCQkJR1RfRklGT19GUkVFX0VO VFJJRVNfTUFTSzsKKwkJZGV2X3ByaXYtPnVuY29yZS5maWZvX2NvdW50ID0gZmlmb19mcmVlX2Vu dHJpZXMoZGV2X3ByaXYpOwogCiAJaWYgKGRldl9wcml2LT51bmNvcmUuZmlmb19jb3VudCA8IEdU X0ZJRk9fTlVNX1JFU0VSVkVEX0VOVFJJRVMpIHsKIAkJaW50IGxvb3AgPSA1MDA7Ci0JCXUzMiBm aWZvID0gX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYsIEdURklGT0NUTCkgJiBHVF9GSUZPX0ZS RUVfRU5UUklFU19NQVNLOworCQl1MzIgZmlmbyA9IGZpZm9fZnJlZV9lbnRyaWVzKGRldl9wcml2 KTsKKwogCQl3aGlsZSAoZmlmbyA8PSBHVF9GSUZPX05VTV9SRVNFUlZFRF9FTlRSSUVTICYmIGxv b3AtLSkgewogCQkJdWRlbGF5KDEwKTsKLQkJCWZpZm8gPSBfX3Jhd19pOTE1X3JlYWQzMihkZXZf cHJpdiwgR1RGSUZPQ1RMKSAmIEdUX0ZJRk9fRlJFRV9FTlRSSUVTX01BU0s7CisJCQlmaWZvID0g Zmlmb19mcmVlX2VudHJpZXMoZGV2X3ByaXYpOwogCQl9CiAJCWlmIChXQVJOX09OKGxvb3AgPCAw ICYmIGZpZm8gPD0gR1RfRklGT19OVU1fUkVTRVJWRURfRU5UUklFUykpCiAJCQkrK3JldDsKQEAg LTUwNSw4ICs1MTEsNyBAQCB2b2lkIGludGVsX3VuY29yZV9mb3JjZXdha2VfcmVzZXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgYm9vbCByZXN0b3JlKQogCiAJCWlmIChJU19HRU42KGRldikgfHwg SVNfR0VONyhkZXYpKQogCQkJZGV2X3ByaXYtPnVuY29yZS5maWZvX2NvdW50ID0KLQkJCQlfX3Jh d19pOTE1X3JlYWQzMihkZXZfcHJpdiwgR1RGSUZPQ1RMKSAmCi0JCQkJR1RfRklGT19GUkVFX0VO VFJJRVNfTUFTSzsKKwkJCQlmaWZvX2ZyZWVfZW50cmllcyhkZXZfcHJpdik7CiAJfQogCiAJc3Bp bl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7Ci0t IAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=