From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 4/5] drm/i915: Change locking for struct_mutex, v2. Date: Mon, 2 Nov 2015 13:57:59 +0100 Message-ID: <56375DD7.2040507@linux.intel.com> References: <1443007632-5573-1-git-send-email-maarten.lankhorst@linux.intel.com> <1443007632-5573-5-git-send-email-maarten.lankhorst@linux.intel.com> <20151028224855.GA9946@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 8D2546E127 for ; Mon, 2 Nov 2015 04:58:01 -0800 (PST) In-Reply-To: <20151028224855.GA9946@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org c3RydWN0X211dGV4IGlzIGJlaW5nIGxvY2tlZCBmb3IgZXZlcnkgcGxhbmUgaW4gaW50ZWxfcHJl cGFyZV9wbGFuZV9mYiBhbmQKaW50ZWxfY2xlYW51cF9wbGFuZV9mYi4gVGhpcyBjYW4gYmUgb3B0 aW1pemVkIGJ5IGFjcXVpcmluZyBzdHJ1Y3RfbXV0ZXggZmlyc3QKYmVmb3JlIGNhbGxpbmcgdGhl IGF0b21pYyBoZWxwZXJzLiBUaGlzIHdheSB0aGUgbG9jayBvbmx5IG5lZWRzIHRvIGJlIGFjcXVp cmVkCnR3aWNlIGluIC0+YXRvbWljX2NvbW1pdCgpLiBPbmNlIGZvciBwaW5uaW5nIG5ldyBmcmFt ZWJ1ZmZlcnMgYXQgdGhlIHN0YXJ0LAp0aGUgc2Vjb25kIHRpbWUgZm9yIHVucGlubmluZyBvbGQg ZnJhbWVidWZmZXIuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFVzZSBtdXRleF9sb2NrX2ludGVycnVw dGlibGUgaW5zdGVhZCBvZiBpOTE1IHZhcmlhbnQsCiAgdG8gcHJldmVudCBhIGRlYWRsb2NrIHdo ZW4gYXRvbWljX2NvbW1pdCBpcyBjYWxsZWQgZnJvbSB0aGUgcmVzZXQgY29kZS4KClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+ClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgot LS0KRG9lcyB0aGlzIGxvb2sgYmV0dGVyPwoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8IDE5ICsrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2Vy dGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCAzNmU3ZTI5ZWEyNjYuLjEzYWFhZTM4ZjdmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMTMxNjUsOCArMTMxNjUsMTMgQEAgc3RhdGljIGludCBpbnRlbF9h dG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCXJldHVybiBy ZXQ7CiAJfQogCisJcmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9t dXRleCk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXJldCA9IGRybV9hdG9taWNfaGVs cGVyX3ByZXBhcmVfcGxhbmVzKGRldiwgc3RhdGUpOwogCisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTMyNjgsNyArMTMyNzMsMTAgQEAg c3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ LyogRklYTUU6IGFkZCBzdWJwaXhlbCBvcmRlciAqLwogCiAJZHJtX2F0b21pY19oZWxwZXJfd2Fp dF9mb3JfdmJsYW5rcyhkZXYsIHN0YXRlKTsKKworCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211 dGV4KTsKIAlkcm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKKwlt dXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCWlmIChhbnlfbXMpCiAJCWludGVs X21vZGVzZXRfY2hlY2tfc3RhdGUoZGV2LCBzdGF0ZSk7CkBAIC0xMzQ1MywxMCArMTM0NjEsNiBA QCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICgh b2JqICYmICFvbGRfb2JqKQogCQlyZXR1cm4gMDsKIAotCXJldCA9IGk5MTVfbXV0ZXhfbG9ja19p bnRlcnJ1cHRpYmxlKGRldik7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQogCWlmIChvbGRf b2JqKSB7CiAJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CiAJCQlkcm1fYXRv bWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKG5ld19zdGF0ZS0+c3RhdGUsIHBsYW5lLT5zdGF0 ZS0+Y3J0Yyk7CkBAIC0xMzQ3Nyw3ICsxMzQ4MSw3IEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAkJLyogU3dhbGxvdyAtRUlPIGVycm9ycyB0byBh bGxvdyB1cGRhdGVzIGR1cmluZyBodyBsb2NrdXAuICovCiAJCWlmIChyZXQgJiYgcmV0ICE9IC1F SU8pCi0JCQlnb3RvIG91dDsKKwkJCXJldHVybiByZXQ7CiAJfQogCiAJaWYgKCFvYmopIHsKQEAg LTEzNDk1LDkgKzEzNDk5LDYgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAlpZiAocmV0ID09IDApCiAJCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmos IG9iaiwgaW50ZWxfcGxhbmUtPmZyb250YnVmZmVyX2JpdCk7CiAKLW91dDoKLQltdXRleF91bmxv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLQogCXJldHVybiByZXQ7CiB9CiAKQEAgLTEzNTIwLDcg KzEzNTIxLDYgQEAgaW50ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAlpZiAoIW9iaiAmJiAhb2xkX29iaikKIAkJcmV0dXJuOwogCi0JbXV0ZXhfbG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCWlmIChvbGRfb2JqICYmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExB TkVfVFlQRV9DVVJTT1IgfHwKIAkgICAgIUlOVEVMX0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3Bo eXNpY2FsKSkKIAkJaW50ZWxfdW5waW5fZmJfb2JqKG9sZF9zdGF0ZS0+ZmIsIG9sZF9zdGF0ZSk7 CkBAIC0xMzUyOSw3ICsxMzUyOSw2IEBAIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJaWYgKChvbGRfb2JqICYmIChvbGRfb2JqLT5mcm9udGJ1ZmZlcl9i aXRzICYgaW50ZWxfcGxhbmUtPmZyb250YnVmZmVyX2JpdCkpIHx8CiAJICAgIChvYmogJiYgIShv YmotPmZyb250YnVmZmVyX2JpdHMgJiBpbnRlbF9wbGFuZS0+ZnJvbnRidWZmZXJfYml0KSkpCiAJ CWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmosIG9iaiwgaW50ZWxfcGxhbmUtPmZyb250YnVmZmVy X2JpdCk7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKIGludAotLSAK Mi4xLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=