Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AA7CFF3381B for ; Tue, 17 Mar 2026 09:28:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C52710E494; Tue, 17 Mar 2026 09:28:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="D8ErN3yD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42C4B10E494 for ; Tue, 17 Mar 2026 09:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773739715; x=1805275715; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=cky0pAlVXZgMbl72MBTJ4chaKilO7OYf7pcnadCOAm0=; b=D8ErN3yDRdyHMazdbnOv/+eKp+ftx2tdeDHqQ6neamcAfoid46/T/bof ccLimOq3mbqVLWKKtnRZy/D3jLVH5+H57StVmC/NXJH/bL6WFv7D4IK+k htkkcgxVEyK95dQvKBsT8XuJMXmkhUFaZhJRnjTMBJgDI9wW9oQmAGjwk NbJpMLPhI1tNsBRZtwGkfE62xH/XpcjG71plhiJyMn+QNXhKhVO4zuZbM YMrO0ntnF2msvqJ0NU8s0lJnqrCee9mqUIPDgx684YptuXa8LH79Moco7 gQoSh0iVodv/feubn7pi0AofIgkH93GmdU7gHscGQX0jZjbUvUyLsKYLq g==; X-CSE-ConnectionGUID: JSo3GTQvSFyUpPvAjDKLJw== X-CSE-MsgGUID: 56FFYBcDSfSeTyj9ebPKNw== X-IronPort-AV: E=McAfee;i="6800,10657,11731"; a="100222888" X-IronPort-AV: E=Sophos;i="6.23,124,1770624000"; d="scan'208";a="100222888" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2026 02:28:35 -0700 X-CSE-ConnectionGUID: SouphM8AQo+yGfCoksx5nA== X-CSE-MsgGUID: 1fetBOXLS/+R71kWJ3mG7Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,124,1770624000"; d="scan'208";a="216583214" Received: from krybak-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.32]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2026 02:28:33 -0700 From: Jani Nikula To: Jonathan Cavitt , intel-gfx@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com Subject: Re: [PATCH v2] drm/i915/display: PORT_NONE is not valid In-Reply-To: <20260123152121.7042-2-jonathan.cavitt@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland References: <20260123152121.7042-2-jonathan.cavitt@intel.com> Date: Tue, 17 Mar 2026 11:28:29 +0200 Message-ID: <6597430e6cbeedc11ce9d79967408aa917dfc1fc@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 23 Jan 2026, Jonathan Cavitt wrote: > Static analysis issue: > > In assert_port_valid, add a check to ensure port != PORT_NONE, as that > is not a valid port. The check must be explicit to prevent a bad bit > shift operation in the general case via short-circuiting. It's not > likely this will ever come up in a real use case, but it's at least > worth guarding against. > > It would probably also be pertinent to modify the behavior of the > port_name function to correctly print PORT_NONE in this case, as > currently the port would be reported as 'port @' by the debugger. But > that should be done separately, and given port_name is mostly just a > debug printing helper function anyways, fixing it is a low priority. > > v2: > - Conditional check was backwards. Fix it. (Jani) > > Signed-off-by: Jonathan Cavitt > Cc: Jani Nikula Thanks for the patch, pushed to drm-intel-next. BR, Jani. > --- > drivers/gpu/drm/i915/display/intel_display.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 7491e00e3858..0c3bb3f98ee4 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7828,7 +7828,8 @@ static bool intel_ddi_crt_present(struct intel_display *display) > > bool assert_port_valid(struct intel_display *display, enum port port) > { > - return !drm_WARN(display->drm, !(DISPLAY_RUNTIME_INFO(display)->port_mask & BIT(port)), > + return !drm_WARN(display->drm, > + !(port >= 0 && DISPLAY_RUNTIME_INFO(display)->port_mask & BIT(port)), > "Platform does not support port %c\n", port_name(port)); > } -- Jani Nikula, Intel