From: Tvrtko Ursulin Subject: [PATCH 3/3] drm/i915: Do not inline forcewake taking in mmio accessors Date: Wed, 28 Sep 2016 13:25:46 +0100 Message-ID: <1475065546-5481-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475065546-5481-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 mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A9406E77B for ; Wed, 28 Sep 2016 12:26:00 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b4so5734773wmb.2 for ; Wed, 28 Sep 2016 05:25:59 -0700 (PDT) In-Reply-To: <1475065546-5481-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk9uY2Ugd2Ug a25vdyB3ZSBuZWVkIHRvIHRha2UgbmV3IGZvcmNld2FrZXMsIHRoYXQgYmVpbmcKYSBzbG93IG9w ZXJhdGlvbiwgaXQgZG9lcyBub3QgbWFrZSBzZW5zZSB0byBpbmxpbmUgdGhhdApjb2RlIGludG8g ZXZlcnkgbW1pbyBhY2Nlc3Nvci4KCk1vdmUgaXQgdG8gYSBzZXBhcmF0ZSBmdW5jdGlvbiBhbmQg c2F2ZSBzb21lIGNvZGUuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j IHwgMjUgKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2Vy dGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK aW5kZXggMDc5MTAyYjQ2ZmQzLi5jODg3YWIwOTQ3YzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jCkBAIC04NjIsMTEgKzg2MiwyMiBAQCBfX2dlbjJfcmVhZCg2NCkKIAl0cmFjZV9p OTE1X3JlZ19ydyhmYWxzZSwgcmVnLCB2YWwsIHNpemVvZih2YWwpLCB0cmFjZSk7IFwKIAlyZXR1 cm4gdmFsCiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBfX2ZvcmNlX3dha2VfYXV0byhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJICAgICBlbnVtIGZvcmNld2FrZV9kb21haW5z IGZ3X2RvbWFpbnMpCitzdGF0aWMgdm9pZCBfX19mb3JjZV93YWtlX2F1dG8oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgIGVudW0gZm9yY2V3YWtlX2RvbWFpbnMg ZndfZG9tYWlucykKIHsKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmRv bWFpbjsKIAorCS8qIElkZWFsbHkgR0NDIHdvdWxkIGJlIGNvbnN0YW50LWZvbGQgYW5kIGVsaW1p bmF0ZSB0aGlzIGxvb3AgKi8KKwlmb3JfZWFjaF9md19kb21haW5fbWFza2VkKGRvbWFpbiwgZndf ZG9tYWlucywgZGV2X3ByaXYpCisJCWZ3X2RvbWFpbl9hcm1fdGltZXIoZG9tYWluKTsKKworCWRl dl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3X2RvbWFpbnMp OworCWRldl9wcml2LT51bmNvcmUuZndfZG9tYWluc19hY3RpdmUgfD0gZndfZG9tYWluczsKK30K Kworc3RhdGljIGlubGluZSB2b2lkIF9fZm9yY2Vfd2FrZV9hdXRvKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKKwkJCQkgICAgIGVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9t YWlucykKK3sKIAlpZiAoV0FSTl9PTighZndfZG9tYWlucykpCiAJCXJldHVybjsKIApAQCAtODc0 LDE0ICs4ODUsOCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX19mb3JjZV93YWtlX2F1dG8oc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWZ3X2RvbWFpbnMgJj0gZGV2X3ByaXYtPnVu Y29yZS5md19kb21haW5zOwogCWZ3X2RvbWFpbnMgJj0gfmRldl9wcml2LT51bmNvcmUuZndfZG9t YWluc19hY3RpdmU7CiAKLQlpZiAoZndfZG9tYWlucykgewotCQkvKiBJZGVhbGx5IEdDQyB3b3Vs ZCBiZSBjb25zdGFudC1mb2xkIGFuZCBlbGltaW5hdGUgdGhpcyBsb29wICovCi0JCWZvcl9lYWNo X2Z3X2RvbWFpbl9tYXNrZWQoZG9tYWluLCBmd19kb21haW5zLCBkZXZfcHJpdikKLQkJCWZ3X2Rv bWFpbl9hcm1fdGltZXIoZG9tYWluKTsKLQotCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNl X3dha2VfZ2V0KGRldl9wcml2LCBmd19kb21haW5zKTsKLQkJZGV2X3ByaXYtPnVuY29yZS5md19k b21haW5zX2FjdGl2ZSB8PSBmd19kb21haW5zOwotCX0KKwlpZiAoZndfZG9tYWlucykKKwkJX19f Zm9yY2Vfd2FrZV9hdXRvKGRldl9wcml2LCBmd19kb21haW5zKTsKIH0KIAogI2RlZmluZSBfX2dl bjZfcmVhZCh4KSBcCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==