From: Tvrtko Ursulin Subject: [PATCH 03/14] drm/i915: Do not inline forcewake taking in mmio accessors Date: Fri, 30 Sep 2016 18:48:38 +0100 Message-ID: <1475257729-11283-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475257729-11283-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B11106E1B4 for ; Fri, 30 Sep 2016 17:49:01 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id p197so2988603wmg.1 for ; Fri, 30 Sep 2016 10:49:01 -0700 (PDT) In-Reply-To: <1475257729-11283-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 c2F2ZSBzb21lIGNvZGUuCgp2MjogQmUgZXhwbGljaXQgd2l0aCBub2lubGluZSBhbmQgcmVtb3Zl IHN0YWxlIGNvbW1lbnQuCiAgICAoQ2hyaXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jIHwgMjQgKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYwppbmRleCAwNzkxMDJiNDZmZDMuLjYwMTM3YTE2NDA5NCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTg2MiwxMSArODYyLDIxIEBAIF9fZ2VuMl9yZWFk KDY0KQogCXRyYWNlX2k5MTVfcmVnX3J3KGZhbHNlLCByZWcsIHZhbCwgc2l6ZW9mKHZhbCksIHRy YWNlKTsgXAogCXJldHVybiB2YWwKIAotc3RhdGljIGlubGluZSB2b2lkIF9fZm9yY2Vfd2FrZV9h dXRvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgICAgIGVudW0gZm9y Y2V3YWtlX2RvbWFpbnMgZndfZG9tYWlucykKK3N0YXRpYyBub2lubGluZSB2b2lkIF9fX2ZvcmNl X3dha2VfYXV0byhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCWVudW0g Zm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWlucykKIHsKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9kb21haW4gKmRvbWFpbjsKIAorCWZvcl9lYWNoX2Z3X2RvbWFpbl9tYXNrZWQoZG9t YWluLCBmd19kb21haW5zLCBkZXZfcHJpdikKKwkJZndfZG9tYWluX2FybV90aW1lcihkb21haW4p OworCisJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgZndf ZG9tYWlucyk7CisJZGV2X3ByaXYtPnVuY29yZS5md19kb21haW5zX2FjdGl2ZSB8PSBmd19kb21h aW5zOworfQorCitzdGF0aWMgaW5saW5lIHZvaWQgX19mb3JjZV93YWtlX2F1dG8oc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAgICAgZW51bSBmb3JjZXdha2VfZG9tYWlu cyBmd19kb21haW5zKQorewogCWlmIChXQVJOX09OKCFmd19kb21haW5zKSkKIAkJcmV0dXJuOwog CkBAIC04NzQsMTQgKzg4NCw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBfX2ZvcmNlX3dha2VfYXV0 byhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJZndfZG9tYWlucyAmPSBkZXZf cHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnM7CiAJZndfZG9tYWlucyAmPSB+ZGV2X3ByaXYtPnVuY29y ZS5md19kb21haW5zX2FjdGl2ZTsKIAotCWlmIChmd19kb21haW5zKSB7Ci0JCS8qIElkZWFsbHkg R0NDIHdvdWxkIGJlIGNvbnN0YW50LWZvbGQgYW5kIGVsaW1pbmF0ZSB0aGlzIGxvb3AgKi8KLQkJ Zm9yX2VhY2hfZndfZG9tYWluX21hc2tlZChkb21haW4sIGZ3X2RvbWFpbnMsIGRldl9wcml2KQot CQkJZndfZG9tYWluX2FybV90aW1lcihkb21haW4pOwotCi0JCWRldl9wcml2LT51bmNvcmUuZnVu Y3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3X2RvbWFpbnMpOwotCQlkZXZfcHJpdi0+dW5j b3JlLmZ3X2RvbWFpbnNfYWN0aXZlIHw9IGZ3X2RvbWFpbnM7Ci0JfQorCWlmIChmd19kb21haW5z KQorCQlfX19mb3JjZV93YWtlX2F1dG8oZGV2X3ByaXYsIGZ3X2RvbWFpbnMpOwogfQogCiAjZGVm aW5lIF9fZ2VuNl9yZWFkKHgpIFwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK