From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C52BB18FDC8 for ; Thu, 12 Sep 2024 09:26:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726133195; cv=none; b=Xt/dzPAMSvfkcWQvf/GzU3SqMki3ntc6/rumcu76WmHEaSFnmwAKpvwjl7PKoQHJBONG8+ry4/R/w3UPEYIGZDhgOt6FvKLJgZNxvLu89uB95j9G35GEbR03r3IXhmiia/LGcDybC8WTfBSFk0yYnd+QNAND1NqxJo/1BCxjrSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726133195; c=relaxed/simple; bh=kYYCEt7FwZbXSlE7nVBbR/1SLU2ypju0LSE7VQvzfWY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=jpZp9991x8nDnoTxv+WV4hGDkdB5LM8CgNcHgr9JKQdZQ1rseTG5OUO0MW3qVd+8+pP9f8OdfIEub6RP6Y37+5tpi8ukCktkhF44U+fymYF374AOwZkAzmQ6wrTag/K/g84ldPgoR/68ft3JXdFBH5HcAVPLCoqeJ8LE/9E/cvc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Wr0YNEn1; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=T4MUvHoe; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=eQXdIOm0; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ctc0istA; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Wr0YNEn1"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="T4MUvHoe"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="eQXdIOm0"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ctc0istA" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CCAB41F76C; Thu, 12 Sep 2024 09:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726133192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+gfKavm6hNALa+fgSv1tQpvY/oFh7dPR7Rl3fsR1mJ4=; b=Wr0YNEn1D8DaRyqh8vBN3awAZkSXLKS/rR41arkM10FePh3vcxzRobqRcX7ABJhYW/F2YV rRorEHHtK5UrWwxeI2XVoewGv2WyY0z3UdcGFeXTq7akqMjM52NJDs2LcfYqusMBoc6iaP mHl7eRlvUk+XuHdPfoCPYI+3PkgQzNA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726133192; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+gfKavm6hNALa+fgSv1tQpvY/oFh7dPR7Rl3fsR1mJ4=; b=T4MUvHoeTO/JWTYdmuLGI781fGPDjeg8h06vxaxCAzo8RBhSdIgljHl980+Fu2DoHA43tY 3kg/SYS01Pz5taCA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=eQXdIOm0; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ctc0istA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1726133191; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+gfKavm6hNALa+fgSv1tQpvY/oFh7dPR7Rl3fsR1mJ4=; b=eQXdIOm0l1eXf2/lvI98N5U6C95wXi7coGUqsPX029iZp0hJZS4zNmXukdsIFat0vRADVz zcJ5aS7g3cO0LSU2vkYGf5D/Dsasbr9X1EIBOCKGa5X2Ss8Edo6F+q7r3B8pl3OCnRKmOY enaXr9w9JZRt1LCK6U1n/X+sumVwUlU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1726133191; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+gfKavm6hNALa+fgSv1tQpvY/oFh7dPR7Rl3fsR1mJ4=; b=ctc0istADgJ+F91W/wajHiq2luCHCSSOHvNXII/w0cfgQy84KZg8NCXIyz62QXo6C94OGd CWqd1dLl9WbWRcDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 869E913A73; Thu, 12 Sep 2024 09:26:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OY0VH8ez4maSIQAAD6G6ig (envelope-from ); Thu, 12 Sep 2024 09:26:31 +0000 Message-ID: <988bb389-13e6-4465-ab37-3ed94ecee9be@suse.de> Date: Thu, 12 Sep 2024 11:26:31 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] drm/gma500: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi To: Jani Nikula , Tejas Vipin , Laurent.pinchart@ideasonboard.com, patrik.r.jakobsson@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20240911180650.820598-1-tejasvipin76@gmail.com> <87o74ti7g5.fsf@intel.com> <87ldzxi71s.fsf@intel.com> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <87ldzxi71s.fsf@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CCAB41F76C X-Spam-Level: X-Spamd-Result: default: False [-5.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_TO(0.00)[linux.intel.com,gmail.com,ideasonboard.com,kernel.org,ffwll.ch]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_SEVEN(0.00)[10]; TAGGED_RCPT(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,intel.com:email] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -5.01 X-Spam-Flag: NO Hi Am 12.09.24 um 10:56 schrieb Jani Nikula: > On Thu, 12 Sep 2024, Jani Nikula wrote: >> On Thu, 12 Sep 2024, Thomas Zimmermann wrote: >>> Hi >>> >>> Am 11.09.24 um 20:06 schrieb Tejas Vipin: >>>> Replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi since >>>> monitor HDMI information is available after EDID is parsed. Additionally >>>> rewrite the code the code to have fewer indentation levels. >>> The problem is that the entire logic is outdated. The content >>> of cdv_hdmi_detect() should go into cdv_hdmi_get_modes(), the detect_ctx >>> callback should be set to drm_connector_helper_detect_from_ddc() and >>> cdv_hdmi_detect() should be deleted. The result is that ->detect_ctx >>> will detect the presence of a display and ->get_modes will update EDID >>> and other properties. >> I guess I didn't get the memo on this one. >> >> What's the problem with reading the EDID at detect? The subsequent >> drm_edid_connector_add_modes() called from .get_modes() does not need to >> read the EDID again. > Moreover, in this case .detect() only detects digital displays as > reported by EDID. If you postpone that to .get_modes(), the probe helper > will still report connected, and invent non-EDID fallback modes. The > behaviour changes. The change in behavior is intentional, because the current test seems arbitrary. Does the driver not work with analog outputs? Best regards Thomas > >> I think it should be fine to do incremental refactors like the patch at >> hand (modulo some issues I mention below). > Another issue in the patch is that it should also change .get_modes() to > not read the EDID again, but just call drm_edid_connector_add_modes(). > > BR, > Jani. > >> BR, >> Jani. >> >> >>> Do you have  a device for testing such a change? >>> >>> Best regards >>> Thomas >>> >>>> Signed-off-by: Tejas Vipin >>>> --- >>>> Changes in v2: >>>> - Use drm_edid instead of edid >>>> >>>> Link to v1: https://lore.kernel.org/all/20240910051856.700210-1-tejasvipin76@gmail.com/ >>>> --- >>>> drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 24 +++++++++++++----------- >>>> 1 file changed, 13 insertions(+), 11 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c >>>> index 2d95e0471291..701f8bbd5f2b 100644 >>>> --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c >>>> +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c >>>> @@ -128,23 +128,25 @@ static enum drm_connector_status cdv_hdmi_detect( >>>> { >>>> struct gma_encoder *gma_encoder = gma_attached_encoder(connector); >>>> struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv; >>>> - struct edid *edid = NULL; >>>> + const struct drm_edid *drm_edid; >>>> + int ret; >>>> enum drm_connector_status status = connector_status_disconnected; >>>> >>>> - edid = drm_get_edid(connector, connector->ddc); >>>> + drm_edid = drm_edid_read_ddc(connector, connector->ddc); >> Just drm_edid_read() is enough when you're using connector->ddc. >> >>>> + ret = drm_edid_connector_update(connector, drm_edid); >>>> >>>> hdmi_priv->has_hdmi_sink = false; >>>> hdmi_priv->has_hdmi_audio = false; >>>> - if (edid) { >>>> - if (edid->input & DRM_EDID_INPUT_DIGITAL) { >>>> - status = connector_status_connected; >>>> - hdmi_priv->has_hdmi_sink = >>>> - drm_detect_hdmi_monitor(edid); >>>> - hdmi_priv->has_hdmi_audio = >>>> - drm_detect_monitor_audio(edid); >>>> - } >>>> - kfree(edid); >>>> + if (ret) >> This error path leaks the EDID. >> >>>> + return status; >>>> + >>>> + if (drm_edid_is_digital(drm_edid)) { >>>> + status = connector_status_connected; >>>> + hdmi_priv->has_hdmi_sink = connector->display_info.is_hdmi; >>>> + hdmi_priv->has_hdmi_audio = connector->display_info.has_audio; >>>> } >>>> + drm_edid_free(drm_edid); >>>> + >>>> return status; >>>> } >>>> -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)