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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 5FC6EC31E58 for ; Mon, 17 Jun 2019 09:24:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3686A20820 for ; Mon, 17 Jun 2019 09:24:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XHYdaJk5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3686A20820 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LUwcv8YppBnarnsG+w2Yx5ozuI19IHSXoz/AghthFM4=; b=XHYdaJk59TVapq T972fWcl5MuEcgf57c2elZT5a2vIBBLn5Js9DznJ/0pFlcdXnBvtFwdATbW/kfQ9lyJG1k26iwblK xSSkjRE2ZTkXDcyrYb2E2gNJ0Q4UvT0aTewjRG1E95LKhMc2eTcZKWvFoc+vJjbA8w2Ei3KAYcBpZ FrGXmcWaZPo3XqBm5MbLxwH1jjRha9mBcgSE/YKQz3Qc/tYpmSGYuaw3rB9nELwQL/Z86jtZJkrcW kWX4Gu0rBZYuHLUD7+lPEHwbcb86/lZ9woCULFZTa9rewrID2f7+YGEdDoyDZcUZ9WwJ02jBuIaxS ZF6v4vSMfjLZ6SFylt2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hcnse-0001Uz-Na; Mon, 17 Jun 2019 09:24:48 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hcnsa-0001UM-TW for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 09:24:46 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jun 2019 02:24:44 -0700 X-ExtLoop1: 1 Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.150]) by fmsmga001.fm.intel.com with ESMTP; 17 Jun 2019 02:24:41 -0700 From: Jani Nikula To: Maxime Ripard Subject: Re: [PATCH v4 02/12] drm/client: Restrict the plane_state scope In-Reply-To: <20190614141211.rl7ihqgzllcai634@flea> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <4f6344cb770047cf5808791d849bbc0cbd330e54.1560514379.git-series.maxime.ripard@bootlin.com> <87wohouz90.fsf@intel.com> <20190614141211.rl7ihqgzllcai634@flea> Date: Mon, 17 Jun 2019 12:27:37 +0300 Message-ID: <87a7egv9x2.fsf@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190617_022444_965478_4C753E42 X-CRM114-Status: GOOD ( 19.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eben@raspberrypi.org, David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org, Paul Kocialkowski , Sean Paul , Thomas Petazzoni , Daniel Vetter , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 14 Jun 2019, Maxime Ripard wrote: > Hi Jani, > > On Fri, Jun 14, 2019 at 03:28:59PM +0300, Jani Nikula wrote: >> On Fri, 14 Jun 2019, Maxime Ripard wrote: >> > The drm_client_modeset_commit_atomic function uses two times the >> > plane_state variable in inner blocks of code, but the variable has a scope >> > global to this function. >> > >> > This will lead to inadvertent devs to reuse the variable in the second >> > block with the value left by the first, without any warning from the >> > compiler since value would have been initialized. >> > >> > Fix this by moving the variable declaration to the proper scope. >> >> This is an improvement, but I'd consider renaming also to not shadow >> variables. >> >> > Signed-off-by: Maxime Ripard >> > --- >> > drivers/gpu/drm/drm_client_modeset.c | 5 ++++- >> > 1 file changed, 4 insertions(+), 1 deletion(-) >> > >> > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c >> > index 006bf7390e7d..8264c3a732b0 100644 >> > --- a/drivers/gpu/drm/drm_client_modeset.c >> > +++ b/drivers/gpu/drm/drm_client_modeset.c >> > @@ -861,7 +861,6 @@ EXPORT_SYMBOL(drm_client_panel_rotation); >> > static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active) >> > { >> > struct drm_device *dev = client->dev; >> > - struct drm_plane_state *plane_state; >> > struct drm_plane *plane; >> > struct drm_atomic_state *state; >> > struct drm_modeset_acquire_ctx ctx; >> > @@ -879,6 +878,8 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool >> > state->acquire_ctx = &ctx; >> > retry: >> > drm_for_each_plane(plane, dev) { >> > + struct drm_plane_state *plane_state; >> > + >> > plane_state = drm_atomic_get_plane_state(state, plane); >> > if (IS_ERR(plane_state)) { >> > ret = PTR_ERR(plane_state); >> > @@ -901,6 +902,8 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool >> > unsigned int rotation; >> > >> > if (drm_client_panel_rotation(mode_set, &rotation)) { >> > + struct drm_plane_state *plane_state; >> > + > > That's not super clear from that patch, but this variable will not > shadow the first one. > > The code layout is pretty much this one: > > loop () { > struct drm_plane_state *plane_state; > > [...] > } > > loop () { > loop () { > struct drm_plane_state *plane_state; > > [...] > } > } > > so the shadowing doesn't exist Indeed, sorry for the noise. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v4 02/12] drm/client: Restrict the plane_state scope Date: Mon, 17 Jun 2019 12:27:37 +0300 Message-ID: <87a7egv9x2.fsf@intel.com> References: <4f6344cb770047cf5808791d849bbc0cbd330e54.1560514379.git-series.maxime.ripard@bootlin.com> <87wohouz90.fsf@intel.com> <20190614141211.rl7ihqgzllcai634@flea> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD01D89198 for ; Mon, 17 Jun 2019 09:24:44 +0000 (UTC) In-Reply-To: <20190614141211.rl7ihqgzllcai634@flea> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maxime Ripard Cc: eben@raspberrypi.org, David Airlie , dri-devel@lists.freedesktop.org, Paul Kocialkowski , Sean Paul , Thomas Petazzoni , Daniel Vetter , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAxNCBKdW4gMjAxOSwgTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290bGlu LmNvbT4gd3JvdGU6Cj4gSGkgSmFuaSwKPgo+IE9uIEZyaSwgSnVuIDE0LCAyMDE5IGF0IDAzOjI4 OjU5UE0gKzAzMDAsIEphbmkgTmlrdWxhIHdyb3RlOgo+PiBPbiBGcmksIDE0IEp1biAyMDE5LCBN YXhpbWUgUmlwYXJkIDxtYXhpbWUucmlwYXJkQGJvb3RsaW4uY29tPiB3cm90ZToKPj4gPiBUaGUg ZHJtX2NsaWVudF9tb2Rlc2V0X2NvbW1pdF9hdG9taWMgZnVuY3Rpb24gdXNlcyB0d28gdGltZXMg dGhlCj4+ID4gcGxhbmVfc3RhdGUgdmFyaWFibGUgaW4gaW5uZXIgYmxvY2tzIG9mIGNvZGUsIGJ1 dCB0aGUgdmFyaWFibGUgaGFzIGEgc2NvcGUKPj4gPiBnbG9iYWwgdG8gdGhpcyBmdW5jdGlvbi4K Pj4gPgo+PiA+IFRoaXMgd2lsbCBsZWFkIHRvIGluYWR2ZXJ0ZW50IGRldnMgdG8gcmV1c2UgdGhl IHZhcmlhYmxlIGluIHRoZSBzZWNvbmQKPj4gPiBibG9jayB3aXRoIHRoZSB2YWx1ZSBsZWZ0IGJ5 IHRoZSBmaXJzdCwgd2l0aG91dCBhbnkgd2FybmluZyBmcm9tIHRoZQo+PiA+IGNvbXBpbGVyIHNp bmNlIHZhbHVlIHdvdWxkIGhhdmUgYmVlbiBpbml0aWFsaXplZC4KPj4gPgo+PiA+IEZpeCB0aGlz IGJ5IG1vdmluZyB0aGUgdmFyaWFibGUgZGVjbGFyYXRpb24gdG8gdGhlIHByb3BlciBzY29wZS4K Pj4KPj4gVGhpcyBpcyBhbiBpbXByb3ZlbWVudCwgYnV0IEknZCBjb25zaWRlciByZW5hbWluZyBh bHNvIHRvIG5vdCBzaGFkb3cKPj4gdmFyaWFibGVzLgo+Pgo+PiA+IFNpZ25lZC1vZmYtYnk6IE1h eGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRAYm9vdGxpbi5jb20+Cj4+ID4gLS0tCj4+ID4gIGRy aXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50X21vZGVzZXQuYyB8IDUgKysrKy0KPj4gPiAgMSBmaWxl IGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+PiA+Cj4+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50X21vZGVzZXQuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fY2xpZW50X21vZGVzZXQuYwo+PiA+IGluZGV4IDAwNmJmNzM5MGU3ZC4uODI2NGMz YTczMmIwIDEwMDY0NAo+PiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50X21vZGVz ZXQuYwo+PiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50X21vZGVzZXQuYwo+PiA+ IEBAIC04NjEsNyArODYxLDYgQEAgRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X3BhbmVsX3JvdGF0 aW9uKTsKPj4gPiAgc3RhdGljIGludCBkcm1fY2xpZW50X21vZGVzZXRfY29tbWl0X2F0b21pYyhz dHJ1Y3QgZHJtX2NsaWVudF9kZXYgKmNsaWVudCwgYm9vbCBhY3RpdmUpCj4+ID4gIHsKPj4gPiAg CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjbGllbnQtPmRldjsKPj4gPiAtCXN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwo+PiA+ICAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7 Cj4+ID4gIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Cj4+ID4gIAlzdHJ1Y3QgZHJt X21vZGVzZXRfYWNxdWlyZV9jdHggY3R4Owo+PiA+IEBAIC04NzksNiArODc4LDggQEAgc3RhdGlj IGludCBkcm1fY2xpZW50X21vZGVzZXRfY29tbWl0X2F0b21pYyhzdHJ1Y3QgZHJtX2NsaWVudF9k ZXYgKmNsaWVudCwgYm9vbAo+PiA+ICAJc3RhdGUtPmFjcXVpcmVfY3R4ID0gJmN0eDsKPj4gPiAg cmV0cnk6Cj4+ID4gIAlkcm1fZm9yX2VhY2hfcGxhbmUocGxhbmUsIGRldikgewo+PiA+ICsJCXN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwo+PiA+ICsKPj4gPiAgCQlwbGFuZV9z dGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7Cj4+ID4gIAkJ aWYgKElTX0VSUihwbGFuZV9zdGF0ZSkpIHsKPj4gPiAgCQkJcmV0ID0gUFRSX0VSUihwbGFuZV9z dGF0ZSk7Cj4+ID4gQEAgLTkwMSw2ICs5MDIsOCBAQCBzdGF0aWMgaW50IGRybV9jbGllbnRfbW9k ZXNldF9jb21taXRfYXRvbWljKHN0cnVjdCBkcm1fY2xpZW50X2RldiAqY2xpZW50LCBib29sCj4+ ID4gIAkJdW5zaWduZWQgaW50IHJvdGF0aW9uOwo+PiA+Cj4+ID4gIAkJaWYgKGRybV9jbGllbnRf cGFuZWxfcm90YXRpb24obW9kZV9zZXQsICZyb3RhdGlvbikpIHsKPj4gPiArCQkJc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Cj4+ID4gKwo+Cj4gVGhhdCdzIG5vdCBzdXBlciBj bGVhciBmcm9tIHRoYXQgcGF0Y2gsIGJ1dCB0aGlzIHZhcmlhYmxlIHdpbGwgbm90Cj4gc2hhZG93 IHRoZSBmaXJzdCBvbmUuCj4KPiBUaGUgY29kZSBsYXlvdXQgaXMgcHJldHR5IG11Y2ggdGhpcyBv bmU6Cj4KPiBsb29wICgpIHsKPiAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl Owo+Cj4gICBbLi4uXQo+IH0KPgo+IGxvb3AgKCkgewo+ICAgbG9vcCAoKSB7Cj4gICAgIHN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwo+Cj4gICAgIFsuLi5dCj4gICB9Cj4gfQo+ Cj4gc28gdGhlIHNoYWRvd2luZyBkb2Vzbid0IGV4aXN0CgpJbmRlZWQsIHNvcnJ5IGZvciB0aGUg bm9pc2UuCgpCUiwKSmFuaS4KCgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBH cmFwaGljcyBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVs