From patchwork Tue Jan 23 19:37:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13528082 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 9C1E4C47DDB for ; Tue, 23 Jan 2024 19:38:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E93C610E866; Tue, 23 Jan 2024 19:38:57 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id DBA1810E861 for ; Tue, 23 Jan 2024 19:38:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706038737; x=1737574737; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=71c7AnwoSXidCTgx5jsGSoSJfqz2yMNzVqFVuPV4ICA=; b=G3T/dSV+M+i3CfboeUWA553lov4DGeMBIhAfWwAzXDRx3+yxksZ3+Ew8 vUG0ndF/g6LhZ2Jp5E25kxMpK2Fu+n2zWHLxWB7Ksq0T2GZUaOtd4ucdB N5TeAIIahL7ixYU78DNJmvcpsw/oly2NqhvarB+1Pjiddx2zg9bU9rm8H ZUOQkroVriLBualXM4OPx6inW/7vJm7GJrftfYkUb0nMXxv3Uv8yRAbAO Oa0Do74zcoPPbiezlm/1mLnIFrenspi7eXdB6whyFSPVJ3cjrY4U6o5XR owmTygI5dDYcLInVfc/qX9W1sng02o9TPhiNpV+zo5bATCkdSD+bs0GyW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="14980505" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="14980505" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 11:38:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="1117379585" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="1117379585" Received: from pzsolt-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.40.183]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 11:38:53 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Subject: [PATCH v3 11/39] drm/bridge: tfp410: clear the EDID property on failures Date: Tue, 23 Jan 2024 21:37:17 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If EDID read fails, clear the EDID property. Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Robert Foss Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec Signed-off-by: Jani Nikula --- drivers/gpu/drm/bridge/ti-tfp410.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index dd14731eb03e..c7bef5c23927 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -61,6 +61,8 @@ static int tfp410_get_modes(struct drm_connector *connector) drm_edid = NULL; } + drm_edid_connector_update(connector, drm_edid); + if (!drm_edid) { /* * No EDID, fallback on the XGA standard modes and prefer a mode @@ -71,8 +73,6 @@ static int tfp410_get_modes(struct drm_connector *connector) return ret; } - drm_edid_connector_update(connector, drm_edid); - ret = drm_edid_connector_add_modes(connector); drm_edid_free(drm_edid);