From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm: atomic helper: fix W=1 warnings Date: Thu, 3 Oct 2019 18:46:27 +0300 Message-ID: <20191003154627.GQ1208@intel.com> References: <20190909135205.10277-1-benjamin.gaignard@st.com> <20190909135205.10277-2-benjamin.gaignard@st.com> <20191003142738.GM1208@intel.com> <20191003150526.GN1208@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 208456EA20 for ; Thu, 3 Oct 2019 15:46:32 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Benjamin Gaignard Cc: David Airlie , ML dri-devel , Benjamin Gaignard , Linux Kernel Mailing List List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMDMsIDIwMTkgYXQgMDU6Mzc6MTVQTSArMDIwMCwgQmVuamFtaW4gR2FpZ25h cmQgd3JvdGU6Cj4gTGUgamV1LiAzIG9jdC4gMjAxOSDDoCAxNzowNSwgVmlsbGUgU3lyasOkbMOk Cj4gPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPiBhIMOpY3JpdCA6Cj4gPgo+ID4gT24g VGh1LCBPY3QgMDMsIDIwMTkgYXQgMDQ6NDY6NTRQTSArMDIwMCwgQmVuamFtaW4gR2FpZ25hcmQg d3JvdGU6Cj4gPiA+IExlIGpldS4gMyBvY3QuIDIwMTkgw6AgMTY6MjcsIFZpbGxlIFN5cmrDpGzD pAo+ID4gPiA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+IGEgw6ljcml0IDoKPiA+ID4g Pgo+ID4gPiA+IE9uIE1vbiwgU2VwIDA5LCAyMDE5IGF0IDAzOjUyOjA1UE0gKzAyMDAsIEJlbmph bWluIEdhaWduYXJkIHdyb3RlOgo+ID4gPiA+ID4gRml4IHdhcm5pbmdzIHdpdGggVz0xLgo+ID4g PiA+ID4gRmV3IGZvcl9lYWNoIG1hY3JvIHNldCB2YXJpYWJsZXMgdGhhdCBhcmUgbmV2ZXIgdXNl ZCBsYXRlci4KPiA+ID4gPiA+IFByZXZlbnQgd2FybmluZyBieSBtYXJraW5nIHRoZXNlIHZhcmlh YmxlcyBhcyBfX21heWJlX3VudXNlZC4KPiA+ID4gPiA+Cj4gPiA+ID4gPiBTaWduZWQtb2ZmLWJ5 OiBCZW5qYW1pbiBHYWlnbmFyZCA8YmVuamFtaW4uZ2FpZ25hcmRAc3QuY29tPgo+ID4gPiA+ID4g LS0tCj4gPiA+ID4gPiAgZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCAzNiAr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KPiA+ID4gPiA+ICAxIGZpbGUgY2hh bmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCj4gPiA+ID4gPgo+ID4gPiA+ ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiA+ID4gPiA+IGluZGV4IGFhMTZlYTE3 ZmY5Yi4uYjY5ZDE3YjBiOWJkIDEwMDY0NAo+ID4gPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2RybV9hdG9taWNfaGVscGVyLmMKPiA+ID4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljX2hlbHBlci5jCj4gPiA+ID4gPiBAQCAtMjYyLDcgKzI2Miw3IEBAIHN0ZWFsX2VuY29k ZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ID4gPiA+ID4gICAgICAgICAgICAg c3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQo+ID4gPiA+ID4gIHsKPiA+ID4gPiA+ICAgICAg IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiA+ID4gPiA+IC0gICAgIHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX2Nv bm5lY3RvciBfX21heWJlX3VudXNlZCAqY29ubmVjdG9yOwo+ID4gPiA+Cj4gPiA+ID4gUmF0aGVy IHVnbHkuIElNTyB3b3VsZCBiZSBuaWNlciBpZiB3ZSBjb3VsZCBoaWRlIHNvbWV0aGluZyBpbnNp ZGUKPiA+ID4gPiB0aGUgaXRlcmF0b3IgbWFjcm9zIHRvIHN1cHByZXNzIHRoZSB3YXJuaW5nLgo+ ID4gPgo+ID4gPiBPayBidXQgaG93ID8KPiA+ID4gY29ubmVjdG9yIGlzIGFzc2lnbmVkIGluIHRo ZSBtYWNyb3MgYnV0IG5vdCB1c2VkIGxhdGVyIGFuZCB3ZSBjYW4ndAo+ID4gPiBzZXQgIl9fbWF5 YmVfdW51c2VkIgo+ID4gPiBpbiB0aGUgbWFjcm8uCj4gPiA+IERvZXMgYW5vdGhlciBrZXl3b3Jk IGV4aXN0IGZvciB0aGF0ID8KPiA+Cj4gPiBTdGljayBhICh2b2lkKShjb25uZWN0b3IpIGludG8g dGhlIG1hY3JvPwo+IAo+IFRoYXQgY291bGQgd29yayBidXQgaXQgd2lsbCBsb29rIHN0cmFuZ2Ug aW5zaWRlIHRoZSBtYWNyby4KPiAKPiA+Cj4gPiBBbm90aGVyIChhcmd1YWJseSBjbGVhbmVyKSBp ZGVhIHdvdWxkIGJlIHRvIHJlbW92ZSB0aGUgY29ubmVjdG9yL2NydGMvcGxhbmUKPiA+IGFyZ3Vt ZW50IGZyb20gdGhlIGl0ZXJhdG9ycyBlbnRpcmVseSBzaW5jZSBpdCdzIHJlZHVuZGFudCwgYW5k IGluc3RlYWQganVzdAo+ID4gZXh0cmFjdCBpdCBmcm9tIHRoZSBhcHByb3ByaWF0ZSBuZXcvb2xk IHN0YXRlIGFzIG5lZWRlZC4KPiA+Cj4gPiBXZSBjb3VsZCB0aGVuIGFsc28gYWRkIGEgZm9yX2Vh Y2hfY29ubmVjdG9yX2luX3N0YXRlKCkvZXRjLiB3aGljaCBvbWl0Cj4gPiBzIHRoZSBzdGF0ZSBh cmd1bWVudHMgYW5kIGp1c3QgaGFzIHRoZSBjb25uZWN0b3IgYXJndW1lbnQsIGZvciBjYXNlcyB3 aGVyZQo+ID4geW91IGRvbid0IGNhcmUgYWJvdXQgdGhlIHN0YXRlcyB3aGVuIGl0ZXJhdGluZy4K PiAKPiBUaGF0IG1heSBsZWFkIHRvIGdldCBhIG1hY3JvIGZvciBlYWNoIHBvc3NpYmxlIGNvbWJp bmF0aW9uIG9mIHVzZWQgdmFyaWFibGVzLgoKV2UgYWxyZWFkeSBoYXZlIG5ldy9vbGQvb2xkbmV3 LCBzbyB3b3VsZCAianVzdCIgYWRkIG9uZSBtb3JlLgoKPiAKPiA+Cj4gPiA+Cj4gPiA+ID4KPiA+ ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubmVjdG9yX3N0 YXRlLCAqbmV3X2Nvbm5lY3Rvcl9zdGF0ZTsKPiA+ID4gPiA+ICAgICAgIGludCBpOwo+ID4gPiA+ ID4KPiA+ID4gPiA+IEBAIC00MTIsNyArNDEyLDcgQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCj4gPiA+ID4gPiAgewo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRy bV9jcnRjICpjcnRjOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdf Y3J0Y19zdGF0ZTsKPiA+ID4gPiA+IC0gICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3I7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBfX21heWJlX3VudXNlZCAq Y29ubmVjdG9yOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5l d19jb25uX3N0YXRlOwo+ID4gPiA+ID4gICAgICAgaW50IGk7Cj4gPiA+ID4gPiAgICAgICBpbnQg cmV0Owo+ID4gPiA+ID4gQEAgLTYwOCw3ICs2MDgsNyBAQCBkcm1fYXRvbWljX2hlbHBlcl9jaGVj a19tb2Rlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gPiA+ID4gPiAgewo+ID4gPiA+ID4g ICAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwo+ID4gPiA+ID4gLSAg ICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKPiA+ID4gPiA+ICsgICAgIHN0cnVj dCBkcm1fY29ubmVjdG9yIF9fbWF5YmVfdW51c2VkICpjb25uZWN0b3I7Cj4gPiA+ID4gPiAgICAg ICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5lY3Rvcl9zdGF0ZSwgKm5ld19j b25uZWN0b3Jfc3RhdGU7Cj4gPiA+ID4gPiAgICAgICBpbnQgaSwgcmV0Owo+ID4gPiA+ID4gICAg ICAgdW5zaWduZWQgY29ubmVjdG9yc19tYXNrID0gMDsKPiA+ID4gPiA+IEBAIC05ODQsNyArOTg0 LDcgQEAgY3J0Y19uZWVkc19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX3N0YXRl LAo+ID4gPiA+ID4gIHN0YXRpYyB2b2lkCj4gPiA+ID4gPiAgZGlzYWJsZV9vdXRwdXRzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCj4g PiA+ID4gPiAgewo+ID4gPiA+ID4gLSAgICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKPiA+ID4gPiA+ICsgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yIF9fbWF5YmVfdW51c2VkICpj b25uZWN0b3I7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xk X2Nvbm5fc3RhdGUsICpuZXdfY29ubl9zdGF0ZTsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YzsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKPiA+ID4gPiA+IEBAIC0xMTczLDcgKzExNzMsNyBA QCBjcnRjX3NldF9tb2RlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpvbGRfc3RhdGUpCj4gPiA+ID4gPiAgewo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRy bV9jcnRjICpjcnRjOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdf Y3J0Y19zdGF0ZTsKPiA+ID4gPiA+IC0gICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3I7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBfX21heWJlX3VudXNlZCAq Y29ubmVjdG9yOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5l d19jb25uX3N0YXRlOwo+ID4gPiA+ID4gICAgICAgaW50IGk7Cj4gPiA+ID4gPgo+ID4gPiA+ID4g QEAgLTEyOTQsNyArMTI5NCw3IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X21vZGVz ZXRfZW5hYmxlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gPiA+ID4gICAgICAgc3RydWN0 IGRybV9jcnRjICpjcnRjOwo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZTsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3 X2NydGNfc3RhdGU7Cj4gPiA+ID4gPiAtICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yOwo+ID4gPiA+ID4gKyAgICAgc3RydWN0IGRybV9jb25uZWN0b3IgX19tYXliZV91bnVzZWQg KmNvbm5lY3RvcjsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpu ZXdfY29ubl9zdGF0ZTsKPiA+ID4gPiA+ICAgICAgIGludCBpOwo+ID4gPiA+ID4KPiA+ID4gPiA+ IEBAIC0xMzg0LDcgKzEzODQsNyBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfZmVu Y2VzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gPiA+ID4gPiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gPiA+ID4g PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHByZV9zd2FwKQo+ID4g PiA+ID4gIHsKPiA+ID4gPiA+IC0gICAgIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwo+ID4gPiA+ ID4gKyAgICAgc3RydWN0IGRybV9wbGFuZSBfX21heWJlX3VudXNlZCAqcGxhbmU7Cj4gPiA+ID4g PiAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGU7Cj4gPiA+ID4g PiAgICAgICBpbnQgaSwgcmV0Owo+ID4gPiA+ID4KPiA+ID4gPiA+IEBAIC0xNDMxLDcgKzE0MzEs NyBAQCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl92YmxhbmtzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCj4gPiA+ID4gPiAgICAgICAgICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpv bGRfc3RhdGUpCj4gPiA+ID4gPiAgewo+ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jcnRjICpj cnRjOwo+ID4gPiA+ID4gLSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0 ZSwgKm5ld19jcnRjX3N0YXRlOwo+ID4gPiA+ID4gKyAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRl IF9fbWF5YmVfdW51c2VkICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwo+ID4gPiA+ ID4gICAgICAgaW50IGksIHJldDsKPiA+ID4gPiA+ICAgICAgIHVuc2lnbmVkIGNydGNfbWFzayA9 IDA7Cj4gPiA+ID4gPgo+ID4gPiA+ID4gQEAgLTE2MjEsNyArMTYyMSw3IEBAIHN0YXRpYyB2b2lk IGNvbW1pdF93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiA+ID4gPiA+ICBpbnQgZHJt X2F0b21pY19oZWxwZXJfYXN5bmNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ID4g PiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKPiA+ID4gPiA+ICB7Cj4gPiA+ID4gPiAtICAgICBzdHJ1Y3QgZHJtX2NydGMg KmNydGM7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX2NydGMgX19tYXliZV91bnVzZWQgKmNy dGM7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Cj4g PiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IE5VTEw7Cj4gPiA+ID4gPiAg ICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPSBOVUxMOwo+ID4g PiA+ID4gQEAgLTE5ODIsOSArMTk4Miw5IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9j b21taXQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ID4gPiA+ID4gIHsKPiA+ID4g PiA+ICAgICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiA+ID4gPiA+ICAgICAgIHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKPiA+ID4gPiA+ IC0gICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uOwo+ID4gPiA+ID4gKyAgICAgc3RydWN0 IGRybV9jb25uZWN0b3IgX19tYXliZV91bnVzZWQgKmNvbm47Cj4gPiA+ID4gPiAgICAgICBzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUsICpuZXdfY29ubl9zdGF0ZTsK PiA+ID4gPiA+IC0gICAgIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwo+ID4gPiA+ID4gKyAgICAg c3RydWN0IGRybV9wbGFuZSBfX21heWJlX3VudXNlZCAqcGxhbmU7Cj4gPiA+ID4gPiAgICAgICBz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUsICpuZXdfcGxhbmVfc3RhdGU7 Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7Cj4gPiA+ID4g PiAgICAgICBpbnQgaSwgcmV0Owo+ID4gPiA+ID4gQEAgLTIyMTQsNyArMjIxNCw3IEBAIEVYUE9S VF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfZmFrZV92YmxhbmspOwo+ID4gPiA+ID4gICAqLwo+ ID4gPiA+ID4gIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X2h3X2RvbmUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKPiA+ID4gPiA+ICB7Cj4gPiA+ID4gPiAtICAgICBz dHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX2NydGMgX19t YXliZV91bnVzZWQgKmNydGM7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg Km9sZF9jcnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3Qg ZHJtX2NydGNfY29tbWl0ICpjb21taXQ7Cj4gPiA+ID4gPiAgICAgICBpbnQgaTsKPiA+ID4gPiA+ IEBAIC0yMzAwLDcgKzIzMDAsNyBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX2Nv bW1pdF9jbGVhbnVwX2RvbmUpOwo+ID4gPiA+ID4gIGludCBkcm1fYXRvbWljX2hlbHBlcl9wcmVw YXJlX3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gPiA+ID4gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4g PiA+ID4gPiAgewo+ID4gPiA+ID4gLSAgICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKPiA+ID4gPiA+ICsgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yIF9fbWF5YmVfdW51c2VkICpj b25uZWN0b3I7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqbmV3 X2Nvbm5fc3RhdGU7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKPiA+ ID4gPiA+ICAgICAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKPiA+ ID4gPiA+IEBAIC0yOTUzLDkgKzI5NTMsOSBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfZGlzYWJs ZV9hbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ID4gPiA+ICB7Cj4gPiA+ID4gPiAgICAg ICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZTsKPiA+ID4gPiA+IC0gICAgIHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uOwo+ID4gPiA+ID4gKyAgICAgc3RydWN0IGRybV9jb25uZWN0b3Ig X19tYXliZV91bnVzZWQgKmNvbm47Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpwbGFuZV9zdGF0ZTsKPiA+ID4gPiA+IC0gICAgIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l Owo+ID4gPiA+ID4gKyAgICAgc3RydWN0IGRybV9wbGFuZSBfX21heWJlX3VudXNlZCAqcGxhbmU7 Cj4gPiA+ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Cj4gPiA+ ID4gPiAgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4gPiA+ID4gPiAgICAgICBpbnQgcmV0 LCBpOwo+ID4gPiA+ID4gQEAgLTMxOTksMTEgKzMxOTksMTEgQEAgaW50IGRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKPiA+ID4gPiA+ICB7Cj4gPiA+ID4gPiAgICAgICBpbnQgaSwgcmV0Owo+ID4gPiA+ID4gICAg ICAgc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Cj4gPiA+ID4gPiAtICAgICBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGU7Cj4gPiA+ID4gPiArICAgICBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlIF9fbWF5YmVfdW51c2VkICpuZXdfcGxhbmVfc3RhdGU7Cj4gPiA+ID4gPiAgICAg ICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwo+ID4gPiA+ID4gLSAgICAgc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25uX3N0YXRlOwo+ID4gPiA+ID4gKyAgICAgc3Ry dWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgX19tYXliZV91bnVzZWQgKm5ld19jb25uX3N0YXRlOwo+ ID4gPiA+ID4gICAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ID4gPiA+ID4gLSAgICAgc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKPiA+ID4gPiA+ICsgICAgIHN0cnVj dCBkcm1fY3J0Y19zdGF0ZSBfX21heWJlX3VudXNlZCAqbmV3X2NydGNfc3RhdGU7Cj4gPiA+ID4g Pgo+ID4gPiA+ID4gICAgICAgc3RhdGUtPmFjcXVpcmVfY3R4ID0gY3R4Owo+ID4gPiA+ID4KPiA+ ID4gPiA+IC0tCj4gPiA+ID4gPiAyLjE1LjAKPiA+ID4gPiA+Cj4gPiA+ID4gPiBfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+ID4gPiA+ID4gZHJpLWRldmVs IG1haWxpbmcgbGlzdAo+ID4gPiA+ID4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ ID4gPiA+ID4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwKPiA+ID4gPgo+ID4gPiA+IC0tCj4gPiA+ID4gVmlsbGUgU3lyasOkbMOkCj4gPiA+ ID4gSW50ZWwKPiA+Cj4gPiAtLQo+ID4gVmlsbGUgU3lyasOkbMOkCj4gPiBJbnRlbAoKLS0gClZp bGxlIFN5cmrDpGzDpApJbnRlbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 238A4C10F14 for ; Thu, 3 Oct 2019 15:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D001E20700 for ; Thu, 3 Oct 2019 15:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729340AbfJCPqc (ORCPT ); Thu, 3 Oct 2019 11:46:32 -0400 Received: from mga17.intel.com ([192.55.52.151]:43107 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbfJCPqc (ORCPT ); Thu, 3 Oct 2019 11:46:32 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Oct 2019 08:46:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,252,1566889200"; d="scan'208";a="191302204" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga008.fm.intel.com with SMTP; 03 Oct 2019 08:46:27 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 03 Oct 2019 18:46:27 +0300 Date: Thu, 3 Oct 2019 18:46:27 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Benjamin Gaignard Cc: Benjamin Gaignard , David Airlie , Daniel Vetter , Linux Kernel Mailing List , ML dri-devel Subject: Re: [PATCH] drm: atomic helper: fix W=1 warnings Message-ID: <20191003154627.GQ1208@intel.com> References: <20190909135205.10277-1-benjamin.gaignard@st.com> <20190909135205.10277-2-benjamin.gaignard@st.com> <20191003142738.GM1208@intel.com> <20191003150526.GN1208@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 03, 2019 at 05:37:15PM +0200, Benjamin Gaignard wrote: > Le jeu. 3 oct. 2019 ā 17:05, Ville Syrjälä > a écrit : > > > > On Thu, Oct 03, 2019 at 04:46:54PM +0200, Benjamin Gaignard wrote: > > > Le jeu. 3 oct. 2019 ā 16:27, Ville Syrjälä > > > a écrit : > > > > > > > > On Mon, Sep 09, 2019 at 03:52:05PM +0200, Benjamin Gaignard wrote: > > > > > Fix warnings with W=1. > > > > > Few for_each macro set variables that are never used later. > > > > > Prevent warning by marking these variables as __maybe_unused. > > > > > > > > > > Signed-off-by: Benjamin Gaignard > > > > > --- > > > > > drivers/gpu/drm/drm_atomic_helper.c | 36 ++++++++++++++++++------------------ > > > > > 1 file changed, 18 insertions(+), 18 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > > > > > index aa16ea17ff9b..b69d17b0b9bd 100644 > > > > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > > > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > > > > @@ -262,7 +262,7 @@ steal_encoder(struct drm_atomic_state *state, > > > > > struct drm_encoder *encoder) > > > > > { > > > > > struct drm_crtc_state *crtc_state; > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > > > > Rather ugly. IMO would be nicer if we could hide something inside > > > > the iterator macros to suppress the warning. > > > > > > Ok but how ? > > > connector is assigned in the macros but not used later and we can't > > > set "__maybe_unused" > > > in the macro. > > > Does another keyword exist for that ? > > > > Stick a (void)(connector) into the macro? > > That could work but it will look strange inside the macro. > > > > > Another (arguably cleaner) idea would be to remove the connector/crtc/plane > > argument from the iterators entirely since it's redundant, and instead just > > extract it from the appropriate new/old state as needed. > > > > We could then also add a for_each_connector_in_state()/etc. which omit > > s the state arguments and just has the connector argument, for cases where > > you don't care about the states when iterating. > > That may lead to get a macro for each possible combination of used variables. We already have new/old/oldnew, so would "just" add one more. > > > > > > > > > > > > > > > struct drm_connector_state *old_connector_state, *new_connector_state; > > > > > int i; > > > > > > > > > > @@ -412,7 +412,7 @@ mode_fixup(struct drm_atomic_state *state) > > > > > { > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *new_crtc_state; > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *new_conn_state; > > > > > int i; > > > > > int ret; > > > > > @@ -608,7 +608,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, > > > > > { > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *old_crtc_state, *new_crtc_state; > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *old_connector_state, *new_connector_state; > > > > > int i, ret; > > > > > unsigned connectors_mask = 0; > > > > > @@ -984,7 +984,7 @@ crtc_needs_disable(struct drm_crtc_state *old_state, > > > > > static void > > > > > disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > > > > > { > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *old_conn_state, *new_conn_state; > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *old_crtc_state, *new_crtc_state; > > > > > @@ -1173,7 +1173,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > > > > > { > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *new_crtc_state; > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *new_conn_state; > > > > > int i; > > > > > > > > > > @@ -1294,7 +1294,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *old_crtc_state; > > > > > struct drm_crtc_state *new_crtc_state; > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *new_conn_state; > > > > > int i; > > > > > > > > > > @@ -1384,7 +1384,7 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev, > > > > > struct drm_atomic_state *state, > > > > > bool pre_swap) > > > > > { > > > > > - struct drm_plane *plane; > > > > > + struct drm_plane __maybe_unused *plane; > > > > > struct drm_plane_state *new_plane_state; > > > > > int i, ret; > > > > > > > > > > @@ -1431,7 +1431,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, > > > > > struct drm_atomic_state *old_state) > > > > > { > > > > > struct drm_crtc *crtc; > > > > > - struct drm_crtc_state *old_crtc_state, *new_crtc_state; > > > > > + struct drm_crtc_state __maybe_unused *old_crtc_state, *new_crtc_state; > > > > > int i, ret; > > > > > unsigned crtc_mask = 0; > > > > > > > > > > @@ -1621,7 +1621,7 @@ static void commit_work(struct work_struct *work) > > > > > int drm_atomic_helper_async_check(struct drm_device *dev, > > > > > struct drm_atomic_state *state) > > > > > { > > > > > - struct drm_crtc *crtc; > > > > > + struct drm_crtc __maybe_unused *crtc; > > > > > struct drm_crtc_state *crtc_state; > > > > > struct drm_plane *plane = NULL; > > > > > struct drm_plane_state *old_plane_state = NULL; > > > > > @@ -1982,9 +1982,9 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, > > > > > { > > > > > struct drm_crtc *crtc; > > > > > struct drm_crtc_state *old_crtc_state, *new_crtc_state; > > > > > - struct drm_connector *conn; > > > > > + struct drm_connector __maybe_unused *conn; > > > > > struct drm_connector_state *old_conn_state, *new_conn_state; > > > > > - struct drm_plane *plane; > > > > > + struct drm_plane __maybe_unused *plane; > > > > > struct drm_plane_state *old_plane_state, *new_plane_state; > > > > > struct drm_crtc_commit *commit; > > > > > int i, ret; > > > > > @@ -2214,7 +2214,7 @@ EXPORT_SYMBOL(drm_atomic_helper_fake_vblank); > > > > > */ > > > > > void drm_atomic_helper_commit_hw_done(struct drm_atomic_state *old_state) > > > > > { > > > > > - struct drm_crtc *crtc; > > > > > + struct drm_crtc __maybe_unused *crtc; > > > > > struct drm_crtc_state *old_crtc_state, *new_crtc_state; > > > > > struct drm_crtc_commit *commit; > > > > > int i; > > > > > @@ -2300,7 +2300,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done); > > > > > int drm_atomic_helper_prepare_planes(struct drm_device *dev, > > > > > struct drm_atomic_state *state) > > > > > { > > > > > - struct drm_connector *connector; > > > > > + struct drm_connector __maybe_unused *connector; > > > > > struct drm_connector_state *new_conn_state; > > > > > struct drm_plane *plane; > > > > > struct drm_plane_state *new_plane_state; > > > > > @@ -2953,9 +2953,9 @@ int drm_atomic_helper_disable_all(struct drm_device *dev, > > > > > { > > > > > struct drm_atomic_state *state; > > > > > struct drm_connector_state *conn_state; > > > > > - struct drm_connector *conn; > > > > > + struct drm_connector __maybe_unused *conn; > > > > > struct drm_plane_state *plane_state; > > > > > - struct drm_plane *plane; > > > > > + struct drm_plane __maybe_unused *plane; > > > > > struct drm_crtc_state *crtc_state; > > > > > struct drm_crtc *crtc; > > > > > int ret, i; > > > > > @@ -3199,11 +3199,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, > > > > > { > > > > > int i, ret; > > > > > struct drm_plane *plane; > > > > > - struct drm_plane_state *new_plane_state; > > > > > + struct drm_plane_state __maybe_unused *new_plane_state; > > > > > struct drm_connector *connector; > > > > > - struct drm_connector_state *new_conn_state; > > > > > + struct drm_connector_state __maybe_unused *new_conn_state; > > > > > struct drm_crtc *crtc; > > > > > - struct drm_crtc_state *new_crtc_state; > > > > > + struct drm_crtc_state __maybe_unused *new_crtc_state; > > > > > > > > > > state->acquire_ctx = ctx; > > > > > > > > > > -- > > > > > 2.15.0 > > > > > > > > > > _______________________________________________ > > > > > dri-devel mailing list > > > > > dri-devel@lists.freedesktop.org > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > > > > > -- > > > > Ville Syrjälä > > > > Intel > > > > -- > > Ville Syrjälä > > Intel -- Ville Syrjälä Intel