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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 2A67DC4361B for ; Fri, 18 Dec 2020 14:23:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF46323A00 for ; Fri, 18 Dec 2020 14:23:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF46323A00 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=v823aRMLkB1DpqK4EtG5NFZTMT/i0rTjgxj5zkWZa3Q=; b=0srfpxMecrqrqScjyZPHeftS9 jylGS5yro76dm3FgrzBRT5rhC0Ta6ZdteVJnQeKFN1w1gGettWmsGKKkbga220ikmPBkecJd/ZYbh t2M6eMdGeMbLv9pMdi9Qk9BM7SyS+ZNUu+wzjYJoCj4+mML3JdPblZYzZx1EpjZIIZEStKGOSiRL4 K5mrpRIDHSLnXpd+P9f5MnQ6ztAwTZXRxijIQA1QtSTLeThKRjTQpKnpLPoIBmUuY+q0aPnPCssjk w+JB5EaZsvro3Zw5062i4KFPWAFCuaDffv961sA6JzGsK4K8YAMUj5k4xoPr8QH6n/UkeuXoIIP+1 lUTeVaPew==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqGdZ-0002Gz-2s; Fri, 18 Dec 2020 14:21:41 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kqGdV-0002G5-Fw for linux-arm-kernel@lists.infradead.org; Fri, 18 Dec 2020 14:21:38 +0000 Received: by mail-wm1-x32a.google.com with SMTP id q75so2765150wme.2 for ; Fri, 18 Dec 2020 06:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yg/DSJRdrLy0HhUNnHE4yMYxJ8sJyjH42WoCIL2vO8M=; b=avagjLPPM/4TenYe+5NFwMYfDv5mkadG3/FGaqQJLbxamQObpsp1s2ti8eQdTXtaon heMFa1Ff+s1WmQ5BcoX6PZE51lm02DR21bsPKye3xLeNIpzlKnjBTOsTlOX1gQGLyb3W jIosaRHbAPDeU7U6WTAJ/yewyQo84s5nju4Jc5A8OK+PsfIfgcE60gmTN9Q2kDYxR92d uLTno9x8L4yrdnyVTAZ9RD7dpCqW/8Gpam/AhLRr3e1hVqNm/6Zn7TJMigJnLdUJeBJ0 goVEXQyOJ3gnNQTFRAoYuaIdcsEMbvjvhcnJC+6HST790kZh+omIAfT9GDznlD7avlSd HBwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yg/DSJRdrLy0HhUNnHE4yMYxJ8sJyjH42WoCIL2vO8M=; b=f5XxPzsaSp1CWVk9N/I9mQ4q+7Uv37V/7CpA4EeK+4bj27mUpEbjesWB/kt2WkH7n+ UthgmsW+nooE6eqkfAThXiwHw8Nt9Ji8k573KrATDFTEY9Sr6qBvPSWcX5i9gUD1FfYe Fg/ZYiGZETIslv+s3x/tkUMIASFKmlM9s5nLwJJKExi/X1SXWvOXCpC6A1oUtE8BTHJG Syn9b3T6e3X9eQgcOYpaJ1sR+HK+bvz7NdXMejkKb1t6iyv5+PBHTcNJFjwoh+t6qRsZ FPBamDnHQOkBK8J6p5z02O4llbYSUqCrhS7ZMlXqV00xMYoBecfVirpLCS0vZmc9Jjaf 0T2g== X-Gm-Message-State: AOAM530Lp39j0CweplVS3iHVJOw2bqhAUgOdmIUShndnM2XPl8c1cy4r f3nsjgqQpXbnfBuVcVSzDT5//Iq9vHD8qzHr2caHag== X-Google-Smtp-Source: ABdhPJyt9fDcXOzHI8EKkCqBDVJFYeA5WQWNbsZGass3dzm1SJFYCDEWIUPq84vwnQjLtV5mIEeDN0G9jubDadFmIHE= X-Received: by 2002:a1c:7d88:: with SMTP id y130mr4418480wmc.158.1608301296016; Fri, 18 Dec 2020 06:21:36 -0800 (PST) MIME-Version: 1.0 References: <20201210134648.272857-1-maxime@cerno.tech> <20201210134648.272857-6-maxime@cerno.tech> In-Reply-To: <20201210134648.272857-6-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 18 Dec 2020 14:21:18 +0000 Message-ID: Subject: Re: [PATCH 05/15] drm/vc4: hdmi: Restore cec physical address on reconnect To: Maxime Ripard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201218_092137_801696_D8AFA0BE X-CRM114-Status: GOOD ( 22.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Cooper , David Airlie , Marc Zyngier , Maarten Lankhorst , LKML , DRI Development , Dom Cobley , Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Thomas Zimmermann , Hans Verkuil , Daniel Vetter , Thomas Gleixner , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Linux Media Mailing List 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 Hi Maxime & Dom On Thu, 10 Dec 2020 at 13:47, Maxime Ripard wrote: > > From: Dom Cobley > > Currently we call cec_phys_addr_invalidate on a hotplug deassert. > That may be due to a TV power cycling, or an AVR being switched > on (and switching edid). > > This makes CEC unusable since our controller wouldn't have a physical > address anymore. > > Set it back up again on the hotplug assert. > > Fixes: 15b4511a4af6 ("drm/vc4: add HDMI CEC support") > Signed-off-by: Dom Cobley > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 25 +++++++++++++++++-------- > 1 file changed, 17 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 28b78ea885ea..eff3bac562c6 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -136,20 +136,29 @@ static enum drm_connector_status > vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) > { > struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); > + bool connected = false; > > if (vc4_hdmi->hpd_gpio) { > if (gpio_get_value_cansleep(vc4_hdmi->hpd_gpio) ^ > vc4_hdmi->hpd_active_low) > - return connector_status_connected; > - cec_phys_addr_invalidate(vc4_hdmi->cec_adap); > - return connector_status_disconnected; > - } > - > - if (drm_probe_ddc(vc4_hdmi->ddc)) > - return connector_status_connected; > - > + connected = true; > + } else if (drm_probe_ddc(vc4_hdmi->ddc)) > + connected = true; > if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) This needs to become an "else if(...". It used to be that all the other paths would return, so were mutually exclusive to this. Now they set a thing and keep going we need to avoid reading the register should there be a HPD gpio or the ddc probe succeeds. Memory says that otherwise Pi3 always reports connected. I fixed this in a downstream patch already - https://github.com/raspberrypi/linux/commit/d345caec1e9b2317b9cd7eb5b92ae453a0d3e98c Otherwise fine. Dave > + connected = true; > + if (connected) { > + if (connector->status != connector_status_connected) { > + struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc); > + > + if (edid) { > + cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); > + vc4_hdmi->encoder.hdmi_monitor = drm_detect_hdmi_monitor(edid); > + drm_connector_update_edid_property(connector, edid); > + kfree(edid); > + } > + } > return connector_status_connected; > + } > cec_phys_addr_invalidate(vc4_hdmi->cec_adap); > return connector_status_disconnected; > } > -- > 2.28.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel