From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 04/32] drm/i915: Hide the atomic_read(reset_counter) behind a helper Date: Wed, 16 Dec 2015 10:36:41 +0100 Message-ID: <20151216093641.GO30437@phenom.ffwll.local> References: <1449833608-22125-1-git-send-email-chris@chris-wilson.co.uk> <1449833608-22125-5-git-send-email-chris@chris-wilson.co.uk> <20151216093332.GM30437@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 686896E86A for ; Wed, 16 Dec 2015 01:36:44 -0800 (PST) Received: by mail-wm0-f45.google.com with SMTP id n186so62435354wmn.0 for ; Wed, 16 Dec 2015 01:36:44 -0800 (PST) Content-Disposition: inline In-Reply-To: <20151216093332.GM30437@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBEZWMgMTYsIDIwMTUgYXQgMTA6MzM6MzJBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBIaXQgc2VuZCB0b28gZWFybHkgOy0pCj4gCj4gT24gRnJpLCBEZWMgMTEsIDIwMTUg YXQgMTE6MzM6MDBBTSArMDAwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+ID4gQEAgLTQxMzMsNyAr NDEzMyw3IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGRybV9maWxlICpmaWxlKQo+ID4gIAo+ID4gIAkJdGFyZ2V0ID0gcmVxdWVzdDsKPiA+ ICAJfQo+ID4gLQlyZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJy b3IucmVzZXRfY291bnRlcik7Cj4gPiArCXJlc2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50 ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ID4gIAlpZiAodGFyZ2V0KQo+ID4gIAkJaTkxNV9n ZW1fcmVxdWVzdF9yZWZlcmVuY2UodGFyZ2V0KTsKPiA+ICAJc3Bpbl91bmxvY2soJmZpbGVfcHJp di0+bW0ubG9jayk7Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiA+IGluZGV4IDg2NjY0ZDFi MzM4OS4uNjBkZmYzZjg5NTMxIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ID4g QEAgLTI0NTIsNyArMjQ1Miw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ID4gIAkgKiB0aGUgcmVzZXQgaW4tcHJvZ3Jlc3MgYml0 IGlzIG9ubHkgZXZlciBzZXQgYnkgY29kZSBvdXRzaWRlIG9mIHRoaXMKPiA+ICAJICogd29yayB3 ZSBkb24ndCBuZWVkIHRvIHdvcnJ5IGFib3V0IGFueSBvdGhlciByYWNlcy4KPiA+ICAJICovCj4g PiAtCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKGVycm9yKSAmJiAhaTkxNV90ZXJtaW5hbGx5 X3dlZGdlZChlcnJvcikpIHsKPiA+ICsJaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Nfb3Jfd2Vk Z2VkKGVycm9yKSAmJiAhaTkxNV90ZXJtaW5hbGx5X3dlZGdlZChlcnJvcikpIHsKPiAKPiBXZWxs IG1heWJlIHNpbXBsaWZ5IHRoaXMgb25lIGhlcmUuCgpBbmQgc2luY2UgSSBzZWVtIHRvIGJlIG1h a2luZyBhIG1lc3Mgb2YgdGhpcyB0aHJlYWQ6IHItYiBzdGFuZHMgd2l0aG91dCBvcgp3aXRoIHRo aXMuCi1EYW5pZWwKCj4gCj4gPiAgCQlEUk1fREVCVUdfRFJJVkVSKCJyZXNldHRpbmcgY2hpcFxu Iik7Cj4gPiAgCQlrb2JqZWN0X3VldmVudF9lbnYoJmRldi0+cHJpbWFyeS0+a2Rldi0+a29iaiwg S09CSl9DSEFOR0UsCj4gPiAgCQkJCSAgIHJlc2V0X2V2ZW50KTsKPiA+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKPiA+IGluZGV4IDdkZDcyMDBkM2JhOS4uY2M0N2MwMjA2Mjk0IDEw MDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IEBAIC0zMjg1LDEw ICszMjg1LDEyIEBAIHN0YXRpYyBib29sIGludGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCj4gPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5k ZXY7Cj4gPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Cj4gPiAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKPiA+ICsJdW5zaWduZWQgcmVzZXRfY291bnRlcjsKPiA+ICAJYm9vbCBwZW5kaW5n Owo+ID4gIAo+ID4gLQlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzcygmZGV2X3ByaXYtPmdwdV9l cnJvcikgfHwKPiA+IC0JICAgIGludGVsX2NydGMtPnJlc2V0X2NvdW50ZXIgIT0gYXRvbWljX3Jl YWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpCj4gPiArCXJlc2V0X2NvdW50 ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ID4gKwlpZiAo aW50ZWxfY3J0Yy0+cmVzZXRfY291bnRlciAhPSByZXNldF9jb3VudGVyIHx8Cj4gPiArCSAgICBf X2k5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Nfb3Jfd2VkZ2VkKHJlc2V0X2NvdW50ZXIpKQo+ID4gIAkJ cmV0dXJuIGZhbHNlOwo+ID4gIAo+ID4gIAlzcGluX2xvY2tfaXJxKCZkZXYtPmV2ZW50X2xvY2sp Owo+ID4gQEAgLTEwOTQyLDkgKzEwOTQ0LDExIEBAIHN0YXRpYyBib29sIHBhZ2VfZmxpcF9maW5p c2hlZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiA+ICB7Cj4gPiAgCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKPiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiA+ICsJdW5zaWduZWQgcmVzZXRfY291bnRl cjsKPiA+ICAKPiA+IC0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVf ZXJyb3IpIHx8Cj4gPiAtCSAgICBjcnRjLT5yZXNldF9jb3VudGVyICE9IGF0b21pY19yZWFkKCZk ZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKQo+ID4gKwlyZXNldF9jb3VudGVyID0g aTkxNV9yZXNldF9jb3VudGVyKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKTsKPiA+ICsJaWYgKGNydGMt PnJlc2V0X2NvdW50ZXIgIT0gcmVzZXRfY291bnRlciB8fAo+ID4gKwkgICAgX19pOTE1X3Jlc2V0 X2luX3Byb2dyZXNzX29yX3dlZGdlZChyZXNldF9jb3VudGVyKSkKPiA+ICAJCXJldHVybiB0cnVl Owo+ID4gIAo+ID4gIAkvKgo+ID4gQEAgLTExNjAxLDcgKzExNjA1LDcgQEAgc3RhdGljIGludCBp bnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gPiAgCQlnb3RvIGNs ZWFudXA7Cj4gPiAgCj4gPiAgCWF0b21pY19pbmMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291 bnQpOwo+ID4gLQlpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9w cml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7Cj4gPiArCWludGVsX2NydGMtPnJlc2V0X2Nv dW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ID4gIAo+ ID4gIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNSB8fCBJU19HNFgoZGV2KSkKPiA+ICAJ CXdvcmstPmZsaXBfY291bnQgPSBJOTE1X1JFQUQoUElQRV9GTElQQ09VTlRfRzRYKHBpcGUpKSAr IDE7Cj4gPiBAQCAtMTMzODgsMTAgKzEzMzkyLDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWlj X3ByZXBhcmVfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gPiAgCQlyZXR1cm4gcmV0 Owo+ID4gIAo+ID4gIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhkZXYs IHN0YXRlKTsKPiA+IC0JaWYgKCFyZXQgJiYgIWFzeW5jICYmICFpOTE1X3Jlc2V0X2luX3Byb2dy ZXNzKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKSkgewo+ID4gKwlpZiAoIXJldCAmJiAhYXN5bmMgJiYg IWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Nfb3Jfd2VkZ2VkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKSkg ewo+IAo+IEkgZ3Vlc3Mgd2Ugc2hvdWxkIGFsc28gZHJvcCB0aGUgX29yX3dlZGdlZCBoZXJlIHNp bmNlIGRlYWQgZ3B1IGlzbid0IGEKPiBwcm9ibGVtIGZvciB0aGUgbW9kZXNldCBjb2RlPyBPciBp cyB0aGF0IGxhdGVyIG9uIGluIHRoZSBzZXJpZXMgLi4uCj4gLURhbmllbAo+IC0tIAo+IERhbmll bCBWZXR0ZXIKPiBTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KPiBodHRwOi8v YmxvZy5mZndsbC5jaAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVs IENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==