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 0A50FC04A6A for ; Thu, 3 Aug 2023 15:24:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 46BAC10E614; Thu, 3 Aug 2023 15:24:40 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C88A10E625 for ; Thu, 3 Aug 2023 15:24:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691076277; x=1722612277; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=U6+/2AUq5sf/goWyZvoinLaDEj3EbVGhdNawLSW7Kmg=; b=BkGpabP6485R/rwgG+f1V/si8NRApC+EXjDBG2F9MzgM9PZ2NK/bf4sQ TZbaW7Ub3gEewghkYGREfK8i9ofATzP1+V7fRSpORZwQCg6XJ840KhvS6 0aOb1mqxmvzMeOA169ZhlL/lfzbHHbAhObrr0SpqcuaP7lLUeI1SE0PjA fAqs3QybY4vnzuCOEILUUqUe8BE4+H0X2I/6Q0AAj8oU2OdCP8rOgN+bE yfmWBTZSS817Gf0lOvxOCHzO1u0D2vufvfmEXvJ/NAArZ2rt4hbm1VfXG RkjXeC4mFsKDNSFNhMjheEuyK3yLodkLCRZ5/m9OqBpaMid5D4HStnYxG Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="354836393" X-IronPort-AV: E=Sophos;i="6.01,252,1684825200"; d="scan'208";a="354836393" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2023 08:24:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="903426446" X-IronPort-AV: E=Sophos;i="6.01,252,1684825200"; d="scan'208";a="903426446" Received: from jnikula-mobl4.fi.intel.com (HELO localhost) ([10.237.66.162]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2023 08:24:08 -0700 From: Jani Nikula To: Juha-Pekka Heikkila , intel-gfx@lists.freedesktop.org In-Reply-To: <20230803143530.27601-1-juhapekka.heikkila@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230803143530.27601-1-juhapekka.heikkila@gmail.com> Date: Thu, 03 Aug 2023 18:24:05 +0300 Message-ID: <873510up2i.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915/sdvo: ignore returned broken edid on intel_sdvo_tmds_sink_detect 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, 03 Aug 2023, Juha-Pekka Heikkila wrote: > If drm_edid_raw returned NULL on error don't try accessing anything behind > that NULL > > Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c > index 8298a86d1334..065e619f934f 100644 > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > @@ -2097,7 +2097,7 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector) > const struct edid *edid = drm_edid_raw(drm_edid); > > /* DDC bus is shared, match EDID to connector type */ > - if (edid->input & DRM_EDID_INPUT_DIGITAL) > + if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) > status = connector_status_connected; > else > status = connector_status_disconnected; -- Jani Nikula, Intel Open Source Graphics Center