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 X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 002D9C433EB for ; Tue, 30 Mar 2021 02:54:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9A67619CF for ; Tue, 30 Mar 2021 02:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231372AbhC3CyZ (ORCPT ); Mon, 29 Mar 2021 22:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231150AbhC3CyK (ORCPT ); Mon, 29 Mar 2021 22:54:10 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B27A8C061762 for ; Mon, 29 Mar 2021 19:54:09 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id bt4so6973894pjb.5 for ; Mon, 29 Mar 2021 19:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I36IxPptwcREtpot0iJCH+3WfYFhSmpYp5deLinpPgg=; b=kPzNiByEkfsePsfPtj6S5YnMKlXu7wXISif9REAqYuFnbIttV4HEzv66lzECdNerwv 7caDpqP6eV3Ii4qxlTPIHhsdUFLm2GnOWAFy+MOBzjGH9Nz8Z0o0lMCvIAbizAOKHaOR PbfqnEFWer573aC3LXsoSyid2BQ7sYqn9l95U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I36IxPptwcREtpot0iJCH+3WfYFhSmpYp5deLinpPgg=; b=YQh5ZBX0wngfLHBf9sLB1m/N1AWRh/GNcmg1UFkxnIHszd3ic07lJr3OXJtLJN0xMd wmchw4FEtwWlYcIo0L5RNBdu89NkC4xUdQEKPxCIARuGfMkYupiAqvJO5AmaLyHiUN5e 5ImacXsaxk+KuxoASSsXBhqqHaAWEtLo//mqeKYA2ScCaynF4pZ0sazAl9lCyrzLEMn0 Aw8VYD1oAvFcU/gcKT+mMG3yu4znbOhBFXcEFRNnrz532X527mz52aoZXI24sfVaIcZd c4HXPvCWV7waGO90iTZD6x4FiaL/Vlb1f7cXINgqTYIf6V1jXy//I26ukhCfR2byCtvq OTjA== X-Gm-Message-State: AOAM531W9uUa98NPUavN/SVzjJTJ2euFqApVcRgHE8W26GnrOOXayNvA tdEJ5W904uGwnK0grVCnWKpLRg== X-Google-Smtp-Source: ABdhPJzao4hv+1lRc1IJmNX9LkjQKMN0rQjB/u4FznRywuq7j6sWJCoD2wfDN9s9896IQSi9E/Bnug== X-Received: by 2002:a17:90a:c20a:: with SMTP id e10mr2008412pjt.221.1617072849314; Mon, 29 Mar 2021 19:54:09 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:f599:1ca7:742d:6b50]) by smtp.gmail.com with ESMTPSA id t17sm19152706pgk.25.2021.03.29.19.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 19:54:09 -0700 (PDT) From: Douglas Anderson To: Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sam Ravnborg Cc: Bjorn Andersson , Stephen Boyd , Maarten Lankhorst , robdclark@chromium.org, Stanislav Lisovskiy , linux-arm-msm@vger.kernel.org, Steev Klimaszewski , Linus W , Douglas Anderson , Daniel Vetter , David Airlie , Robert Foss , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/14] drm/bridge: ti-sn65dsi86: Move MIPI detach() / unregister() to detach() Date: Mon, 29 Mar 2021 19:53:36 -0700 Message-Id: <20210329195255.v2.5.I1a9275ffbde1d33ad7a3af819f5fbc0941b7ee02@changeid> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210330025345.3980086-1-dianders@chromium.org> References: <20210330025345.3980086-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The register() / attach() for MIPI happen in the bridge's attach(). That means that the inverse belongs in the bridge's detach(). Signed-off-by: Douglas Anderson --- (no changes since v1) drivers/gpu/drm/bridge/ti-sn65dsi86.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index c006678c9921..e8e523b3a16b 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -437,7 +437,15 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, static void ti_sn_bridge_detach(struct drm_bridge *bridge) { - drm_dp_aux_unregister(&bridge_to_ti_sn_bridge(bridge)->aux); + struct ti_sn_bridge *pdata = bridge_to_ti_sn_bridge(bridge); + + + if (pdata->dsi) { + mipi_dsi_detach(pdata->dsi); + mipi_dsi_device_unregister(pdata->dsi); + } + + drm_dp_aux_unregister(&pdata->aux); } static void ti_sn_bridge_disable(struct drm_bridge *bridge) @@ -1315,11 +1323,6 @@ static int ti_sn_bridge_remove(struct i2c_client *client) if (!pdata) return -EINVAL; - if (pdata->dsi) { - mipi_dsi_detach(pdata->dsi); - mipi_dsi_device_unregister(pdata->dsi); - } - kfree(pdata->edid); ti_sn_debugfs_remove(pdata); -- 2.31.0.291.g576ba9dcdaf-goog