From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Move CSB MMIO reads out of the execlists lock Date: Thu, 3 Mar 2016 10:39:32 +0000 Message-ID: <1457001572-31051-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1456838737-6669-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id AE1886EA48 for ; Thu, 3 Mar 2016 10:39:35 +0000 (UTC) In-Reply-To: <1456838737-6669-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkJ5IHJlYWRp bmcgdGhlIENTQiAoc2xvdyBNTUlPIGFjY2Vzc2VzKSBpbnRvIGEgdGVtcG9yYXJ5IGxvY2FsCmJ1 ZmZlciB3ZSBjYW4gZGVjcmVhc2UgdGhlIGR1cmF0aW9uIG9mIGhvbGRpbmcgdGhlIGV4ZWNsaXN0 CmxvY2suCgpNYWluIGFkdmFudGFnZSBpcyB0aGF0IGR1cmluZyBoZWF2eSBiYXRjaCBidWZmZXIg c3VibWlzc2lvbiB3ZQpyZWR1Y2UgdGhlIGV4ZWNsaXN0IGxvY2sgY29udGVudGlvbiwgd2hpY2gg c2hvdWxkIGRlY3JlYXNlIHRoZQpsYXRlbmN5IGFuZCBDUFUgdXNhZ2UgYmV0d2VlbiB0aGUgc3Vi bWl0dGluZyB1c2Vyc3BhY2UgcHJvY2VzcwphbmQgaW50ZXJydXB0IGhhbmRsaW5nLgoKRG93bnNp ZGUgaXMgdGhhdCB3ZSBuZWVkIHRvIGdyYWIgYW5kIHJlbGFzZSB0aGUgZm9yY2V3YWtlIHR3aWNl LApidXQgYXMgdGhlIGJlbG93IG51bWJlcnMgd2lsbCBzaG93IHRoaXMgaXMgY29tcGxldGVseSBo aWRkZW4KYnkgdGhlIHByaW1hcnkgZ2FpbnMuCgpUZXN0aW5nIHdpdGggImdlbV9sYXRlbmN5IC1u IDEwMCIgKHN1Ym1pdCBiYXRjaCBidWZmZXJzIHdpdGggYQpodW5kcmVkIG5vcHMgZWFjaCkgc2hv d3MgbW9yZSB0aGFuIGRvdWJsaW5nIG9mIHRoZSB0aHJvdWdocHV0CmFuZCBtb3JlIHRoYW4gaGFs dmluZyBvZiB0aGUgZGlzcGF0Y2ggbGF0ZW5jeSwgb3ZlcmFsbCBsYXRlbmN5CmFuZCBDUFUgdGlt ZSBzcGVuZCBpbiB0aGUgc3VibWl0dGluZyBwcm9jZXNzLgoKU3VibWl0dGluZyBlbXB0eSBiYXRj aGVzICgiZ2VtX2xhdGVuY3kgLW4gMCIpIGRvZXMgbm90IHNlZW0Kc2lnbmlmaWNhbnRseSBhZmZl Y3RlZCBieSB0aGlzIGNoYW5nZSB3aXRoIHRocm91Z2hwdXQgYW5kIENQVQp0aW1lIGltcHJvdmlu ZyBieSBoYWxmIGEgcGVyY2VudCwgYW5kIG92ZXJhbGwgbGF0ZW5jeSB3b3JzZW5pbmcKYnkgdGhl IHNhbWUgYW1vdW50LgoKQWJvdmUgdGVzdHMgd2VyZSBkb25lIGluIGEgaHVuZHJlZCBydW5zIG9u IGEgYmlnIGNvcmUgQnJvYWR3ZWxsLgoKdjI6CiAgKiBPdmVyZmxvdyBwcm90ZWN0aW9uIHRvIGxv Y2FsIENTQiBidWZmZXIuCiAgKiBVc2UgY2xvc2VyIGRldl9wcml2IGluIGV4ZWNsaXN0c19zdWJt aXRfcmVxdWVzdHMuIChDaHJpcyBXaWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCA3 NSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMzggaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwppbmRleCAyN2M5ZWUzZjczNzIuLjRmMTljYTc0OTBjNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKQEAgLTQxNiwxNSArNDE2LDIzIEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c191cGRh dGVfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogc3RhdGljIHZvaWQg ZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJx MCwKIAkJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxMSkKIHsKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBycTAtPmk5MTU7CisKIAlleGVjbGlzdHNf dXBkYXRlX2NvbnRleHQocnEwKTsKIAogCWlmIChycTEpCiAJCWV4ZWNsaXN0c191cGRhdGVfY29u dGV4dChycTEpOwogCisJc3Bpbl9sb2NrKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2spOworCWludGVs X3VuY29yZV9mb3JjZXdha2VfZ2V0X19sb2NrZWQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwor CiAJZXhlY2xpc3RzX2Vsc3Bfd3JpdGUocnEwLCBycTEpOworCisJaW50ZWxfdW5jb3JlX2ZvcmNl d2FrZV9wdXRfX2xvY2tlZChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisJc3Bpbl91bmxvY2so JmRldl9wcml2LT51bmNvcmUubG9jayk7CiB9CiAKLXN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250 ZXh0X3VucXVldWVfX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorc3RhdGlj IHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxMCA9IE5VTEwsICpyZXEx ID0gTlVMTDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmN1cnNvciwgKnRtcDsKQEAg LTQ3OCwxOSArNDg2LDYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZV9f bG9ja2VkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJZXhlY2xpc3RzX3N1Ym1pdF9y ZXF1ZXN0cyhyZXEwLCByZXExKTsKIH0KIAotc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRf dW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQotewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlzcGluX2xv Y2soJmRldl9wcml2LT51bmNvcmUubG9jayk7Ci0JaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXRf X2xvY2tlZChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7Ci0KLQlleGVjbGlzdHNfY29udGV4dF91 bnF1ZXVlX19sb2NrZWQocmluZyk7Ci0KLQlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dF9fbG9j a2VkKGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKLQlzcGluX3VubG9jaygmZGV2X3ByaXYtPnVu Y29yZS5sb2NrKTsKLX0KLQogc3RhdGljIHVuc2lnbmVkIGludAogZXhlY2xpc3RzX2NoZWNrX3Jl bW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiByZXF1ZXN0X2lk KQogewpAQCAtNTUxLDEyICs1NDYsMTAgQEAgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXUzMiBzdGF0dXNfcG9pbnRlcjsKIAl1 bnNpZ25lZCBpbnQgcmVhZF9wb2ludGVyLCB3cml0ZV9wb2ludGVyOwotCXUzMiBzdGF0dXMgPSAw OwotCXUzMiBzdGF0dXNfaWQ7CisJdTMyIGNzYltHRU44X0NTQl9FTlRSSUVTXVsyXTsKKwl1bnNp Z25lZCBpbnQgY3NiX3JlYWQgPSAwLCBpOwogCXVuc2lnbmVkIGludCBzdWJtaXRfY29udGV4dHMg PSAwOwogCi0Jc3Bpbl9sb2NrKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKLQogCXNwaW5fbG9jaygm ZGV2X3ByaXYtPnVuY29yZS5sb2NrKTsKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldF9fbG9j a2VkKGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIApAQCAtNTY4LDM5ICs1NjEsNDcgQEAgdm9p ZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJ d3JpdGVfcG9pbnRlciArPSBHRU44X0NTQl9FTlRSSUVTOwogCiAJd2hpbGUgKHJlYWRfcG9pbnRl ciA8IHdyaXRlX3BvaW50ZXIpIHsKLQkJc3RhdHVzID0gZ2V0X2NvbnRleHRfc3RhdHVzKHJpbmcs ICsrcmVhZF9wb2ludGVyLCAmc3RhdHVzX2lkKTsKKwkJaWYgKFdBUk5fT05fT05DRShjc2JfcmVh ZCA9PSBHRU44X0NTQl9FTlRSSUVTKSkKKwkJCWJyZWFrOworCQljc2JbY3NiX3JlYWRdWzBdID0g Z2V0X2NvbnRleHRfc3RhdHVzKHJpbmcsICsrcmVhZF9wb2ludGVyLAorCQkJCQkJICAgICAgJmNz Yltjc2JfcmVhZF1bMV0pOworCQljc2JfcmVhZCsrOworCX0KIAotCQlpZiAodW5saWtlbHkoc3Rh dHVzICYgR0VOOF9DVFhfU1RBVFVTX1BSRUVNUFRFRCkpIHsKLQkJCWlmIChzdGF0dXMgJiBHRU44 X0NUWF9TVEFUVVNfTElURV9SRVNUT1JFKSB7Ci0JCQkJaWYgKGV4ZWNsaXN0c19jaGVja19yZW1v dmVfcmVxdWVzdChyaW5nLCBzdGF0dXNfaWQpKQorCXJpbmctPm5leHRfY29udGV4dF9zdGF0dXNf YnVmZmVyID0gd3JpdGVfcG9pbnRlciAlIEdFTjhfQ1NCX0VOVFJJRVM7CisKKwkvKiBVcGRhdGUg dGhlIHJlYWQgcG9pbnRlciB0byB0aGUgb2xkIHdyaXRlIHBvaW50ZXIuIE1hbnVhbCByaW5nYnVm ZmVyCisJICogbWFuYWdlbWVudCBmdHcgPC9zYXJjYXNtPiAqLworCUk5MTVfV1JJVEVfRlcoUklO R19DT05URVhUX1NUQVRVU19QVFIocmluZyksCisJCSAgICAgIF9NQVNLRURfRklFTEQoR0VOOF9D U0JfUkVBRF9QVFJfTUFTSywKKwkJCQkgICAgcmluZy0+bmV4dF9jb250ZXh0X3N0YXR1c19idWZm ZXIgPDwgOCkpOworCisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXRfX2xvY2tlZChkZXZfcHJp diwgRk9SQ0VXQUtFX0FMTCk7CisJc3Bpbl91bmxvY2soJmRldl9wcml2LT51bmNvcmUubG9jayk7 CisKKwlzcGluX2xvY2soJnJpbmctPmV4ZWNsaXN0X2xvY2spOworCisJZm9yIChpID0gMDsgaSA8 IGNzYl9yZWFkOyBpKyspIHsKKwkJaWYgKHVubGlrZWx5KGNzYltpXVswXSAmIEdFTjhfQ1RYX1NU QVRVU19QUkVFTVBURUQpKSB7CisJCQlpZiAoY3NiW2ldWzBdICYgR0VOOF9DVFhfU1RBVFVTX0xJ VEVfUkVTVE9SRSkgeworCQkJCWlmIChleGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qocmlu ZywgY3NiW2ldWzFdKSkKIAkJCQkJV0FSTigxLCAiTGl0ZSBSZXN0b3JlZCByZXF1ZXN0IHJlbW92 ZWQgZnJvbSBxdWV1ZVxuIik7CiAJCQl9IGVsc2UKIAkJCQlXQVJOKDEsICJQcmVlbXB0aW9uIHdp dGhvdXQgTGl0ZSBSZXN0b3JlXG4iKTsKIAkJfQogCi0JCWlmIChzdGF0dXMgJiAoR0VOOF9DVFhf U1RBVFVTX0FDVElWRV9JRExFIHwKKwkJaWYgKGNzYltpXVswXSAmIChHRU44X0NUWF9TVEFUVVNf QUNUSVZFX0lETEUgfAogCQkgICAgR0VOOF9DVFhfU1RBVFVTX0VMRU1FTlRfU1dJVENIKSkKIAkJ CXN1Ym1pdF9jb250ZXh0cyArPQotCQkJCWV4ZWNsaXN0c19jaGVja19yZW1vdmVfcmVxdWVzdChy aW5nLCBzdGF0dXNfaWQpOworCQkJCWV4ZWNsaXN0c19jaGVja19yZW1vdmVfcmVxdWVzdChyaW5n LCBjc2JbaV1bMV0pOwogCX0KIAogCWlmIChzdWJtaXRfY29udGV4dHMpIHsKIAkJaWYgKCFyaW5n LT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSB8fAotCQkgICAgKHN0YXR1cyAmIEdFTjhfQ1RYX1NU QVRVU19BQ1RJVkVfSURMRSkpCi0JCQlleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlX19sb2NrZWQo cmluZyk7CisJCSAgICAoY3NiW2ldWzBdICYgR0VOOF9DVFhfU1RBVFVTX0FDVElWRV9JRExFKSkK KwkJCWV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUocmluZyk7CiAJfQogCi0JcmluZy0+bmV4dF9j b250ZXh0X3N0YXR1c19idWZmZXIgPSB3cml0ZV9wb2ludGVyICUgR0VOOF9DU0JfRU5UUklFUzsK LQotCS8qIFVwZGF0ZSB0aGUgcmVhZCBwb2ludGVyIHRvIHRoZSBvbGQgd3JpdGUgcG9pbnRlci4g TWFudWFsIHJpbmdidWZmZXIKLQkgKiBtYW5hZ2VtZW50IGZ0dyA8L3NhcmNhc20+ICovCi0JSTkx NV9XUklURV9GVyhSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKSwKLQkJICAgICAgX01BU0tF RF9GSUVMRChHRU44X0NTQl9SRUFEX1BUUl9NQVNLLAotCQkJCSAgICByaW5nLT5uZXh0X2NvbnRl eHRfc3RhdHVzX2J1ZmZlciA8PCA4KSk7Ci0KLQlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dF9f bG9ja2VkKGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKLQlzcGluX3VubG9jaygmZGV2X3ByaXYt PnVuY29yZS5sb2NrKTsKLQogCXNwaW5fdW5sb2NrKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKIAog CWlmICh1bmxpa2VseShzdWJtaXRfY29udGV4dHMgPiAyKSkKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK