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:33:32 +0100 Message-ID: <20151216093332.GM30437@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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CC766E864 for ; Wed, 16 Dec 2015 01:33:35 -0800 (PST) Received: by mail-wm0-f42.google.com with SMTP id l126so29612187wml.1 for ; Wed, 16 Dec 2015 01:33:35 -0800 (PST) Content-Disposition: inline In-Reply-To: <1449833608-22125-5-git-send-email-chris@chris-wilson.co.uk> 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 SGl0IHNlbmQgdG9vIGVhcmx5IDstKQoKT24gRnJpLCBEZWMgMTEsIDIwMTUgYXQgMTE6MzM6MDBB TSArMDAwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+IEBAIC00MTMzLDcgKzQxMzMsNyBAQCBpOTE1 X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSkKPiAgCj4gIAkJdGFyZ2V0ID0gcmVxdWVzdDsKPiAgCX0KPiAtCXJlc2V0X2NvdW50 ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKPiAr CXJlc2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3Ip Owo+ICAJaWYgKHRhcmdldCkKPiAgCQlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZSh0YXJnZXQp Owo+ICAJc3Bpbl91bmxvY2soJmZpbGVfcHJpdi0+bW0ubG9jayk7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCj4gaW5kZXggODY2NjRkMWIzMzg5Li42MGRmZjNmODk1MzEgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKPiBAQCAtMjQ1Miw3ICsyNDUyLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9y ZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkgKiB0aGUgcmVzZXQg aW4tcHJvZ3Jlc3MgYml0IGlzIG9ubHkgZXZlciBzZXQgYnkgY29kZSBvdXRzaWRlIG9mIHRoaXMK PiAgCSAqIHdvcmsgd2UgZG9uJ3QgbmVlZCB0byB3b3JyeSBhYm91dCBhbnkgb3RoZXIgcmFjZXMu Cj4gIAkgKi8KPiAtCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKGVycm9yKSAmJiAhaTkxNV90 ZXJtaW5hbGx5X3dlZGdlZChlcnJvcikpIHsKPiArCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNz X29yX3dlZGdlZChlcnJvcikgJiYgIWk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKSB7CgpX ZWxsIG1heWJlIHNpbXBsaWZ5IHRoaXMgb25lIGhlcmUuCgo+ICAJCURSTV9ERUJVR19EUklWRVIo InJlc2V0dGluZyBjaGlwXG4iKTsKPiAgCQlrb2JqZWN0X3VldmVudF9lbnYoJmRldi0+cHJpbWFy eS0+a2Rldi0+a29iaiwgS09CSl9DSEFOR0UsCj4gIAkJCQkgICByZXNldF9ldmVudCk7Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDdkZDcyMDBkM2JhOS4uY2M0N2Mw MjA2Mjk0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0zMjg1 LDEwICszMjg1LDEyIEBAIHN0YXRpYyBib29sIGludGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2Owo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjKTsKPiArCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7Cj4gIAlib29sIHBlbmRpbmc7Cj4gIAo+ IC0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJyb3IpIHx8Cj4g LQkgICAgaW50ZWxfY3J0Yy0+cmVzZXRfY291bnRlciAhPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYt PmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSkKPiArCXJlc2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0 X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ICsJaWYgKGludGVsX2NydGMtPnJlc2V0 X2NvdW50ZXIgIT0gcmVzZXRfY291bnRlciB8fAo+ICsJICAgIF9faTkxNV9yZXNldF9pbl9wcm9n cmVzc19vcl93ZWRnZWQocmVzZXRfY291bnRlcikpCj4gIAkJcmV0dXJuIGZhbHNlOwo+ICAKPiAg CXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7Cj4gQEAgLTEwOTQyLDkgKzEwOTQ0LDEx IEBAIHN0YXRpYyBib29sIHBhZ2VfZmxpcF9maW5pc2hlZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2Owo+ICAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAr CXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7Cj4gIAo+IC0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jl c3MoJmRldl9wcml2LT5ncHVfZXJyb3IpIHx8Cj4gLQkgICAgY3J0Yy0+cmVzZXRfY291bnRlciAh PSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSkKPiArCXJl c2V0X2NvdW50ZXIgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ ICsJaWYgKGNydGMtPnJlc2V0X2NvdW50ZXIgIT0gcmVzZXRfY291bnRlciB8fAo+ICsJICAgIF9f aTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQocmVzZXRfY291bnRlcikpCj4gIAkJcmV0 dXJuIHRydWU7Cj4gIAo+ICAJLyoKPiBAQCAtMTE2MDEsNyArMTE2MDUsNyBAQCBzdGF0aWMgaW50 IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCQlnb3RvIGNs ZWFudXA7Cj4gIAo+ICAJYXRvbWljX2luYygmaW50ZWxfY3J0Yy0+dW5waW5fd29ya19jb3VudCk7 Cj4gLQlpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5n cHVfZXJyb3IucmVzZXRfY291bnRlcik7Cj4gKwlpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyID0g aTkxNV9yZXNldF9jb3VudGVyKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKTsKPiAgCj4gIAlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPj0gNSB8fCBJU19HNFgoZGV2KSkKPiAgCQl3b3JrLT5mbGlwX2Nv dW50ID0gSTkxNV9SRUFEKFBJUEVfRkxJUENPVU5UX0c0WChwaXBlKSkgKyAxOwo+IEBAIC0xMzM4 OCwxMCArMTMzOTIsMTAgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQlyZXR1cm4gcmV0Owo+ICAKPiAgCXJldCA9IGRy bV9hdG9taWNfaGVscGVyX3ByZXBhcmVfcGxhbmVzKGRldiwgc3RhdGUpOwo+IC0JaWYgKCFyZXQg JiYgIWFzeW5jICYmICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZkZXZfcHJpdi0+Z3B1X2Vycm9y KSkgewo+ICsJaWYgKCFyZXQgJiYgIWFzeW5jICYmICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzX29y X3dlZGdlZCgmZGV2X3ByaXYtPmdwdV9lcnJvcikpIHsKCkkgZ3Vlc3Mgd2Ugc2hvdWxkIGFsc28g ZHJvcCB0aGUgX29yX3dlZGdlZCBoZXJlIHNpbmNlIGRlYWQgZ3B1IGlzbid0IGEKcHJvYmxlbSBm b3IgdGhlIG1vZGVzZXQgY29kZT8gT3IgaXMgdGhhdCBsYXRlciBvbiBpbiB0aGUgc2VyaWVzIC4u LgotRGFuaWVsCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=