From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3B1F1E525; Mon, 1 Apr 2024 16:31:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711989068; cv=none; b=fgc4xkDJMswdPaF9rwEZCzAFqd+HhoK4TuroufOF5JeJzWSJpuUNyz675fAMIegDrxLuUr5NlqeQIt7nA5GmS4mdUQlu1P08bLxMjU+Dcfa6eeA8m2dncb4dUDuvRZrRnQFck5NfV1TlARwLWO0cYuKF+w9jV3vQPaMngIkmD/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711989068; c=relaxed/simple; bh=lMQ7g/8VeBCSK8j7ZzLrNEKOziJK2B8PleQxXqksBCo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sUSYVyLbqrlQgkc4J8SBSuHdsgMs/P/Rt4sMi1wY2QgA6mqJfDiHsj+HaEMaMmb+yj2m76v4V8N6MHSqGpH+WtSTzZsaSKhF0J5e2+ahheLWVlTWGYxJlRrfDnmUkzQSXfSGlzO6tGhUPrS/Sx/4zpfGs6PFjfokNeK717IF/xY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YLd+xQ7/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YLd+xQ7/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43A6BC433F1; Mon, 1 Apr 2024 16:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711989068; bh=lMQ7g/8VeBCSK8j7ZzLrNEKOziJK2B8PleQxXqksBCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YLd+xQ7/naM9VAHuj5+UwywB+sCFsHh+E5ScW6XmIIDmKDqnSiUJR5JHr33WjOzCg OXZvoTfi2NSfwxlYgGirmIrSV7P6P0UZk7pYbawFVDPA/SgpBCSxKBCVvD0WUQLIaG ZKJA6MW/fO8hSjuPaY6YupkWm4x72zl++A3I4yP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula , Rodrigo Vivi Subject: [PATCH 6.7 371/432] drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode() Date: Mon, 1 Apr 2024 17:45:58 +0200 Message-ID: <20240401152604.348853310@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152553.125349965@linuxfoundation.org> References: <20240401152553.125349965@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä commit 32e39bab59934bfd3f37097d4dd85ac5eb0fd549 upstream. 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ä Link: https://patchwork.freedesktop.org/patch/msgid/20240319092443.15769-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula (cherry picked from commit 26410896206342c8a80d2b027923e9ee7d33b733) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_bios.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -3321,6 +3321,9 @@ bool intel_bios_encoder_supports_dp_dual { const struct child_device_config *child = &devdata->child; + if (!devdata) + return false; + if (!intel_bios_encoder_supports_dp(devdata) || !intel_bios_encoder_supports_hdmi(devdata)) return false;