From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] Revert unrelated part of "drm: simplify the locking in the GETCRTC ioctl" Date: Thu, 30 Mar 2017 09:36:05 +0200 Message-ID: <6be47261-475f-c190-af56-c136677246d9@linux.intel.com> References: <20170322215058.8671-14-daniel.vetter@ffwll.ch> <20170328070145.21520-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170328070145.21520-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , DRI Development Cc: Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org T3AgMjgtMDMtMTcgb20gMDk6MDEgc2NocmVlZiBEYW5pZWwgVmV0dGVyOgo+IDxzbmlwPgo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA2OGNkZWQ0NTM4ODIuLjQzZGJh ZDYyNzg2ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMTI0 NjMsNiArMTI0NjMsMTEgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiAgCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQo ZGV2LCBzdGF0ZSk7Cj4gIAlpZiAocmV0KQo+ICAJCXJldHVybiByZXQ7Cj4gKwkvKiBlbm9jZGVy LT5hdG9taWNfY2hlY2sgbWlnaHQgdXBncmFkZSBzb21lIGNydGMgdG8gYSBmdWxsIG1vZGVzZXQg Ki8KPiArCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoZGV2LCBzdGF0ZSk7 Cj4gKwlpZiAocmV0KQo+ICsJCXJldHVybiByZXQ7Cj4gKwo+ICAKPiAgCWZvcl9lYWNoX29sZG5l d19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgY3J0Y19zdGF0ZSwg aSkgewo+ICAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CgpJIGtub3cg dGhpcyBwYXRjaCBoYXMgYmVlbiBhcHBsaWVkLCBidXQgdGhpcyBodW5rIGlzIGNvbXBsZXRlbHkg dW5yZWxhdGVkLgoKQ2FuIEkgZ2V0IGEgUi1CIG9uIHJldmVydGluZyBpdD8KCi0tLS0+OC0tLS0K djIgb2YgdGhlIGNvbW1pdCAyYzc3YmIyOWQzOTggKCJkcm06IHNpbXBsaWZ5IHRoZSBsb2NraW5n IGluIHRoZSBHRVRDUlRDIGlvY3RsIikKYWNjaWRlbnRhbGx5IGludHJvZHVjZWQgYSB1bnJlbGF0 ZWQgY2hhbmdlIGluIGludGVsX2Rpc3BsYXkuYywgcmV2ZXJ0IHRoZQp1bnJlbGF0ZWQgY2hhbmdl LgogClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBs aW51eC5pbnRlbC5jb20+CkZpeGVzOiAyYzc3YmIyOWQzOTggKCJkcm06IHNpbXBsaWZ5IHRoZSBs b2NraW5nIGluIHRoZSBHRVRDUlRDIGlvY3RsIikKLS0tCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggYmFhOGQ4MzZjOGU3Li5jNDU2OTRhYmRhNWIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyNDc4LDExICsxMjQ3OCw2IEBAIHN0YXRpYyBpbnQg aW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcmV0ID0gZHJtX2F0 b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChkZXYsIHN0YXRlKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwotCS8qIGVub2NkZXItPmF0b21pY19jaGVjayBtaWdodCB1cGdyYWRlIHNvbWUgY3J0 YyB0byBhIGZ1bGwgbW9kZXNldCAqLwotCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21v ZGVzZXQoZGV2LCBzdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQogCiAJZm9yX2Vh Y2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBjcnRj X3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK