From: Dave Gordon Subject: [PATCH v2] drm/i915: FIFO space query code refactor Date: Wed, 10 Dec 2014 18:12:12 +0000 Message-ID: <1418235132-23601-1-git-send-email-david.s.gordon@intel.com> References: <20141210104129.GP27182@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 017B76E3C1 for ; Wed, 10 Dec 2014 10:13:30 -0800 (PST) In-Reply-To: <20141210104129.GP27182@phenom.ffwll.local> In-Reply-To: 20141210104129.GP27182@phenom.ffwll.local References: <1418129953-1505-1-git-send-email-John.C.Harrison@Intel.com> <1418129953-1505-5-git-send-email-John.C.Harrison@Intel.com> References: <874mt5hru2.fsf@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 dGhlIHJlYWQtYW5kLW1hc2sgY29kZSBpbnRvIGEgZnVuY3Rpb24gY2FsbC4KCnYyOiByZWJhc2Vk IG9uIHRvcCBvZiBNaWthJ3MgZm9yY2V3YWtlIHBhdGNoIHNldCwgc3BlY2lmaWNhbGx5OgoJW1BB VENIIDgvOF0gZHJtL2k5MTU6IEVudW0gZm9yY2V3YWtlIGRvbWFpbnMgYW5kIGRvbWFpbiBpZGVu dGlmaWVycwoKQ2hhbmdlLUlkOiBJZDFhOWYzNzg1Y2IyMGI4MmQ0Y2FhMzMwYzM3YjMxZTRlMzg0 YTNlZgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgICAxOSArKysrKysr KysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDY2MzY1ZTcuLmEwMzMx YTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0yMDUsNiArMjA1LDEzIEBA IHN0YXRpYyB2b2lkIGZ3X2RvbWFpbnNfcHV0X3dpdGhfZmlmbyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJZ2VuNl9ndF9jaGVja19maWZvZGJnKGRldl9wcml2KTsKIH0KIAor c3RhdGljIGlubGluZSB1MzIgZmlmb19mcmVlX2VudHJpZXMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQoreworCXUzMiBjb3VudCA9IF9fcmF3X2k5MTVfcmVhZDMyKGRldl9wcml2 LCBHVEZJRk9DVEwpOworCisJcmV0dXJuIGNvdW50ICYgR1RfRklGT19GUkVFX0VOVFJJRVNfTUFT SzsKK30KKwogc3RhdGljIGludCBfX2dlbjZfZ3Rfd2FpdF9mb3JfZmlmbyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IHJldCA9IDA7CkBAIC0yMTIsMTYgKzIxOSwx NSBAQCBzdGF0aWMgaW50IF9fZ2VuNl9ndF93YWl0X2Zvcl9maWZvKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkvKiBPbiBWTFYsIEZJRk8gd2lsbCBiZSBzaGFyZWQgYnkgYm90 aCBTVyBhbmQgSFcuCiAJICogU28sIHdlIG5lZWQgdG8gcmVhZCB0aGUgRlJFRV9FTlRSSUVTIGV2 ZXJ5dGltZSAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2LT5kZXYpKQotCQlkZXZfcHJp di0+dW5jb3JlLmZpZm9fY291bnQgPQotCQkJX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYsIEdU RklGT0NUTCkgJgotCQkJCQkJR1RfRklGT19GUkVFX0VOVFJJRVNfTUFTSzsKKwkJZGV2X3ByaXYt PnVuY29yZS5maWZvX2NvdW50ID0gZmlmb19mcmVlX2VudHJpZXMoZGV2X3ByaXYpOwogCiAJaWYg KGRldl9wcml2LT51bmNvcmUuZmlmb19jb3VudCA8IEdUX0ZJRk9fTlVNX1JFU0VSVkVEX0VOVFJJ RVMpIHsKIAkJaW50IGxvb3AgPSA1MDA7Ci0JCXUzMiBmaWZvID0gX19yYXdfaTkxNV9yZWFkMzIo ZGV2X3ByaXYsIEdURklGT0NUTCkgJiBHVF9GSUZPX0ZSRUVfRU5UUklFU19NQVNLOworCQl1MzIg ZmlmbyA9IGZpZm9fZnJlZV9lbnRyaWVzKGRldl9wcml2KTsKKwogCQl3aGlsZSAoZmlmbyA8PSBH VF9GSUZPX05VTV9SRVNFUlZFRF9FTlRSSUVTICYmIGxvb3AtLSkgewogCQkJdWRlbGF5KDEwKTsK LQkJCWZpZm8gPSBfX3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwgR1RGSUZPQ1RMKSAmIEdUX0ZJ Rk9fRlJFRV9FTlRSSUVTX01BU0s7CisJCQlmaWZvID0gZmlmb19mcmVlX2VudHJpZXMoZGV2X3By aXYpOwogCQl9CiAJCWlmIChXQVJOX09OKGxvb3AgPCAwICYmIGZpZm8gPD0gR1RfRklGT19OVU1f UkVTRVJWRURfRU5UUklFUykpCiAJCQkrK3JldDsKQEAgLTI3Nyw4ICsyODMsNyBAQCB2b2lkIGlu dGVsX3VuY29yZV9mb3JjZXdha2VfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCBy ZXN0b3JlKQogCiAJCWlmIChJU19HRU42KGRldikgfHwgSVNfR0VONyhkZXYpKQogCQkJZGV2X3By aXYtPnVuY29yZS5maWZvX2NvdW50ID0KLQkJCQlfX3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwg R1RGSUZPQ1RMKSAmCi0JCQkJR1RfRklGT19GUkVFX0VOVFJJRVNfTUFTSzsKKwkJCQlmaWZvX2Zy ZWVfZW50cmllcyhkZXZfcHJpdik7CiAJfQogCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2 X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=