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 AB443D72367 for ; Fri, 23 Jan 2026 09:49:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42ADC10E29B; Fri, 23 Jan 2026 09:49:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="TCmhjLV+"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C37D10E29B for ; Fri, 23 Jan 2026 09:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769161785; x=1800697785; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=RfLuHYk04/4GckoqujA/xaHlipjVbCRTzrrcT4ybQpo=; b=TCmhjLV+8NnlgBEifEtdPXrvvmsz8qx2h+86b4wvxUllvaIO/cczD1zx 5xlMAoC1RJ6dCDQg9PnO4SbD5BGnreGA9q8lB913ZRHU+pnAkcojDBDSj hSY1fft2GGFoGO7NHCzuu1F9jhrTMuS5OeU6l/RMB/ZAFDqwtL6jT/ACe YZ6+jIkw+dJY8JWT01RMU0TegnSDIe7EHtXplDOPRBLrIWYWnqpDY24GC 2iRpsOyIn6XFPHan/kP152h2LrBTK7dIjxbPZyhg6N/WXb6g7RkpHSZj+ 6VSVj7ZCXXODP6rv+leypZi4JOFY38bpHFsL7wkIJBf1ODmiVqyMgbYB5 Q==; X-CSE-ConnectionGUID: SOBh+ZX0SkObymRtK5H77A== X-CSE-MsgGUID: ey6YUxPzRdu5Lh7JKQesVQ== X-IronPort-AV: E=McAfee;i="6800,10657,11679"; a="74265853" X-IronPort-AV: E=Sophos;i="6.21,248,1763452800"; d="scan'208";a="74265853" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2026 01:49:45 -0800 X-CSE-ConnectionGUID: W8ghNlKrSBadpAPnpOyESA== X-CSE-MsgGUID: LPUeCWutQlyVNtqWahvvKA== X-ExtLoop1: 1 Received: from aotchere-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.2]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2026 01:49:42 -0800 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] drm/i915/display: PORT_NONE is not valid In-Reply-To: <20260122213940.64352-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: <20260122213940.64352-2-jonathan.cavitt@intel.com> Date: Fri, 23 Jan 2026 11:49:39 +0200 Message-ID: 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 Thu, 22 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. > > Signed-off-by: Jonathan Cavitt > --- > 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..250f31bb5938 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)), That's a bunch of negatives put together, making one's head spin, but the innermost part is supposed to be checking if the port is valid, i.e. BIT(port) is set in ->port_mask. This makes "port < 0" another condition for the port being valid, which is not the case. The port is only valid if port >= 0 && DISPLAY_RUNTIME_INFO(display)->port_mask & BIT(port) BR, Jani. > "Platform does not support port %c\n", port_name(port)); > } -- Jani Nikula, Intel