From patchwork Thu Dec 7 09:38:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13483078 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 0FAADC4167B for ; Thu, 7 Dec 2023 09:38:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1122310E839; Thu, 7 Dec 2023 09:38:32 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5862F10E839; Thu, 7 Dec 2023 09:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701941909; x=1733477909; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=NRCb2skgWUY6/0k+GgOYc1syRPquz6NY6LhlUq60Bi8=; b=eXpu9NzauIaYy4ZUCJiZ9MrIyUkmtqpVi7lLyfInU4MJugW0AZPIs+H5 E87HgJEQoLoHlDyDl4L+LRpvHJEF3I3UHEU5DEGPx50FDFgcxP+Kd6L5X UCC3ZI6DCR5DQM0SXM6tEHHbR1QlwkTwFFxKrrKfIGdidVEoo6VUpAs5U 8ZaRGqwIUIMhn/0UvENrGiiPaS3ss1GJbA12u0ax0iIDbgv+Oyp1rvipG 69wY+26XcPIzj9uteW3Lne9U1zdcMBp+dp+/PH+ecSwkK5kiNyvmPMmT4 jKrsvWY/kZS9YMzZUCQBU0zrnFwmBKKaDRGSQehKP2cxNNzg19gqZBnt+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="391378212" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="391378212" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 01:38:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="771668691" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="771668691" Received: from mrehana-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.62.169]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 01:38:25 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/edid: also call add modes in EDID connector update fallback Date: Thu, 7 Dec 2023 11:38:21 +0200 Message-Id: <20231207093821.2654267-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 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@intel.com, bbaa , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When the separate add modes call was added back in commit c533b5167c7e ("drm/edid: add separate drm_edid_connector_add_modes()"), it failed to address drm_edid_override_connector_update(). Also call add modes there. Reported-by: bbaa Closes: https://lore.kernel.org/r/930E9B4C7D91FDFF+29b34d89-8658-4910-966a-c772f320ea03@bbaa.fun Fixes: c533b5167c7e ("drm/edid: add separate drm_edid_connector_add_modes()") Cc: # v6.3+ Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index cb4031d5dcbb..69c68804023f 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2311,7 +2311,8 @@ int drm_edid_override_connector_update(struct drm_connector *connector) override = drm_edid_override_get(connector); if (override) { - num_modes = drm_edid_connector_update(connector, override); + if (drm_edid_connector_update(connector, override) == 0) + num_modes = drm_edid_connector_add_modes(connector); drm_edid_free(override);