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 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 7D397C54E68 for ; Tue, 19 Mar 2024 08:14:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2789910F588; Tue, 19 Mar 2024 08:14:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="H01AHq5S"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="paSY3py7"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="H01AHq5S"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="paSY3py7"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id D071810F588 for ; Tue, 19 Mar 2024 08:14:35 +0000 (UTC) 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 5E2CE5D338; Tue, 19 Mar 2024 08:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710836074; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyv5BlyfiHdD+PKTozZt62CZFXgyjiKn61FfNJxZCvg=; b=H01AHq5S+Z2lfyk2OHnU5/n2Kn1+knDkPmbb3hCa3p6H/tLPwyym9DrDytgGi2oN5/rWqT qSW50LARase8zSfxVL7D26tSqzGx1eSQ+XETXGiSNY3VKgH9TYzIzdXRNp20dsaCJxj6Od +k/K8lv3+1HmlzPMiiOVanX5skzqyFI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710836074; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyv5BlyfiHdD+PKTozZt62CZFXgyjiKn61FfNJxZCvg=; b=paSY3py7pjoY8+kPB9zgIZr8Ptdh+5vRUUQrghSbDCwBdVnvTqdFTPlEEBChF+o6r+rSDM tZKbeMtaToMebSBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710836074; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyv5BlyfiHdD+PKTozZt62CZFXgyjiKn61FfNJxZCvg=; b=H01AHq5S+Z2lfyk2OHnU5/n2Kn1+knDkPmbb3hCa3p6H/tLPwyym9DrDytgGi2oN5/rWqT qSW50LARase8zSfxVL7D26tSqzGx1eSQ+XETXGiSNY3VKgH9TYzIzdXRNp20dsaCJxj6Od +k/K8lv3+1HmlzPMiiOVanX5skzqyFI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710836074; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyv5BlyfiHdD+PKTozZt62CZFXgyjiKn61FfNJxZCvg=; b=paSY3py7pjoY8+kPB9zgIZr8Ptdh+5vRUUQrghSbDCwBdVnvTqdFTPlEEBChF+o6r+rSDM tZKbeMtaToMebSBg== 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 17FF0136D6; Tue, 19 Mar 2024 08:14:34 +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 6A9jBGpJ+WWLeAAAD6G6ig (envelope-from ); Tue, 19 Mar 2024 08:14:34 +0000 From: Thomas Zimmermann To: airlied@redhat.com, jfalempe@redhat.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann , Patrik Jakobsson Subject: [PATCH v4 02/12] drm/ast: Fail probing if DDC channel could not be initialized Date: Tue, 19 Mar 2024 09:00:22 +0100 Message-ID: <20240319081430.10165-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240319081430.10165-1-tzimmermann@suse.de> References: <20240319081430.10165-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=H01AHq5S; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=paSY3py7 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [1.99 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_RATELIMIT(0.00)[to_ip_from(RLgk4u1ri6nhg6f1rtzmk7keyw)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[9]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FREEMAIL_TO(0.00)[redhat.com,linux.intel.com,kernel.org,gmail.com,ffwll.ch]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FREEMAIL_CC(0.00)[lists.freedesktop.org,suse.de,gmail.com]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Rspamd-Queue-Id: 5E2CE5D338 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Expect the hardware to provide a DDC channel. Fail probing if its initialization fails. Failing to initialize the DDC indicates a larger problem, so there's no point in continuing. v4: * give a rational in the commit message Signed-off-by: Thomas Zimmermann Reviewed-by: Patrik Jakobsson --- drivers/gpu/drm/ast/ast_drv.h | 2 -- drivers/gpu/drm/ast/ast_i2c.c | 7 +++-- drivers/gpu/drm/ast/ast_mode.c | 52 +++++++++++++--------------------- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 3be5ccf1f5f4d..cb0e4f332be80 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -160,7 +160,6 @@ struct ast_i2c_chan { struct ast_vga_connector { struct drm_connector base; - struct ast_i2c_chan *i2c; }; static inline struct ast_vga_connector * @@ -171,7 +170,6 @@ to_ast_vga_connector(struct drm_connector *connector) struct ast_sil164_connector { struct drm_connector base; - struct ast_i2c_chan *i2c; }; static inline struct ast_sil164_connector * diff --git a/drivers/gpu/drm/ast/ast_i2c.c b/drivers/gpu/drm/ast/ast_i2c.c index e5d3f7121de42..c3046223a4919 100644 --- a/drivers/gpu/drm/ast/ast_i2c.c +++ b/drivers/gpu/drm/ast/ast_i2c.c @@ -117,7 +117,7 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) i2c = kzalloc(sizeof(struct ast_i2c_chan), GFP_KERNEL); if (!i2c) - return NULL; + return ERR_PTR(-ENOMEM); i2c->adapter.owner = THIS_MODULE; i2c->adapter.dev.parent = dev->dev; @@ -142,10 +142,11 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) ret = drmm_add_action_or_reset(dev, ast_i2c_release, i2c); if (ret) - return NULL; + return ERR_PTR(ret); + return i2c; out_kfree: kfree(i2c); - return NULL; + return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index a718646a66b8f..38c31a7283a69 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1345,22 +1345,18 @@ static int ast_crtc_init(struct drm_device *dev) static int ast_vga_connector_helper_get_modes(struct drm_connector *connector) { - struct ast_vga_connector *ast_vga_connector = to_ast_vga_connector(connector); struct drm_device *dev = connector->dev; struct ast_device *ast = to_ast_device(dev); struct edid *edid; int count; - if (!ast_vga_connector->i2c) - goto err_drm_connector_update_edid_property; - /* * Protect access to I/O registers from concurrent modesetting * by acquiring the I/O-register lock. */ mutex_lock(&ast->modeset_lock); - edid = drm_get_edid(connector, &ast_vga_connector->i2c->adapter); + edid = drm_get_edid(connector, connector->ddc); if (!edid) goto err_mutex_unlock; @@ -1373,7 +1369,6 @@ static int ast_vga_connector_helper_get_modes(struct drm_connector *connector) err_mutex_unlock: mutex_unlock(&ast->modeset_lock); -err_drm_connector_update_edid_property: drm_connector_update_edid_property(connector, NULL); return 0; } @@ -1394,19 +1389,18 @@ static int ast_vga_connector_init(struct drm_device *dev, struct ast_vga_connector *ast_vga_connector) { struct drm_connector *connector = &ast_vga_connector->base; + struct ast_i2c_chan *i2c; int ret; - ast_vga_connector->i2c = ast_i2c_create(dev); - if (!ast_vga_connector->i2c) - drm_err(dev, "failed to add ddc bus for connector\n"); + i2c = ast_i2c_create(dev); + if (IS_ERR(i2c)) { + ret = PTR_ERR(i2c); + drm_err(dev, "failed to add ddc bus for connector; ret=%d\n", ret); + return ret; + } - if (ast_vga_connector->i2c) - ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs, - DRM_MODE_CONNECTOR_VGA, - &ast_vga_connector->i2c->adapter); - else - ret = drm_connector_init(dev, connector, &ast_vga_connector_funcs, - DRM_MODE_CONNECTOR_VGA); + ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs, + DRM_MODE_CONNECTOR_VGA, &i2c->adapter); if (ret) return ret; @@ -1451,22 +1445,18 @@ static int ast_vga_output_init(struct ast_device *ast) static int ast_sil164_connector_helper_get_modes(struct drm_connector *connector) { - struct ast_sil164_connector *ast_sil164_connector = to_ast_sil164_connector(connector); struct drm_device *dev = connector->dev; struct ast_device *ast = to_ast_device(dev); struct edid *edid; int count; - if (!ast_sil164_connector->i2c) - goto err_drm_connector_update_edid_property; - /* * Protect access to I/O registers from concurrent modesetting * by acquiring the I/O-register lock. */ mutex_lock(&ast->modeset_lock); - edid = drm_get_edid(connector, &ast_sil164_connector->i2c->adapter); + edid = drm_get_edid(connector, connector->ddc); if (!edid) goto err_mutex_unlock; @@ -1479,7 +1469,6 @@ static int ast_sil164_connector_helper_get_modes(struct drm_connector *connector err_mutex_unlock: mutex_unlock(&ast->modeset_lock); -err_drm_connector_update_edid_property: drm_connector_update_edid_property(connector, NULL); return 0; } @@ -1500,19 +1489,18 @@ static int ast_sil164_connector_init(struct drm_device *dev, struct ast_sil164_connector *ast_sil164_connector) { struct drm_connector *connector = &ast_sil164_connector->base; + struct ast_i2c_chan *i2c; int ret; - ast_sil164_connector->i2c = ast_i2c_create(dev); - if (!ast_sil164_connector->i2c) - drm_err(dev, "failed to add ddc bus for connector\n"); + i2c = ast_i2c_create(dev); + if (IS_ERR(i2c)) { + ret = PTR_ERR(i2c); + drm_err(dev, "failed to add ddc bus for connector; ret=%d\n", ret); + return ret; + } - if (ast_sil164_connector->i2c) - ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs, - DRM_MODE_CONNECTOR_DVII, - &ast_sil164_connector->i2c->adapter); - else - ret = drm_connector_init(dev, connector, &ast_sil164_connector_funcs, - DRM_MODE_CONNECTOR_DVII); + ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs, + DRM_MODE_CONNECTOR_DVII, &i2c->adapter); if (ret) return ret; -- 2.44.0