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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 06AD1C04FF6 for ; Tue, 16 Apr 2024 13:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fknkT+1UYs63+EWA0b1l4lv0zfgnDSBTV6cvN4mJtNs=; b=G9fRQ3frbC7kCs APbEdGbWtayGiJtQ2nY2BFgGPkVENuNmicojgmP3GGa6jIpYjGgQE7UpCvBlS8hd4GCzhSnV4ZC+9 9qdgMoAyDkcpaWxQv3AmnfNzxoyzOq1naZmtuxLSHxOfJBaOpKAFQPPH5Xvy92wl0dRmnvI5RPHLN Ygi/iWfvLeKxC9kWJdocuZS4Zu9q9CXK9+aCuydWWFL23rIr/A2GW9YhuQpw4tM/p68aMiHNKUzLf R1KEg2JXe8yypYgwhKCPrHHV+ajtnMcZzISeDHjrZcKx0HS3OHBX6O5Pvt/fKXV+czN5uiJPlKLEQ bibitXWd5j7RYpBD8JPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwimM-0000000CHuk-1NO2; Tue, 16 Apr 2024 13:23:18 +0000 Received: from mgamail.intel.com ([192.198.163.19]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwimC-0000000CHoE-1cIi for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2024 13:23:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713273790; x=1744809790; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x6jfXcFRBti7KkgtfDl0XTo9aIOmY0FStdfCBjx7DUc=; b=RY4DkBf91vaUalBuJe7VFR6kK9nXNg9uJSG+bMliFwARGpDXtzt4A7uw D+TVqH5IP1IWvHjMe1m9TS7c62Nthju3vQxacM4VeN++S0MxqJInH0Axh FgrtPo2XUZ2zVUfhkiT1CgxS7UweNYfxhdbexpBuHBZ8lUOJB1tJFbV4N dP2mlka7Sttr1K/53viGhUkmUiw+oEPXpw+iuiiiSCi7eBuAau+tZrFWw GyFwodlv1PsJybVgUkJ8zlog32Vzx46VkPyCYm6rlm1f7hnmdTRD0EXbD J5nxmUTiE23c1RHlR3JReDNKabrcItwTgGuCClzxCBPZK+Ftyj0Gg3Fa3 w==; X-CSE-ConnectionGUID: P5yUHMdYTw+gDb4hOwWbow== X-CSE-MsgGUID: 9LyRY/LgRY+8RjueRbUjDQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="8571738" X-IronPort-AV: E=Sophos;i="6.07,206,1708416000"; d="scan'208";a="8571738" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 06:23:08 -0700 X-CSE-ConnectionGUID: RZ3RKF8gQaSfe64ZnDVnrg== X-CSE-MsgGUID: xxkEhbmFSTWJcooAB7if5w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,206,1708416000"; d="scan'208";a="53438742" Received: from martakit-mobl.ger.corp.intel.com (HELO localhost) ([10.252.44.100]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 06:23:04 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org Cc: Jani Nikula , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH 06/15] drm/sun4i: hdmi: switch to struct drm_edid Date: Tue, 16 Apr 2024 16:22:20 +0300 Message-Id: <0967dde8ae35cd58ab8ea58397d514bb9df29fd1.1713273659.git.jani.nikula@intel.com> 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240416_062308_553054_C6F458E7 X-CRM114-Status: GOOD ( 10.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Prefer struct drm_edid based functions over struct edid. Signed-off-by: Jani Nikula --- Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Jernej Skrabec Cc: Samuel Holland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-sunxi@lists.linux.dev --- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index 2d1880c61b50..245b34adca5a 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -214,20 +214,24 @@ sun4i_hdmi_connector_mode_valid(struct drm_connector *connector, static int sun4i_hdmi_get_modes(struct drm_connector *connector) { struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector); - struct edid *edid; + const struct drm_edid *drm_edid; int ret; - edid = drm_get_edid(connector, hdmi->ddc_i2c ?: hdmi->i2c); - if (!edid) + drm_edid = drm_edid_read_ddc(connector, hdmi->ddc_i2c ?: hdmi->i2c); + + drm_edid_connector_update(connector, drm_edid); + cec_s_phys_addr(hdmi->cec_adap, + connector->display_info.source_physical_address, false); + + if (!drm_edid) return 0; DRM_DEBUG_DRIVER("Monitor is %s monitor\n", connector->display_info.is_hdmi ? "an HDMI" : "a DVI"); - drm_connector_update_edid_property(connector, edid); - cec_s_phys_addr_from_edid(hdmi->cec_adap, edid); - ret = drm_add_edid_modes(connector, edid); - kfree(edid); + + ret = drm_edid_connector_add_modes(connector); + drm_edid_free(drm_edid); return ret; } -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel