From patchwork Thu Mar 30 15:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13194422 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 F0273C77B60 for ; Thu, 30 Mar 2023 15:41:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54CE810EEF4; Thu, 30 Mar 2023 15:41:16 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3B3010EEDD; Thu, 30 Mar 2023 15:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680190873; x=1711726873; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1I+tValqQeHIgImoR7kpRtE0U+EgMNCzeIU/wxgbpQk=; b=gj85bGNIagx0prxuUqJDhmTjZLJvkg1mIM5VNibamBa26m8TgVF3wLAZ SnP2QiRCVV8EZpfhVhp96pAJ8qYtnD1cKWzT6iN9npuiLXHCAg0crIlQC rsB6MIuaw8DecigyUfGRpv9bEbOBy58sPDAC22dmxUjfMal7o1MKJxJFk hDT5s6wR0Rh8HKW5JRp8s9+meNm4izBizuuFuVe4jBmQZ6rLFPTVBbyx1 BEwGF+2N+gwmHbMGIH7wdg6RaAknYW4YRG6TktIEZSZ3n2sXypbzarG1b YbXwCcLCoJRZFVmPSfOvJDdCCKuO6SvycS7paU+i+pfyI6XHK37swpjZA g==; X-IronPort-AV: E=McAfee;i="6600,9927,10665"; a="406196701" X-IronPort-AV: E=Sophos;i="5.98,305,1673942400"; d="scan'208";a="406196701" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 08:40:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10665"; a="662068011" X-IronPort-AV: E=Sophos;i="5.98,305,1673942400"; d="scan'208";a="662068011" Received: from unknown (HELO localhost) ([10.237.66.160]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 08:40:40 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org Subject: [PATCH 10/12] drm/rockchip: cdn-dp: call drm_connector_update_edid_property() unconditionally Date: Thu, 30 Mar 2023 18:39:47 +0300 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@intel.com, intel-gfx@lists.freedesktop.org, Sandy Huang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Calling drm_connector_update_edid_property() should be done unconditionally instead of depending on the number of modes added. Also match the call order in inno_hdmi and rk3066_hdmi. Cc: Sandy Huang Cc: Heiko Stübner Signed-off-by: Jani Nikula Acked-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index 8526dda91931..b6afe3786b74 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -273,10 +273,9 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) edid->width_cm, edid->height_cm); dp->sink_has_audio = drm_detect_monitor_audio(edid); + + drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); - if (ret) - drm_connector_update_edid_property(connector, - edid); } mutex_unlock(&dp->lock);