From: Dave Gordon Subject: [PATCH v2*] drm/i915: FIFO space query code refactor Date: Thu, 18 Dec 2014 16:48:36 +0000 Message-ID: <1418921316-18119-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B42C6E38F for ; Thu, 18 Dec 2014 08:48:50 -0800 (PST) References: 1418063262-32256-8-git-send-email-mika.kuoppala@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 V2hlbiBxdWVyeWluZyB0aGUgR1RGSUZPQ1RMIHJlZ2lzdGVyIHRvIGNoZWNrIHRoZSBGSUZPIHNw YWNlLCB0aGUgcmVhZCB2YWx1ZQptdXN0IGJlIG1hc2tlZC4gVGhlIG9wZXJhdGlvbiBpcyByZXBl YXRlZCBleHBsaWNpdGx5IGluIHNldmVyYWwgcGxhY2VzLiBUaGlzCmNoYW5nZSByZWZhY3RvcnMg dGhlIHJlYWQtYW5kLW1hc2sgY29kZSBpbnRvIGEgZnVuY3Rpb24gY2FsbC4KCnYyKjogcmViYXNl ZCBvbiB0b3Agb2YgTWlrYSdzIGZvcmNld2FrZSBjaGFuZ2VzCgpDaGFuZ2UtSWQ6IElkMWE5ZjM3 ODVjYjIwYjgyZDRjYWEzMzBjMzdiMzFlNGUzODRhM2VmClNpZ25lZC1vZmYtYnk6IERhdmUgR29y ZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMgfCAgIDE5ICsrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxMiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMKaW5kZXggNWUyYjExZi4uZmMzYmNmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMKQEAgLTIwNSw2ICsyMDUsMTMgQEAgc3RhdGljIHZvaWQgZndfZG9tYWluc19wdXRf d2l0aF9maWZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlnZW42X2d0X2No ZWNrX2ZpZm9kYmcoZGV2X3ByaXYpOwogfQogCitzdGF0aWMgaW5saW5lIHUzMiBmaWZvX2ZyZWVf ZW50cmllcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJdTMyIGNvdW50 ID0gX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYsIEdURklGT0NUTCk7CisKKwlyZXR1cm4gY291 bnQgJiBHVF9GSUZPX0ZSRUVfRU5UUklFU19NQVNLOworfQorCiBzdGF0aWMgaW50IF9fZ2VuNl9n dF93YWl0X2Zvcl9maWZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlp bnQgcmV0ID0gMDsKQEAgLTIxMiwxNiArMjE5LDE1IEBAIHN0YXRpYyBpbnQgX19nZW42X2d0X3dh aXRfZm9yX2ZpZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCS8qIE9uIFZM ViwgRklGTyB3aWxsIGJlIHNoYXJlZCBieSBib3RoIFNXIGFuZCBIVy4KIAkgKiBTbywgd2UgbmVl ZCB0byByZWFkIHRoZSBGUkVFX0VOVFJJRVMgZXZlcnl0aW1lICovCiAJaWYgKElTX1ZBTExFWVZJ RVcoZGV2X3ByaXYtPmRldikpCi0JCWRldl9wcml2LT51bmNvcmUuZmlmb19jb3VudCA9Ci0JCQlf X3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwgR1RGSUZPQ1RMKSAmCi0JCQkJCQlHVF9GSUZPX0ZS RUVfRU5UUklFU19NQVNLOworCQlkZXZfcHJpdi0+dW5jb3JlLmZpZm9fY291bnQgPSBmaWZvX2Zy ZWVfZW50cmllcyhkZXZfcHJpdik7CiAKIAlpZiAoZGV2X3ByaXYtPnVuY29yZS5maWZvX2NvdW50 IDwgR1RfRklGT19OVU1fUkVTRVJWRURfRU5UUklFUykgewogCQlpbnQgbG9vcCA9IDUwMDsKLQkJ dTMyIGZpZm8gPSBfX3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwgR1RGSUZPQ1RMKSAmIEdUX0ZJ Rk9fRlJFRV9FTlRSSUVTX01BU0s7CisJCXUzMiBmaWZvID0gZmlmb19mcmVlX2VudHJpZXMoZGV2 X3ByaXYpOworCiAJCXdoaWxlIChmaWZvIDw9IEdUX0ZJRk9fTlVNX1JFU0VSVkVEX0VOVFJJRVMg JiYgbG9vcC0tKSB7CiAJCQl1ZGVsYXkoMTApOwotCQkJZmlmbyA9IF9fcmF3X2k5MTVfcmVhZDMy KGRldl9wcml2LCBHVEZJRk9DVEwpICYgR1RfRklGT19GUkVFX0VOVFJJRVNfTUFTSzsKKwkJCWZp Zm8gPSBmaWZvX2ZyZWVfZW50cmllcyhkZXZfcHJpdik7CiAJCX0KIAkJaWYgKFdBUk5fT04obG9v cCA8IDAgJiYgZmlmbyA8PSBHVF9GSUZPX05VTV9SRVNFUlZFRF9FTlRSSUVTKSkKIAkJCSsrcmV0 OwpAQCAtMjc3LDggKzI4Myw3IEBAIHZvaWQgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJlc3RvcmUpCiAKIAkJaWYgKElTX0dFTjYoZGV2 KSB8fCBJU19HRU43KGRldikpCiAJCQlkZXZfcHJpdi0+dW5jb3JlLmZpZm9fY291bnQgPQotCQkJ CV9fcmF3X2k5MTVfcmVhZDMyKGRldl9wcml2LCBHVEZJRk9DVEwpICYKLQkJCQlHVF9GSUZPX0ZS RUVfRU5UUklFU19NQVNLOworCQkJCWZpZm9fZnJlZV9lbnRyaWVzKGRldl9wcml2KTsKIAl9CiAK IAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdz KTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==