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 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 3BCC5C54E71 for ; Tue, 19 Mar 2024 18:11:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 587D010E499; Tue, 19 Mar 2024 18:11:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mSlw9nc0"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1884B10E499 for ; Tue, 19 Mar 2024 18:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710871896; x=1742407896; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=X0crnYytFbsd8Clx7dU+qTJ/narfbG0arFZKRd0Lkr8=; b=mSlw9nc0B94B8x+BwoYGS2JdLOsFdUQjurcUD1ouUxBFdsL5uhbVarOC cUiN8zHU3ONMnlH8vBGSrL2HghjDl7JXvav0qT305lJBZBMfoPmN0zKgx cwN0j1jx1FmB1DHMzOAst2vMp2YE6EJbxcnzDV249OZSZBMDgNj9QgJHG TtEB6zHpPnHCsUwV3UpzDhOY7ZR/RVT/ciKZei32gvJiVh1NiIwgrKHcK nC88gskN5OBoSZDuT1wK4MFXISH7cIEYdKWwvBFxnd8Apwl9FV8nM1u0D UF3vNbxSLPONijkxir0J04tTZEv1DkYdSrA6FPnhNxLRBZHQS93eLGxPp A==; X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="5699202" X-IronPort-AV: E=Sophos;i="6.07,137,1708416000"; d="scan'208";a="5699202" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2024 11:11:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="827782237" X-IronPort-AV: E=Sophos;i="6.07,137,1708416000"; d="scan'208";a="827782237" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga001.jf.intel.com with SMTP; 19 Mar 2024 11:11:30 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 19 Mar 2024 20:11:29 +0200 Date: Tue, 19 Mar 2024 20:11:29 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [PATCH 1/2] drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode() Message-ID: References: <20240319092443.15769-1-ville.syrjala@linux.intel.com> <87sf0mo9hx.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87sf0mo9hx.fsf@intel.com> X-Patchwork-Hint: comment 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 Tue, Mar 19, 2024 at 11:29:14AM +0200, Jani Nikula wrote: > On Tue, 19 Mar 2024, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > If we have no VBT, or the VBT didn't declare the encoder > > in question, we won't have the 'devdata' for the encoder. > > Instead of oopsing just bail early. > > > > We won't be able to tell whether the port is DP++ or not, > > but so be it. > > > > Cc: stable@vger.kernel.org > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10464 > > Signed-off-by: Ville Syrjälä > > --- > > drivers/gpu/drm/i915/display/intel_bios.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > > index c7841b3eede8..c13a98431a7b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_bios.c > > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > > @@ -3458,6 +3458,9 @@ bool intel_bios_encoder_supports_dp_dual_mode(const struct intel_bios_encoder_da > > { > > const struct child_device_config *child = &devdata->child; > > The above oopses already. Nope. It's just taking the address of the thing. > > BR, > Jani. > > > > > + if (!devdata) > > + return false; > > + > > if (!intel_bios_encoder_supports_dp(devdata) || > > !intel_bios_encoder_supports_hdmi(devdata)) > > return false; > > -- > Jani Nikula, Intel -- Ville Syrjälä Intel