From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 08/13] drm/i915/gen9: Use dev_priv in csr functions Date: Wed, 28 Oct 2015 23:59:02 +0200 Message-ID: <1446069547-24760-9-git-send-email-imre.deak@intel.com> References: <1446069547-24760-1-git-send-email-imre.deak@intel.com> 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 A4FC86EB56 for ; Wed, 28 Oct 2015 14:59:23 -0700 (PDT) In-Reply-To: <1446069547-24760-1-git-send-email-imre.deak@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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CgpBcyBhbGwgY3Ny IGZpcm13YXJlIHJlbGF0ZWQgb3BlcnRpb24gYXJlIG5vdCB1c2luZyBhbnkKYW55IGRhdGEgc3Ry dWN0dXJlcyBvZiBkcm0gZnJhbWV3b3JrIGxldmVsLCBzbyBiZXR0ZXIgdG8KdXNlIGRldl9wcml2 IGluc3RlYWQgb2YgZGV2LiBpdCdzIGEgbmV3IHN0eWxlISA6KQoKQ2M6IERhbWllbiBMZXNwaWF1 IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRl bC5jb20+CkNjOiBTdW5pbCBLYW1hdGggPHN1bmlsLmthbWF0aEBpbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBBbmltZXNoIE1hbm5hIDxhbmltZXNoLm1hbm5hQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6 IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RtYS5jICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyAgfCAgNCArLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyB8IDI2ICsrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8 ICA2ICsrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCA2MjE5MTRjLi5lZGRjYmZkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTM5OCw3ICszOTgsNyBAQCBzdGF0aWMgaW50IGk5MTVf bG9hZF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWludGVsX3Bvd2Vy X2RvbWFpbnNfaW5pdF9odyhkZXZfcHJpdik7CiAKLQlpbnRlbF9jc3JfdWNvZGVfaW5pdChkZXYp OworCWludGVsX2Nzcl91Y29kZV9pbml0KGRldl9wcml2KTsKIAogCXJldCA9IGludGVsX2lycV9p bnN0YWxsKGRldl9wcml2KTsKIAlpZiAocmV0KQpAQCAtMTExNiw3ICsxMTE2LDcgQEAgb3V0X210 cnJmcmVlOgogb3V0X2d0dDoKIAlpOTE1X2dsb2JhbF9ndHRfY2xlYW51cChkZXYpOwogb3V0X2Zy ZWVjc3I6Ci0JaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2KTsKKwlpbnRlbF9jc3JfdWNvZGVfZmlu aShkZXZfcHJpdik7CiAJaW50ZWxfdW5jb3JlX2ZpbmkoZGV2KTsKIAlwY2lfaW91bm1hcChkZXYt PnBkZXYsIGRldl9wcml2LT5yZWdzKTsKIHB1dF9icmlkZ2U6CkBAIC0xMTk5LDcgKzExOTksNyBA QCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxf ZmJjX2NsZWFudXBfY2ZiKGRldl9wcml2KTsKIAlpOTE1X2dlbV9jbGVhbnVwX3N0b2xlbihkZXYp OwogCi0JaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2KTsKKwlpbnRlbF9jc3JfdWNvZGVfZmluaShk ZXZfcHJpdik7CiAKIAlpbnRlbF90ZWFyZG93bl9nbWJ1cyhkZXYpOwogCWludGVsX3RlYXJkb3du X21jaGJhcihkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMzY2ZjgzMi4uZWNjZGI0 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xMDgxLDEzICsxMDgxLDExIEBAIHN0YXRp YyBpbnQgYnh0X3Jlc3VtZV9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAogc3RhdGljIGludCBza2xfcmVzdW1lX3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2 OwotCiAJaWYgKGRldl9wcml2LT5jc3IuZG1jX3BheWxvYWQpCiAJCXNrbF9kaXNhYmxlX2RjNihk ZXZfcHJpdik7CiAKIAlza2xfaW5pdF9jZGNsayhkZXZfcHJpdik7Ci0JaW50ZWxfY3NyX2xvYWRf cHJvZ3JhbShkZXYpOworCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0oZGV2X3ByaXYpOwogCiAJcmV0 dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCmluZGV4IGJiZjZiOGQuLmQ0NTkyMGYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCkBAIC0yMDQsMTkgKzIwNCwxOCBAQCBzdGF0aWMg Y2hhciBpbnRlbF9nZXRfc3Vic3RlcHBpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogLyoq CiAgKiBpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKCkgLSB3cml0ZSB0aGUgZmlybXdhcmUgZnJvbSBt ZW1vcnkgdG8gcmVnaXN0ZXIuCi0gKiBAZGV2OiBkcm0gZGV2aWNlLgorICogQGRldl9wcml2OiBp OTE1IGRybSBkZXZpY2UuCiAgKgogICogQ1NSIGZpcm13YXJlIGlzIHJlYWQgZnJvbSBhIC5iaW4g ZmlsZSBhbmQga2VwdCBpbiBpbnRlcm5hbCBtZW1vcnkgb25lIHRpbWUuCiAgKiBFdmVyeXRpbWUg ZGlzcGxheSBjb21lcyBiYWNrIGZyb20gbG93IHBvd2VyIHN0YXRlIHRoaXMgZnVuY3Rpb24gaXMg Y2FsbGVkIHRvCiAgKiBjb3B5IHRoZSBmaXJtd2FyZSBmcm9tIGludGVybmFsIG1lbW9yeSB0byBy ZWdpc3RlcnMuCiAgKi8KLXZvaWQgaW50ZWxfY3NyX2xvYWRfcHJvZ3JhbShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQordm9pZCBpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXUzMiAqcGF5bG9hZCA9IGRldl9wcml2LT5jc3IuZG1jX3Bh eWxvYWQ7CiAJdWludDMyX3QgaSwgZndfc2l6ZTsKIAotCWlmICghSVNfR0VOOShkZXYpKSB7CisJ aWYgKCFJU19HRU45KGRldl9wcml2KSkgewogCQlEUk1fRVJST1IoIk5vIENTUiBzdXBwb3J0IGF2 YWlsYWJsZSBmb3IgdGhpcyBwbGF0Zm9ybVxuIik7CiAJCXJldHVybjsKIAl9CkBAIC0zNjUsNyAr MzY0LDcgQEAgc3RhdGljIHZvaWQgZmluaXNoX2Nzcl9sb2FkKGNvbnN0IHN0cnVjdCBmaXJtd2Fy ZSAqZncsIHZvaWQgKmNvbnRleHQpCiAJbWVtY3B5KGRtY19wYXlsb2FkLCAmZnctPmRhdGFbcmVh ZGNvdW50XSwgbmJ5dGVzKTsKIAogCS8qIGxvYWQgY3NyIHByb2dyYW0gZHVyaW5nIHN5c3RlbSBi b290LCBhcyBuZWVkZWQgZm9yIERDIHN0YXRlcyAqLwotCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0o ZGV2KTsKKwlpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKGRldl9wcml2KTsKIAlmd19sb2FkZWQgPSB0 cnVlOwogCiBvdXQ6CkBAIC0zODUsMjEgKzM4NCwyMCBAQCBvdXQ6CiAKIC8qKgogICogaW50ZWxf Y3NyX3Vjb2RlX2luaXQoKSAtIGluaXRpYWxpemUgdGhlIGZpcm13YXJlIGxvYWRpbmcuCi0gKiBA ZGV2OiBkcm0gZGV2aWNlLgorICogQGRldl9wcml2OiBpOTE1IGRybSBkZXZpY2UuCiAgKgogICog VGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgYXQgdGhlIHRpbWUgb2YgbG9hZGluZyB0aGUgZGlzcGxh eSBkcml2ZXIgdG8gcmVhZAogICogZmlybXdhcmUgZnJvbSBhIC5iaW4gZmlsZSBhbmQgY29waWVk IGludG8gYSBpbnRlcm5hbCBtZW1vcnkuCiAgKi8KLXZvaWQgaW50ZWxfY3NyX3Vjb2RlX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaW50ZWxfY3NyX3Vjb2RlX2luaXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NzciAqY3NyID0g JmRldl9wcml2LT5jc3I7CiAJaW50IHJldDsKIAotCWlmICghSEFTX0NTUihkZXYpKQorCWlmICgh SEFTX0NTUihkZXZfcHJpdikpCiAJCXJldHVybjsKIAotCWlmIChJU19TS1lMQUtFKGRldikpCisJ aWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKQogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9TS0w7 CiAJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCWNzci0+ZndfcGF0aCA9IEk5MTVf Q1NSX0JYVDsKQEAgLTQyOSwxNiArNDI3LDE0IEBAIHZvaWQgaW50ZWxfY3NyX3Vjb2RlX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogLyoqCiAgKiBpbnRlbF9jc3JfdWNvZGVfZmluaSgp IC0gdW5sb2FkIHRoZSBDU1IgZmlybXdhcmUuCi0gKiBAZGV2OiBkcm0gZGV2aWNlLgorICogQGRl dl9wcml2OiBpOTE1IGRybSBkZXZpY2UuCiAgKgogICogRmlybW13YXJlIHVubG9hZGluZyBpbmNs dWRlcyBmcmVlaW5nIHRoZSBpbnRlcm5hbCBtb21vcnkgYW5kIHJlc2V0IHRoZQogICogZmlybXdh cmUgbG9hZGluZyBzdGF0dXMuCiAgKi8KLXZvaWQgaW50ZWxfY3NyX3Vjb2RlX2Zpbmkoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaW50ZWxfY3NyX3Vjb2RlX2Zpbmkoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlpZiAoIUhBU19DU1IoZGV2KSkKKwlpZiAoIUhB U19DU1IoZGV2X3ByaXYpKQogCQlyZXR1cm47CiAKIAlrZnJlZShkZXZfcHJpdi0+Y3NyLmRtY19w YXlsb2FkKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMmU0OGIzZi4uYTIwMDZiNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEyMDUsOSArMTIwNSw5IEBAIHUzMiBza2xf cGxhbmVfY3RsX3RpbGluZyh1aW50NjRfdCBmYl9tb2RpZmllcik7CiB1MzIgc2tsX3BsYW5lX2N0 bF9yb3RhdGlvbih1bnNpZ25lZCBpbnQgcm90YXRpb24pOwogCiAvKiBpbnRlbF9jc3IuYyAqLwot dm9pZCBpbnRlbF9jc3JfdWNvZGVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQg aW50ZWxfY3NyX2xvYWRfcHJvZ3JhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQgaW50 ZWxfY3NyX3Vjb2RlX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGludGVsX2Nz cl91Y29kZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopOwordm9pZCBpbnRlbF9jc3Jf bG9hZF9wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopOwordm9pZCBpbnRlbF9jc3Jf dWNvZGVfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqKTsKIAogLyogaW50ZWxfZHAuYyAq Lwogdm9pZCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBvdXRwdXRf cmVnLCBlbnVtIHBvcnQgcG9ydCk7Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK