From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 1/3] drm/i915: Prepare for larger CSB status FIFO size Date: Tue, 27 Nov 2018 19:38:43 +0200 Message-ID: <20181127173845.17403-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F2556E062 for ; Tue, 27 Nov 2018 17:39:17 +0000 (UTC) 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 TWFrZSBjc2IgZW50cnkgY291bnQgdmFyaWFibGUgaW4gcHJlcGFyYXRpb24gZm9yIGxhcmdlcgpD U0Igc3RhdHVzIEZJRk8gc2l6ZSBmb3VuZCBvbiBnZW4xMSsgaGFyZHdhcmUuCgpDYzogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGluZW4gPGpv b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBh bGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2VuZ2luZV9jcy5jICB8IDE2ICsrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDI0ICsrKysrKysrKysrKysrKysrLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgIDkgKysrKystLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAxNSArKysrKysrKyst LS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCA3NTljMGZkNThmOGMu LjIxOGVmODE3ZGExZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5n aW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAg LTEzNDcsMjcgKzEzNDcsMjkgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5naW5lX3ByaW50X3JlZ2lz dGVycyhjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCXVuc2lnbmVkIGlu dCBpZHg7CiAJCXU4IHJlYWQsIHdyaXRlOwogCi0JCWRybV9wcmludGYobSwgIlx0RXhlY2xpc3Qg c3RhdHVzOiAweCUwOHggJTA4eFxuIiwKKwkJZHJtX3ByaW50ZihtLCAiXHRFeGVjbGlzdCBzdGF0 dXM6IDB4JTA4eCAlMDh4LCBlbnRyaWVzICV1XG4iLAogCQkJICAgSTkxNV9SRUFEKFJJTkdfRVhF Q0xJU1RfU1RBVFVTX0xPKGVuZ2luZSkpLAotCQkJICAgSTkxNV9SRUFEKFJJTkdfRVhFQ0xJU1Rf U1RBVFVTX0hJKGVuZ2luZSkpKTsKKwkJCSAgIEk5MTVfUkVBRChSSU5HX0VYRUNMSVNUX1NUQVRV U19ISShlbmdpbmUpKSwKKwkJCSAgIGV4ZWNsaXN0cy0+Y3NiX2VudHJpZXMpOwogCiAJCXJlYWQg PSBleGVjbGlzdHMtPmNzYl9oZWFkOwogCQl3cml0ZSA9IFJFQURfT05DRSgqZXhlY2xpc3RzLT5j c2Jfd3JpdGUpOwogCiAJCWRybV9wcmludGYobSwgIlx0RXhlY2xpc3QgQ1NCIHJlYWQgJWQsIHdy aXRlICVkIFttbWlvOiVkXSwgdGFza2xldCBxdWV1ZWQ/ICVzICglcylcbiIsCiAJCQkgICByZWFk LCB3cml0ZSwKLQkJCSAgIEdFTjhfQ1NCX1dSSVRFX1BUUihJOTE1X1JFQUQoUklOR19DT05URVhU X1NUQVRVU19QVFIoZW5naW5lKSkpLAorCQkJICAgSTkxNV9SRUFEKFJJTkdfQ09OVEVYVF9TVEFU VVNfUFRSKGVuZ2luZSkpICYKKwkJCSAgIEdFTjExX0NTQl9XUklURV9QVFJfTUFTSywKIAkJCSAg IHllc25vKHRlc3RfYml0KFRBU0tMRVRfU1RBVEVfU0NIRUQsCiAJCQkJCSAgJmVuZ2luZS0+ZXhl Y2xpc3RzLnRhc2tsZXQuc3RhdGUpKSwKIAkJCSAgIGVuYWJsZWRkaXNhYmxlZCghYXRvbWljX3Jl YWQoJmVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQuY291bnQpKSk7Ci0JCWlmIChyZWFkID49IEdF TjhfQ1NCX0VOVFJJRVMpCisJCWlmIChyZWFkID49IGV4ZWNsaXN0cy0+Y3NiX2VudHJpZXMpCiAJ CQlyZWFkID0gMDsKLQkJaWYgKHdyaXRlID49IEdFTjhfQ1NCX0VOVFJJRVMpCisJCWlmICh3cml0 ZSA+PSBleGVjbGlzdHMtPmNzYl9lbnRyaWVzKQogCQkJd3JpdGUgPSAwOwogCQlpZiAocmVhZCA+ IHdyaXRlKQotCQkJd3JpdGUgKz0gR0VOOF9DU0JfRU5UUklFUzsKKwkJCXdyaXRlICs9IGV4ZWNs aXN0cy0+Y3NiX2VudHJpZXM7CiAJCXdoaWxlIChyZWFkIDwgd3JpdGUpIHsKLQkJCWlkeCA9ICsr cmVhZCAlIEdFTjhfQ1NCX0VOVFJJRVM7CisJCQlpZHggPSArK3JlYWQgJSBleGVjbGlzdHMtPmNz Yl9lbnRyaWVzOwogCQkJZHJtX3ByaW50ZihtLCAiXHRFeGVjbGlzdCBDU0JbJWRdOiAweCUwOHgg W21taW86MHglMDh4XSwgY29udGV4dDogJWQgW21taW86JWRdXG4iLAogCQkJCSAgIGlkeCwKIAkJ CQkgICBod3NbaWR4ICogMl0sCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDA4ZmQ5YjEy ZTRkNy4uNTQ4N2ZlNDk2YmI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNzY3LDYg Kzc2Nyw3IEBAIGV4ZWNsaXN0c19jYW5jZWxfcG9ydF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cykKIAogc3RhdGljIHZvaWQgcmVzZXRfY3Ni X3BvaW50ZXJzKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICpleGVjbGlzdHMpCiB7CisJ dTMyIHJlc2V0X3ZhbDsKIAkvKgogCSAqIEFmdGVyIGEgcmVzZXQsIHRoZSBIVyBzdGFydHMgd3Jp dGluZyBpbnRvIENTQiBlbnRyeSBbMF0uIFdlCiAJICogdGhlcmVmb3JlIGhhdmUgdG8gc2V0IG91 ciBIRUFEIHBvaW50ZXIgYmFjayBvbmUgZW50cnkgc28gdGhhdApAQCAtNzc2LDggKzc3NywxOSBA QCBzdGF0aWMgdm9pZCByZXNldF9jc2JfcG9pbnRlcnMoc3RydWN0IGludGVsX2VuZ2luZV9leGVj bGlzdHMgKmV4ZWNsaXN0cykKIAkgKiBpbmxpbmUgY29tcGFyaXNvbiBvZiBvdXIgY2FjaGVkIGhl YWQgcG9zaXRpb24gYWdhaW5zdCB0aGUgbGFzdCBIVwogCSAqIHdyaXRlIHdvcmtzIGV2ZW4gYmVm b3JlIHRoZSBmaXJzdCBpbnRlcnJ1cHQuCiAJICovCi0JZXhlY2xpc3RzLT5jc2JfaGVhZCA9IGV4 ZWNsaXN0cy0+Y3NiX3dyaXRlX3Jlc2V0OwotCVdSSVRFX09OQ0UoKmV4ZWNsaXN0cy0+Y3NiX3dy aXRlLCBleGVjbGlzdHMtPmNzYl93cml0ZV9yZXNldCk7CisJZXhlY2xpc3RzLT5jc2JfaGVhZCA9 IGV4ZWNsaXN0cy0+Y3NiX2VudHJpZXMgLSAxOworCisJaWYgKGV4ZWNsaXN0c19tbWlvX21vZGUo ZXhlY2xpc3RzKSkgeworCQljb25zdCB1MzIgbWFzayA9IGV4ZWNsaXN0cy0+Y3NiX2VudHJpZXMg PT0gR0VOOF9DU0JfRU5UUklFUyA/CisJCQlHRU44X0NTQl9XUklURV9QVFJfTUFTSyA6CisJCQlH RU4xMV9DU0JfV1JJVEVfUFRSX01BU0s7CisKKwkJcmVzZXRfdmFsID0gX01BU0tFRF9GSUVMRCht YXNrLCBleGVjbGlzdHMtPmNzYl9oZWFkKTsKKwl9IGVsc2UgeworCQlyZXNldF92YWwgPSBleGVj bGlzdHMtPmNzYl9oZWFkOworCX0KKworCVdSSVRFX09OQ0UoKmV4ZWNsaXN0cy0+Y3NiX3dyaXRl LCByZXNldF92YWwpOwogfQogCiBzdGF0aWMgdm9pZCBub3Bfc3VibWlzc2lvbl90YXNrbGV0KHVu c2lnbmVkIGxvbmcgZGF0YSkKQEAgLTg5NSw3ICs5MDcsNyBAQCBzdGF0aWMgdm9pZCBwcm9jZXNz X2NzYihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCXVuc2lnbmVkIGludCBzdGF0 dXM7CiAJCXVuc2lnbmVkIGludCBjb3VudDsKIAotCQlpZiAoKytoZWFkID09IEdFTjhfQ1NCX0VO VFJJRVMpCisJCWlmICgrK2hlYWQgPT0gZXhlY2xpc3RzLT5jc2JfZW50cmllcykKIAkJCWhlYWQg PSAwOwogCiAJCS8qCkBAIC0yMjY0LDYgKzIyNzYsOCBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmlu Z19pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCXVwcGVyXzMyX2JpdHMo Y2UtPmxyY19kZXNjKTsKIAl9CiAKKwlleGVjbGlzdHMtPmNzYl9lbnRyaWVzID0gR0VOOF9DU0Jf RU5UUklFUzsKKwogCWV4ZWNsaXN0cy0+Y3NiX3JlYWQgPQogCQlpOTE1LT5yZWdzICsgaTkxNV9t bWlvX3JlZ19vZmZzZXQoUklOR19DT05URVhUX1NUQVRVU19QVFIoZW5naW5lKSk7CiAJaWYgKGNz Yl9mb3JjZV9tbWlvKGk5MTUpKSB7CkBAIC0yMjcxLDE2ICsyMjg1LDEyIEBAIHN0YXRpYyBpbnQg bG9naWNhbF9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQkJKGk5 MTUtPnJlZ3MgKyBpOTE1X21taW9fcmVnX29mZnNldChSSU5HX0NPTlRFWFRfU1RBVFVTX0JVRl9M TyhlbmdpbmUsIDApKSk7CiAKIAkJZXhlY2xpc3RzLT5jc2Jfd3JpdGUgPSAodTMyIF9fZm9yY2Ug KilleGVjbGlzdHMtPmNzYl9yZWFkOwotCQlleGVjbGlzdHMtPmNzYl93cml0ZV9yZXNldCA9Ci0J CQlfTUFTS0VEX0ZJRUxEKEdFTjhfQ1NCX1dSSVRFX1BUUl9NQVNLLAotCQkJCSAgICAgIEdFTjhf Q1NCX0VOVFJJRVMgLSAxKTsKIAl9IGVsc2UgewogCQlleGVjbGlzdHMtPmNzYl9zdGF0dXMgPQog CQkJJmVuZ2luZS0+c3RhdHVzX3BhZ2UucGFnZV9hZGRyW0k5MTVfSFdTX0NTQl9CVUYwX0lOREVY XTsKIAogCQlleGVjbGlzdHMtPmNzYl93cml0ZSA9CiAJCQkmZW5naW5lLT5zdGF0dXNfcGFnZS5w YWdlX2FkZHJbaW50ZWxfaHdzX2NzYl93cml0ZV9pbmRleChpOTE1KV07Ci0JCWV4ZWNsaXN0cy0+ Y3NiX3dyaXRlX3Jlc2V0ID0gR0VOOF9DU0JfRU5UUklFUyAtIDE7CiAJfQogCXJlc2V0X2NzYl9w b2ludGVycyhleGVjbGlzdHMpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IGY1YTU1 MDJlY2Y3MC4uZTg2NWNiYTQzYTI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtNTUs MTAgKzU1LDExIEBACiAjZGVmaW5lIEdFTjhfQ1NCX1BUUl9NQVNLIDB4NwogI2RlZmluZSBHRU44 X0NTQl9SRUFEX1BUUl9NQVNLIChHRU44X0NTQl9QVFJfTUFTSyA8PCA4KQogI2RlZmluZSBHRU44 X0NTQl9XUklURV9QVFJfTUFTSyAoR0VOOF9DU0JfUFRSX01BU0sgPDwgMCkKLSNkZWZpbmUgR0VO OF9DU0JfV1JJVEVfUFRSKGNzYl9zdGF0dXMpIFwKLQkoKChjc2Jfc3RhdHVzKSAmIEdFTjhfQ1NC X1dSSVRFX1BUUl9NQVNLKSA+PiAwKQotI2RlZmluZSBHRU44X0NTQl9SRUFEX1BUUihjc2Jfc3Rh dHVzKSBcCi0JKCgoY3NiX3N0YXR1cykgJiBHRU44X0NTQl9SRUFEX1BUUl9NQVNLKSA+PiA4KQor CisjZGVmaW5lIEdFTjExX0NTQl9FTlRSSUVTIDEyCisjZGVmaW5lIEdFTjExX0NTQl9QVFJfTUFT SyAweGYKKyNkZWZpbmUgR0VOMTFfQ1NCX1JFQURfUFRSX01BU0sgKEdFTjExX0NTQl9QVFJfTUFT SyA8PCA4KQorI2RlZmluZSBHRU4xMV9DU0JfV1JJVEVfUFRSX01BU0sgKEdFTjExX0NTQl9QVFJf TUFTSyA8PCAwKQogCiBlbnVtIHsKIAlJTlRFTF9DT05URVhUX1NDSEVEVUxFX0lOID0gMCwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA4YTIyNzBiMjA5YjAuLmQ5 NTIwYTUyZmUyOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAt MzM5LDEzICszMzksOSBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyB7CiAJdTMyIHBy ZWVtcHRfY29tcGxldGVfc3RhdHVzOwogCiAJLyoqCi0JICogQGNzYl93cml0ZV9yZXNldDogcmVz ZXQgdmFsdWUgZm9yIENTQiB3cml0ZSBwb2ludGVyCi0JICoKLQkgKiBBcyB0aGUgQ1NCIHdyaXRl IHBvaW50ZXIgbWF5YmUgZWl0aGVyIGluIEhXU1Agb3IgYXMgYSBmaWVsZAotCSAqIGluc2lkZSBh biBtbWlvIHJlZ2lzdGVyLCB3ZSB3YW50IHRvIHJlcHJvZ3JhbSBpdCBzbGlnaHRseQotCSAqIGRp ZmZlcmVudGx5IHRvIGF2b2lkIGxhdGVyIGNvbmZ1c2lvbi4KKwkgKiBAY3NiX2VudHJpZXM6IG51 bWJlciBvZiBDU0IgZW50cmllcwogCSAqLwotCXUzMiBjc2Jfd3JpdGVfcmVzZXQ7CisJdTggY3Ni X2VudHJpZXM7CiAKIAkvKioKIAkgKiBAY3NiX2hlYWQ6IGNvbnRleHQgc3RhdHVzIGJ1ZmZlciBo ZWFkCkBAIC03MTQsNiArNzEwLDEzIEBAIGV4ZWNsaXN0c19pc19hY3RpdmUoY29uc3Qgc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cywKIAlyZXR1cm4gdGVzdF9iaXQoYml0 LCAodW5zaWduZWQgbG9uZyAqKSZleGVjbGlzdHMtPmFjdGl2ZSk7CiB9CiAKK3N0YXRpYyBpbmxp bmUgYm9vbAorZXhlY2xpc3RzX21taW9fbW9kZShjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cykKK3sKKwlyZXR1cm4gKHVuc2lnbmVkIGxvbmcpZXhl Y2xpc3RzLT5jc2JfcmVhZCA9PQorCQkodW5zaWduZWQgbG9uZylleGVjbGlzdHMtPmNzYl93cml0 ZTsKK30KKwogdm9pZCBleGVjbGlzdHNfdXNlcl9iZWdpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0cyAqZXhlY2xpc3RzLAogCQkJICBjb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9y dCk7CiB2b2lkIGV4ZWNsaXN0c191c2VyX2VuZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0 cyAqZXhlY2xpc3RzKTsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==