From: Dave Gordon Subject: [PATCH] drm/i915: Refactor gen6_gt_force_wake_{get, put} Date: Fri, 7 Nov 2014 18:14:11 +0000 Message-ID: <1415384051-6596-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D4E96ECD3 for ; Fri, 7 Nov 2014 10:14:35 -0800 (PST) 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 VGhpcyBpcyBsYXJnZWx5IGZvciB0aGUgYmVuZWZpdCBvZiBURFIsIHdoaWNoIG5lZWRzIHRvIGJl IGFibGUgdG8gY2FsbAp0aGUgZm9yY2V3YWtlIGZ1bmN0aW9ucyBmcm9tIGEgY29udGV4dCB3aGVy ZSBpdCBtdXN0IG5vdCBzbGVlcC4gSGVuY2UKd2Ugc3BsaXQgdGhlIGZvcmNld2FrZSB7Z2V0LHB1 dH0gb3BlcmF0aW9ucyBpbnRvIGlubmVyIGNvcmUgdmVyc2lvbnMKdGhhdCBkb24ndCBpbmNsdWRl IHBtIHtnZXQscHV0fSBjYWxscywgYW5kIG91dGVyIHdyYXBwZXJzIHRoYXQgZG8uCkNhbGxlcnMg b2YgdGhlIGV4aXN0aW5nIGludGVyZmFjZXMgd2lsbCBzZWUgbm8gY2hhbmdlIGZyb20gdGhpcywg YnV0Cml0IHdpbGwgZW5hYmxlIFREUiB0byBzYWZlbHkgYWNjZXNzIHRoZSByZWdpc3RlcnMgaXQg bmVlZHMgdG8gc2FtcGxlLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29y ZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8 ICAgNjEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0OSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jCmluZGV4IDY4ZTcyMmIuLmMyZDM4OTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jCkBAIC01NjAsMjAgKzU2MCwxOSBAQCB2b2lkIGludGVsX3VuY29yZV9zYW5pdGl6 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogfQogCiAvKgotICogR2VuZXJhbGx5IHRoaXMgaXMg Y2FsbGVkIGltcGxpY2l0bHkgYnkgdGhlIHJlZ2lzdGVyIHJlYWQgZnVuY3Rpb24uIEhvd2V2ZXIs Ci0gKiBpZiBzb21lIHNlcXVlbmNlIHJlcXVpcmVzIHRoZSBHVCB0byBub3QgcG93ZXIgZG93biB0 aGVuIHRoaXMgZnVuY3Rpb24gc2hvdWxkCi0gKiBiZSBjYWxsZWQgYXQgdGhlIGJlZ2lubmluZyBv ZiB0aGUgc2VxdWVuY2UgZm9sbG93ZWQgYnkgYSBjYWxsIHRvCi0gKiBnZW42X2d0X2ZvcmNlX3dh a2VfcHV0KCkgYXQgdGhlIGVuZCBvZiB0aGUgc2VxdWVuY2UuCisgKiBJbm5lciBjb3JlIG9mIHRo ZSBmb3JjZV93YWtlX2dldCBvcGVyYXRpb24sIGV4cG9zZWQgZm9yIHRoZQorICogYmVuZWZpdCBv ZiBzcGVjaWFsIGNhc2VzIHN1Y2ggYXMgVERSLiBZb3Ugc2hvdWxkIG9ubHkgdXNlCisgKiB0aGlz IGludGVyZmFjZSBpZiAoYSkgeW91IG5lZWQgbm90IHRvIHNsZWVwLCBhbmQgKGIpIHlvdSBrbm93 CisgKiBhIHByaW9yaSB0aGF0IFBNIGlzc3VlcyBoYXZlIGJlZW4gaGFuZGxlZCBlbHNld2hlcmUu IEFsbCBvdGhlcgorICogY2FsbGVycyBzaG91bGQgdXNlIHRoZSByZWd1bGFyIHZlcnNpb24gYmVs b3cuCiAgKi8KLXZvaWQgZ2VuNl9ndF9mb3JjZV93YWtlX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIGludCBmd19lbmdpbmUpCit2b2lkIGdlbjZfZ3RfZm9yY2Vfd2FrZV9n ZXRfbm9fcG0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5l KQogewogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKIAlpZiAoIWRldl9wcml2LT51bmNvcmUu ZnVuY3MuZm9yY2Vfd2FrZV9nZXQpCiAJCXJldHVybjsKIAotCWludGVsX3J1bnRpbWVfcG1fZ2V0 KGRldl9wcml2KTsKLQogCS8qIFJlZGlyZWN0IHRvIEdlbjkgc3BlY2lmaWMgcm91dGluZSAqLwog CWlmIChJU19HRU45KGRldl9wcml2LT5kZXYpKQogCQlyZXR1cm4gZ2VuOV9mb3JjZV93YWtlX2dl dChkZXZfcHJpdiwgZndfZW5naW5lKTsKQEAgLTU4OSw5ICs1ODgsMzMgQEAgdm9pZCBnZW42X2d0 X2ZvcmNlX3dha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3 X2VuZ2luZSkKIH0KIAogLyoKLSAqIHNlZSBnZW42X2d0X2ZvcmNlX3dha2VfZ2V0KCkKKyAqIEdl bmVyYWxseSB0aGlzIGlzIGNhbGxlZCBpbXBsaWNpdGx5IGJ5IHRoZSByZWdpc3RlciByZWFkIGZ1 bmN0aW9uLgorICogSG93ZXZlciwgaWYgc29tZSBzZXF1ZW5jZSBvZiBhY2Nlc3NlcyByZXF1aXJl cyB0aGUgR1QgdG8gbm90IHBvd2VyCisgKiBkb3duIGJldHdlZW4gYWNjZXNzZXMgdGhlbiB0aGlz IGZ1bmN0aW9uIHNob3VsZCBiZSBjYWxsZWQgYXQgdGhlCisgKiBiZWdpbm5pbmcgb2YgdGhlIHNl cXVlbmNlIGZvbGxvd2VkIGJ5IGEgZ2VuNl9ndF9mb3JjZV93YWtlX3B1dCgpIGF0CisgKiB0aGUg ZW5kIG9mIHRoZSBzZXF1ZW5jZS4KICAqLwotdm9pZCBnZW42X2d0X2ZvcmNlX3dha2VfcHV0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2luZSkKK3ZvaWQgZ2Vu Nl9ndF9mb3JjZV93YWtlX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGlu dCBmd19lbmdpbmUpCit7CisJLyogTm8gZm9yY2V3YWtlIGltcGxpZXMgbm8gUE0gZWl0aGVyICov CisJaWYgKCFkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KQorCQlyZXR1cm47 CisKKwlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisKKwlnZW42X2d0X2ZvcmNlX3dh a2VfZ2V0X25vX3BtKGRldl9wcml2LCBmd19lbmdpbmUpOworfQorCisvKgorICogc2VlIGdlbjZf Z3RfZm9yY2Vfd2FrZV9nZXRfbm9fcG0oKQorICoKKyAqIFRoaXMgZnVuY3Rpb24gcmV0dXJucyB0 cnVlIGlmIHRoZSByZWZjb3VudCB3b3VsZCBoYXZlIGdvbmUgdG8gemVybywKKyAqIGJ1dCB0aGUg YWN0dWFsIGZvcmNld2FrZV9wdXQgb3BlcmF0aW9uIGhhcyBiZWVuIGRlZmVycmVkIHRvIGEgdGlt ZWQKKyAqIGNhbGxiYWNrLCBhbmQgdGh1cyB0aGUgY2FsbGVyIG11c3QgTk9UIGNhbGwgaW50ZWxf cnVudGltZV9wbV9wdXQoKS4KKyAqIEluIGFsbCBvdGhlciBjYXNlcyAoY291bnQgd291bGQgbm90 IGhhdmUgZ29uZSB0byB6ZXJvLCBvciBpdCBkaWQgYW5kCisgKiB0aGUgaGFyZHdhcmUgb3BlcmF0 aW9uIGhhcyBhbHJlYWR5IGNvbXBsZXRlZCksIGl0IHJldHVybnMgZmFsc2UuCisgKi8KK2Jvb2wg Z2VuNl9ndF9mb3JjZV93YWtlX3B1dF9ub19wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGludCBmd19lbmdpbmUpCiB7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKIAlib29s IGRlbGF5ZWQgPSBmYWxzZTsKQEAgLTYwMiwxMyArNjI1LDEzIEBAIHZvaWQgZ2VuNl9ndF9mb3Jj ZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBmd19lbmdp bmUpCiAJLyogUmVkaXJlY3QgdG8gR2VuOSBzcGVjaWZpYyByb3V0aW5lICovCiAJaWYgKElTX0dF TjkoZGV2X3ByaXYtPmRldikpIHsKIAkJZ2VuOV9mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgZndf ZW5naW5lKTsKLQkJZ290byBvdXQ7CisJCXJldHVybiBmYWxzZTsKIAl9CiAKIAkvKiBSZWRpcmVj dCB0byBWTFYgc3BlY2lmaWMgcm91dGluZSAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2 LT5kZXYpKSB7CiAJCXZsdl9mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgZndfZW5naW5lKTsKLQkJ Z290byBvdXQ7CisJCXJldHVybiBmYWxzZTsKIAl9CiAKIApAQCAtNjIzLDcgKzY0NiwyMSBAQCB2 b2lkIGdlbjZfZ3RfZm9yY2Vfd2FrZV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBpbnQgZndfZW5naW5lKQogCX0KIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJp di0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAotb3V0OgorCXJldHVybiBkZWxheWVkOworfQor CisvKgorICogc2VlIGdlbjZfZ3RfZm9yY2Vfd2FrZV9nZXQoKQorICovCit2b2lkIGdlbjZfZ3Rf Zm9yY2Vfd2FrZV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndf ZW5naW5lKQoreworCWJvb2wgZGVsYXllZDsKKworCS8qIE5vIGZvcmNld2FrZSBpbXBsaWVzIG5v IFBNIGVpdGhlciAqLworCWlmICghZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1 dCkKKwkJcmV0dXJuOworCisJZGVsYXllZCA9IGdlbjZfZ3RfZm9yY2Vfd2FrZV9wdXRfbm9fcG0o ZGV2X3ByaXYsIGZ3X2VuZ2luZSk7CiAJaWYgKCFkZWxheWVkKQogCQlpbnRlbF9ydW50aW1lX3Bt X3B1dChkZXZfcHJpdik7CiB9Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=