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, URIBL_BLOCKED,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 F1A20C35653 for ; Fri, 21 Feb 2020 11:31:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D11BA208C4 for ; Fri, 21 Feb 2020 11:31:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D11BA208C4 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 771026E282; Fri, 21 Feb 2020 11:31:03 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id F05CA6E282 for ; Fri, 21 Feb 2020 11:31:01 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2020 03:31:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,468,1574150400"; d="scan'208";a="229824548" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga008.jf.intel.com with SMTP; 21 Feb 2020 03:30:58 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 21 Feb 2020 13:30:57 +0200 Date: Fri, 21 Feb 2020 13:30:57 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Kees Cook Message-ID: <20200221113057.GL13686@intel.com> References: <202002201602.92CADF7D@keescook> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <202002201602.92CADF7D@keescook> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Distribute switch variables for initialization X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alexander Potapenko Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" T24gVGh1LCBGZWIgMjAsIDIwMjAgYXQgMDQ6MDU6MTdQTSAtMDgwMCwgS2VlcyBDb29rIHdyb3Rl Ogo+IFZhcmlhYmxlcyBkZWNsYXJlZCBpbiBhIHN3aXRjaCBzdGF0ZW1lbnQgYmVmb3JlIGFueSBj YXNlIHN0YXRlbWVudHMKPiBjYW5ub3QgYmUgYXV0b21hdGljYWxseSBpbml0aWFsaXplZCB3aXRo IGNvbXBpbGVyIGluc3RydW1lbnRhdGlvbiAoYXMKPiB0aGV5IGFyZSBub3QgcGFydCBvZiBhbnkg ZXhlY3V0aW9uIGZsb3cpLiBXaXRoIEdDQydzIHByb3Bvc2VkIGF1dG9tYXRpYwo+IHN0YWNrIHZh cmlhYmxlIGluaXRpYWxpemF0aW9uIGZlYXR1cmUsIHRoaXMgdHJpZ2dlcnMgYSB3YXJuaW5nIChh bmQgdGhleQo+IGRvbid0IGdldCBpbml0aWFsaXplZCkuIENsYW5nJ3MgYXV0b21hdGljIHN0YWNr IHZhcmlhYmxlIGluaXRpYWxpemF0aW9uCj4gKHZpYSBDT05GSUdfSU5JVF9TVEFDS19BTEw9eSkg ZG9lc24ndCB0aHJvdyBhIHdhcm5pbmcsIGJ1dCBpdCBhbHNvCj4gZG9lc24ndCBpbml0aWFsaXpl IHN1Y2ggdmFyaWFibGVzWzFdLiBOb3RlIHRoYXQgdGhlc2Ugd2FybmluZ3MgKG9yIHNpbGVudAo+ IHNraXBwaW5nKSBoYXBwZW4gYmVmb3JlIHRoZSBkZWFkLXN0b3JlIGVsaW1pbmF0aW9uIG9wdGlt aXphdGlvbiBwaGFzZSwKPiBzbyBldmVuIHdoZW4gdGhlIGF1dG9tYXRpYyBpbml0aWFsaXphdGlv bnMgYXJlIGxhdGVyIGVsaWRlZCBpbiBmYXZvciBvZgo+IGRpcmVjdCBpbml0aWFsaXphdGlvbnMs IHRoZSB3YXJuaW5ncyByZW1haW4uCj4gCj4gVG8gYXZvaWQgdGhlc2UgcHJvYmxlbXMsIG1vdmUg c3VjaCB2YXJpYWJsZXMgaW50byB0aGUgImNhc2UiIHdoZXJlCj4gdGhleSdyZSB1c2VkIG9yIGxp ZnQgdGhlbSB1cCBpbnRvIHRoZSBtYWluIGZ1bmN0aW9uIGJvZHkuCj4gCj4gZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmM6IEluIGZ1bmN0aW9uIOKAmGNoZWNrX2Rp Z2l0YWxfcG9ydF9jb25mbGljdHPigJk6Cj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmM6MTI5NjM6MTc6IHdhcm5pbmc6IHN0YXRlbWVudCB3aWxsIG5ldmVyIGJl IGV4ZWN1dGVkIFstV3N3aXRjaC11bnJlYWNoYWJsZV0KPiAxMjk2MyB8ICAgIHVuc2lnbmVkIGlu dCBwb3J0X21hc2s7Cj4gICAgICAgfCAgICAgICAgICAgICAgICAgXn5+fn5+fn5+Cj4gCj4gZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYzogSW4gZnVuY3Rpb24g4oCYdmx2X2dldF9maWZv X3NpemXigJk6Cj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYzo0NzQ6Nzogd2Fybmlu Zzogc3RhdGVtZW50IHdpbGwgbmV2ZXIgYmUgZXhlY3V0ZWQgWy1Xc3dpdGNoLXVucmVhY2hhYmxl XQo+ICAgNDc0IHwgICB1MzIgZHNwYXJiLCBkc3BhcmIyLCBkc3BhcmIzOwo+ICAgICAgIHwgICAg ICAgXn5+fn5+Cj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYzogSW4gZnVuY3Rpb24g 4oCYdmx2X2F0b21pY191cGRhdGVfZmlmb+KAmToKPiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jOjE5OTc6Nzogd2FybmluZzogc3RhdGVtZW50IHdpbGwgbmV2ZXIgYmUgZXhlY3V0ZWQg Wy1Xc3dpdGNoLXVucmVhY2hhYmxlXQo+ICAxOTk3IHwgICB1MzIgZHNwYXJiLCBkc3BhcmIyLCBk c3BhcmIzOwo+ICAgICAgIHwgICAgICAgXn5+fn5+Cj4gCj4gWzFdIGh0dHBzOi8vYnVncy5sbHZt Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5MTYKPiAKPiBTaWduZWQtb2ZmLWJ5OiBLZWVzIENvb2sg PGtlZXNjb29rQGNocm9taXVtLm9yZz4KPiAtLS0KPiB2MjogcmVtb3ZlIHBvcnRfbWFzayBlbnRp cmVseSAoVmlsbGUgU3lyasOkbMOkKQo+IHYxOiBodHRwczovL2xvcmUua2VybmVsLm9yZy9sa21s LzIwMjAwMjIwMDYyMjU4LjY4ODU0LTEta2Vlc2Nvb2tAY2hyb21pdW0ub3JnCj4gLS0tCj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgNyArKy0tLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgICAgICAgIHwgNCArKy0tCj4g IDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQo+IAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggMDY0 ZGQ5OWJiYzQ5Li41ZjhjNjE5MzJlODIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0xMjk2MCw3ICsxMjk2MCw2IEBAIHN0YXRpYyBi b29sIGNoZWNrX2RpZ2l0YWxfcG9ydF9jb25mbGljdHMoc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUpCj4gIAkJV0FSTl9PTighY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKPiAgCj4gIAkJ c3dpdGNoIChlbmNvZGVyLT50eXBlKSB7Cj4gLQkJCXVuc2lnbmVkIGludCBwb3J0X21hc2s7Cj4g IAkJY2FzZSBJTlRFTF9PVVRQVVRfRERJOgo+ICAJCQlpZiAoV0FSTl9PTighSEFTX0RESSh0b19p OTE1KGRldikpKSkKPiAgCQkJCWJyZWFrOwo+IEBAIC0xMjk2OCwxMyArMTI5NjcsMTEgQEAgc3Rh dGljIGJvb2wgY2hlY2tfZGlnaXRhbF9wb3J0X2NvbmZsaWN0cyhzdHJ1Y3QgaW50ZWxfYXRvbWlj X3N0YXRlICpzdGF0ZSkKPiAgCQljYXNlIElOVEVMX09VVFBVVF9EUDoKPiAgCQljYXNlIElOVEVM X09VVFBVVF9IRE1JOgo+ICAJCWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKPiAtCQkJcG9ydF9tYXNr ID0gMSA8PCBlbmNvZGVyLT5wb3J0Owo+IC0KPiAgCQkJLyogdGhlIHNhbWUgcG9ydCBtdXN0bid0 IGFwcGVhciBtb3JlIHRoYW4gb25jZSAqLwo+IC0JCQlpZiAodXNlZF9wb3J0cyAmIHBvcnRfbWFz aykKPiArCQkJaWYgKHVzZWRfcG9ydHMgJiBCSVQoZW5jb2Rlci0+cG9ydCkpCj4gIAkJCQlyZXQg PSBmYWxzZTsKPiAgCj4gLQkJCXVzZWRfcG9ydHMgfD0gcG9ydF9tYXNrOwo+ICsJCQl1c2VkX3Bv cnRzIHw9IEJJVChlbmNvZGVyLT5wb3J0KTsKClRoYW5rcy4gTG9va3MgZ29vZC4KClJldmlld2Vk LWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgoKPiAg CQkJYnJlYWs7Cj4gIAkJY2FzZSBJTlRFTF9PVVRQVVRfRFBfTVNUOgo+ICAJCQl1c2VkX21zdF9w b3J0cyB8PQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGluZGV4IGJkMmQzMGVjYzAzMC4uMTdk ODgzMzc4N2M0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gQEAgLTQ2OSw5ICs0Njks OSBAQCBzdGF0aWMgdm9pZCB2bHZfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKPiAgCXN0cnVjdCB2bHZfZmlmb19zdGF0ZSAqZmlmb19zdGF0ZSA9ICZj cnRjX3N0YXRlLT53bS52bHYuZmlmb19zdGF0ZTsKPiAgCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+ cGlwZTsKPiAgCWludCBzcHJpdGUwX3N0YXJ0LCBzcHJpdGUxX3N0YXJ0Owo+ICsJdTMyIGRzcGFy YiwgZHNwYXJiMiwgZHNwYXJiMzsKPiAgCj4gIAlzd2l0Y2ggKHBpcGUpIHsKPiAtCQl1MzIgZHNw YXJiLCBkc3BhcmIyLCBkc3BhcmIzOwo+ICAJY2FzZSBQSVBFX0E6Cj4gIAkJZHNwYXJiID0gSTkx NV9SRUFEKERTUEFSQik7Cj4gIAkJZHNwYXJiMiA9IEk5MTVfUkVBRChEU1BBUkIyKTsKPiBAQCAt MTk2OSw2ICsxOTY5LDcgQEAgc3RhdGljIHZvaWQgdmx2X2F0b21pY191cGRhdGVfZmlmbyhzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKPiAgCWNvbnN0IHN0cnVjdCB2bHZfZmlmb19z dGF0ZSAqZmlmb19zdGF0ZSA9Cj4gIAkJJmNydGNfc3RhdGUtPndtLnZsdi5maWZvX3N0YXRlOwo+ ICAJaW50IHNwcml0ZTBfc3RhcnQsIHNwcml0ZTFfc3RhcnQsIGZpZm9fc2l6ZTsKPiArCXUzMiBk c3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7Cj4gIAo+ICAJaWYgKCFjcnRjX3N0YXRlLT5maWZvX2No YW5nZWQpCj4gIAkJcmV0dXJuOwo+IEBAIC0xOTk0LDcgKzE5OTUsNiBAQCBzdGF0aWMgdm9pZCB2 bHZfYXRvbWljX3VwZGF0ZV9maWZvKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ ICAJc3Bpbl9sb2NrKCZ1bmNvcmUtPmxvY2spOwo+ICAKPiAgCXN3aXRjaCAoY3J0Yy0+cGlwZSkg ewo+IC0JCXUzMiBkc3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7Cj4gIAljYXNlIFBJUEVfQToKPiAg CQlkc3BhcmIgPSBpbnRlbF91bmNvcmVfcmVhZF9mdyh1bmNvcmUsIERTUEFSQik7Cj4gIAkJZHNw YXJiMiA9IGludGVsX3VuY29yZV9yZWFkX2Z3KHVuY29yZSwgRFNQQVJCMik7Cj4gLS0gCj4gMi4y MC4xCj4gCj4gCj4gLS0gCj4gS2VlcyBDb29rCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= 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, URIBL_BLOCKED,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 4B90BC35647 for ; Fri, 21 Feb 2020 11:31:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23FAA208C4 for ; Fri, 21 Feb 2020 11:31:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727448AbgBULbC (ORCPT ); Fri, 21 Feb 2020 06:31:02 -0500 Received: from mga01.intel.com ([192.55.52.88]:53292 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbgBULbC (ORCPT ); Fri, 21 Feb 2020 06:31:02 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2020 03:31:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,468,1574150400"; d="scan'208";a="229824548" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga008.jf.intel.com with SMTP; 21 Feb 2020 03:30:58 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 21 Feb 2020 13:30:57 +0200 Date: Fri, 21 Feb 2020 13:30:57 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Kees Cook Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , intel-gfx@lists.freedesktop.org, Alexander Potapenko , linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Distribute switch variables for initialization Message-ID: <20200221113057.GL13686@intel.com> References: <202002201602.92CADF7D@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202002201602.92CADF7D@keescook> X-Patchwork-Hint: comment 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, Feb 20, 2020 at 04:05:17PM -0800, Kees Cook wrote: > Variables declared in a switch statement before any case statements > cannot be automatically initialized with compiler instrumentation (as > they are not part of any execution flow). With GCC's proposed automatic > stack variable initialization feature, this triggers a warning (and they > don't get initialized). Clang's automatic stack variable initialization > (via CONFIG_INIT_STACK_ALL=y) doesn't throw a warning, but it also > doesn't initialize such variables[1]. Note that these warnings (or silent > skipping) happen before the dead-store elimination optimization phase, > so even when the automatic initializations are later elided in favor of > direct initializations, the warnings remain. > > To avoid these problems, move such variables into the "case" where > they're used or lift them up into the main function body. > > drivers/gpu/drm/i915/display/intel_display.c: In function ‘check_digital_port_conflicts’: > drivers/gpu/drm/i915/display/intel_display.c:12963:17: warning: statement will never be executed [-Wswitch-unreachable] > 12963 | unsigned int port_mask; > | ^~~~~~~~~ > > drivers/gpu/drm/i915/intel_pm.c: In function ‘vlv_get_fifo_size’: > drivers/gpu/drm/i915/intel_pm.c:474:7: warning: statement will never be executed [-Wswitch-unreachable] > 474 | u32 dsparb, dsparb2, dsparb3; > | ^~~~~~ > drivers/gpu/drm/i915/intel_pm.c: In function ‘vlv_atomic_update_fifo’: > drivers/gpu/drm/i915/intel_pm.c:1997:7: warning: statement will never be executed [-Wswitch-unreachable] > 1997 | u32 dsparb, dsparb2, dsparb3; > | ^~~~~~ > > [1] https://bugs.llvm.org/show_bug.cgi?id=44916 > > Signed-off-by: Kees Cook > --- > v2: remove port_mask entirely (Ville Syrjälä) > v1: https://lore.kernel.org/lkml/20200220062258.68854-1-keescook@chromium.org > --- > drivers/gpu/drm/i915/display/intel_display.c | 7 ++----- > drivers/gpu/drm/i915/intel_pm.c | 4 ++-- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 064dd99bbc49..5f8c61932e82 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -12960,7 +12960,6 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state) > WARN_ON(!connector_state->crtc); > > switch (encoder->type) { > - unsigned int port_mask; > case INTEL_OUTPUT_DDI: > if (WARN_ON(!HAS_DDI(to_i915(dev)))) > break; > @@ -12968,13 +12967,11 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state) > case INTEL_OUTPUT_DP: > case INTEL_OUTPUT_HDMI: > case INTEL_OUTPUT_EDP: > - port_mask = 1 << encoder->port; > - > /* the same port mustn't appear more than once */ > - if (used_ports & port_mask) > + if (used_ports & BIT(encoder->port)) > ret = false; > > - used_ports |= port_mask; > + used_ports |= BIT(encoder->port); Thanks. Looks good. Reviewed-by: Ville Syrjälä > break; > case INTEL_OUTPUT_DP_MST: > used_mst_ports |= > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index bd2d30ecc030..17d8833787c4 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -469,9 +469,9 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state) > struct vlv_fifo_state *fifo_state = &crtc_state->wm.vlv.fifo_state; > enum pipe pipe = crtc->pipe; > int sprite0_start, sprite1_start; > + u32 dsparb, dsparb2, dsparb3; > > switch (pipe) { > - u32 dsparb, dsparb2, dsparb3; > case PIPE_A: > dsparb = I915_READ(DSPARB); > dsparb2 = I915_READ(DSPARB2); > @@ -1969,6 +1969,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, > const struct vlv_fifo_state *fifo_state = > &crtc_state->wm.vlv.fifo_state; > int sprite0_start, sprite1_start, fifo_size; > + u32 dsparb, dsparb2, dsparb3; > > if (!crtc_state->fifo_changed) > return; > @@ -1994,7 +1995,6 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, > spin_lock(&uncore->lock); > > switch (crtc->pipe) { > - u32 dsparb, dsparb2, dsparb3; > case PIPE_A: > dsparb = intel_uncore_read_fw(uncore, DSPARB); > dsparb2 = intel_uncore_read_fw(uncore, DSPARB2); > -- > 2.20.1 > > > -- > Kees Cook > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel