From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 06/16] drm/i915: Add dev_priv->wm.mutex Date: Thu, 22 May 2014 17:48:11 +0300 Message-ID: <1400770101-14277-7-git-send-email-ville.syrjala@linux.intel.com> References: <1400770101-14277-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C7966EC35 for ; Thu, 22 May 2014 07:48:52 -0700 (PDT) In-Reply-To: <1400770101-14277-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFk ZCBhIG11dGV4IHRvIHByb3RlY3QgbW9zdCBvZiB0aGUgd2F0ZXJtYXJrIHN0YXRlLiBXaWxsIGJl IHVzZWZ1bCB3aGVuCndlIHN0YXJ0IHRvIHVwZGF0ZSB3YXRlcm1hcmtzIGFzeW5jaHJvbm91c2x5 IGZyb20gcGxhbmUgdXBkYXRlcywgb3IKd2hlbiB3ZSBnZXQgZmluZXIgZ3JhaW5lZCBsb2NraW5n IGZvciBwbGFuZXMuCgpSZXZpZXdlZC1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBp bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgfCAx MSArKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgNSArKysr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgfCAyMSArKysrKysrKysrKysrKysr KysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0NTliMDJhLi5hMjMwMmE3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTE1MzAsOCArMTUzMCwxNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSB7CiAJCS8qIGN1cnNvciAqLwogCQl1aW50MTZfdCBjdXJfbGF0ZW5jeVs1XTsKIAotCQkv KiBjdXJyZW50IGhhcmR3YXJlIHN0YXRlICovCisJCS8qCisJCSAqIGN1cnJlbnQgaGFyZHdhcmUg c3RhdGUKKwkJICogcHJvdGVjdGVkIGJ5IGRldl9wcml2LT53bS5tdXRleAorCQkgKi8KIAkJc3Ry dWN0IGlsa193bV92YWx1ZXMgaHc7CisKKwkJLyoKKwkJICogcHJvdGVjdHMgc29tZSBkZXZfcHJp di0+d20gYW5kIGludGVsX2NydGMtPndtCisJCSAqIHN0YXRlIGFzIHdlbGwgYXMgdGhlIGFjdHVh bCBoYXJkd2FyZSByZWdpc3RlcnMKKwkJICovCisJCXN0cnVjdCBtdXRleCBtdXRleDsKIAl9IHdt OwogCiAJc3RydWN0IGk5MTVfcnVudGltZV9wbSBwbTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK aW5kZXggZDdjNTJiMi4uZDc1Y2MyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQw NCw3ICs0MDQsMTAgQEAgc3RydWN0IGludGVsX2NydGMgewogCiAJLyogcGVyLXBpcGUgd2F0ZXJt YXJrIHN0YXRlICovCiAJc3RydWN0IHsKLQkJLyogd2F0ZXJtYXJrcyBjdXJyZW50bHkgYmVpbmcg dXNlZCAgKi8KKwkJLyoKKwkJICogd2F0ZXJtYXJrcyBjdXJyZW50bHkgYmVpbmcgdXNlZAorCQkg KiBwcm90ZWN0ZWQgYnkgZGV2X3ByaXYtPndtLm11dGV4CisJCSAqLwogCQlzdHJ1Y3QgaW50ZWxf cGlwZV93bSBhY3RpdmU7CiAJfSB3bTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMjE4 NTU1My4uMmE2MzQxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yNzQzLDggKzI3NDMs MTMgQEAgc3RhdGljIHZvaWQgaWxrX3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgYm9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CisJYm9vbCBjaGFuZ2VkOworCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYt PndtLm11dGV4KTsKKwljaGFuZ2VkID0gX2lsa19kaXNhYmxlX2xwX3dtKGRldl9wcml2LCBXTV9E SVJUWV9MUF9BTEwpOworCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPndtLm11dGV4KTsKIAotCXJl dHVybiBfaWxrX2Rpc2FibGVfbHBfd20oZGV2X3ByaXYsIFdNX0RJUlRZX0xQX0FMTCk7CisJcmV0 dXJuIGNoYW5nZWQ7CiB9CiAKIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTI3ODQsNiArMjc4OSw3IEBAIHN0YXRpYyB2b2lkIGls a191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgcGFyYW1zID0g e307CiAJc3RydWN0IGludGVsX3BpcGVfd20gcGlwZV93bSA9IHt9OwogCkBAIC0yNzkxLDEyICsy Nzk3LDE3IEBAIHN0YXRpYyB2b2lkIGlsa191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRj KQogCiAJaW50ZWxfY29tcHV0ZV9waXBlX3dtKGNydGMsICZwYXJhbXMsICZwaXBlX3dtKTsKIAor CW11dGV4X2xvY2soJmRldl9wcml2LT53bS5tdXRleCk7CisKIAlpZiAoIW1lbWNtcCgmaW50ZWxf Y3J0Yy0+d20uYWN0aXZlLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkKLQkJcmV0dXJuOwor CQlnb3RvIHVubG9jazsKIAogCWludGVsX2NydGMtPndtLmFjdGl2ZSA9IHBpcGVfd207CiAKIAlp bGtfcHJvZ3JhbV93YXRlcm1hcmtzKGRldik7CisKKyB1bmxvY2s6CisJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+d20ubXV0ZXgpOwogfQogCiBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3Nwcml0ZV93 bShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKQEAgLTI4NjgsMTAgKzI4NzksMTQgQEAgdm9pZCBp bGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2Ny dGMgKmNydGM7CiAKKwltdXRleF9sb2NrKCZkZXZfcHJpdi0+d20ubXV0ZXgpOworCiAJX2lsa193 bV9nZXRfaHdfc3RhdGUoZGV2LCAmZGV2X3ByaXYtPndtLmh3KTsKIAogCWZvcl9lYWNoX2NydGMo ZGV2LCBjcnRjKQogCQlfaWxrX3BpcGVfd21faHdfdG9fc3coY3J0Yyk7CisKKwltdXRleF91bmxv Y2soJmRldl9wcml2LT53bS5tdXRleCk7CiB9CiAKIC8qKgpAQCAtNjM2OSw2ICs2Mzg0LDggQEAg dm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCW11dGV4X2lu aXQoJmRldl9wcml2LT53bS5tdXRleCk7CisKIAlpZiAoSEFTX0ZCQyhkZXYpKSB7CiAJCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA+PSA3KSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5mYmNfZW5h YmxlZCA9IGlyb25sYWtlX2ZiY19lbmFibGVkOwotLSAKMS44LjUuNQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK