From patchwork Wed Sep 1 20:19:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 12470241 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.1 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=ham 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 D63EDC432BE for ; Wed, 1 Sep 2021 20:20:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A873860FC0 for ; Wed, 1 Sep 2021 20:20:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A873860FC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F3CE26E2EF; Wed, 1 Sep 2021 20:20:53 +0000 (UTC) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFFF96E301 for ; Wed, 1 Sep 2021 20:20:52 +0000 (UTC) Received: by mail-pf1-x42d.google.com with SMTP id e16so736503pfc.6 for ; Wed, 01 Sep 2021 13:20:52 -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=drQCiqDZz3QYS3F6wYgeFkeCVgRZeHge/OR/7gh4ucU=; b=ZkjCA9Rqq7qM3F6MpkAxqoe1GnPj+C8DjLay9BLW60nwl+b5eydGWd98H+ZUQ6GnWo P5CF88A+P0aI+uLkpDB7K+fXVtP83oDV02i+4vSasWj8yFlQOlAKnxBzil09YriYsxHs /2RWP4FxfljavNhcwP+i8TNLpdkxRfh83pd7o= 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=drQCiqDZz3QYS3F6wYgeFkeCVgRZeHge/OR/7gh4ucU=; b=hJG0gK3zk0TLRZUddwDHTGAmtPx2eyDMTkpOMpMDtBHiG0g6+GRVNbSFMtM0i1hZGn 9MEvACRIqS6oyipcMV6uIgcZohFdm6Vuoan7Kx77xDG4Wn4xx+p7T0868m+gOyxI5Td1 1LVJM01bIVw4YbTG6Brn3J0JzpIH2uV20quc+5NLEa6iyq/XjwHnDE7dkUy1xQ0pnl2f vdLB6HoIQAZSIszdGQefayxa86qLRZ+6HP+BuJZfz8DLMyUfHOd3gbUohvoexT0lVlD6 mSYE3XTOgidzGv4EVgy4WBNsMOpMsCulDrJdp8dxhPzq//p/or+MZPDWSv+xiG+6bKCX rNAg== X-Gm-Message-State: AOAM5305/yYduutxhv3qw7pTRj2PBGyjlOGTLXIpulBkz2ASo1mrFIKM E4F7/zqEicEE3qJKPs08TZLgpQ== X-Google-Smtp-Source: ABdhPJyIUJlWaf223U6cCvd+Cx293tnWnAvUjyvCJh4MGrpo6YsPF9U5wGJWi0dOjOqPewBTkqFVXQ== X-Received: by 2002:aa7:8a48:0:b0:408:dadb:35cb with SMTP id n8-20020aa78a48000000b00408dadb35cbmr1045184pfa.67.1630527652263; Wed, 01 Sep 2021 13:20:52 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:958b:b561:a735:e774]) by smtp.gmail.com with ESMTPSA id x15sm321178pfq.31.2021.09.01.13.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 13:20:51 -0700 (PDT) From: Douglas Anderson To: Thierry Reding , Rob Herring , Sam Ravnborg Cc: Maarten Lankhorst , linux-arm-msm@vger.kernel.org, Bjorn Andersson , Linus W , Daniel Vetter , devicetree@vger.kernel.org, Steev Klimaszewski , Thomas Zimmermann , Maxime Ripard , David Airlie , dri-devel@lists.freedesktop.org, Douglas Anderson , linux-kernel@vger.kernel.org Subject: [PATCH v3 14/16] drm/panel-simple-edp: Fix "prepare_to_enable" if panel doesn't handle HPD Date: Wed, 1 Sep 2021 13:19:32 -0700 Message-Id: <20210901131531.v3.14.Ia8288d36df4b12770af59ae3ff73ef7e08fb4e2e@changeid> X-Mailer: git-send-email 2.33.0.259.gc128427fd7-goog In-Reply-To: <20210901201934.1084250-1-dianders@chromium.org> References: <20210901201934.1084250-1-dianders@chromium.org> MIME-Version: 1.0 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" While cleaning up the descriptions of the delay for eDP panels I realized that we'd have a bug if any panels need the "prepare_to_enable" but HPD handling isn't happening in the panel driver. Let's put in a stopgap to at least make us not violate timings. This is not perfectly optimal but trying to do better is hard. At the moment only 2 panels specify this delay and only 30 ms is at stake. These panels are also currently hooked up with "hpd-gpios" so effectively this "fix" is just a theoretical fix and won't actually do anything for any devices currently supported in mainline. Signed-off-by: Douglas Anderson --- Changes in v3: - Fix "prepare_to_enable" patch new for v3. drivers/gpu/drm/panel/panel-simple-edp.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-simple-edp.c b/drivers/gpu/drm/panel/panel-simple-edp.c index 762589ef66c3..5d58dc25ddf5 100644 --- a/drivers/gpu/drm/panel/panel-simple-edp.c +++ b/drivers/gpu/drm/panel/panel-simple-edp.c @@ -508,12 +508,32 @@ static int panel_edp_prepare(struct drm_panel *panel) static int panel_edp_enable(struct drm_panel *panel) { struct panel_edp *p = to_panel_edp(panel); + unsigned int delay; if (p->enabled) return 0; - if (p->desc->delay.enable) - msleep(p->desc->delay.enable); + delay = p->desc->delay.enable; + + /* + * If there is a "prepare_to_enable" delay then that's supposed to be + * the delay from HPD going high until we can turn the backlight on. + * However, we can only count this if HPD is handled by the panel + * driver, not if it goes to a dedicated pin on the controller. + * If we aren't handling the HPD pin ourselves then the best we + * can do is assume that HPD went high immediately before we were + * called (and link training took zero time). + * + * NOTE: if we ever end up in this "if" statement then we're + * guaranteed that the panel_edp_wait() call below will do no delay. + * It already handles that case, though, so we don't need any special + * code for it. + */ + if (p->desc->delay.prepare_to_enable && !p->hpd_gpio && !p->no_hpd) + delay = max(delay, p->desc->delay.prepare_to_enable); + + if (delay) + msleep(delay); panel_edp_wait(p->prepared_time, p->desc->delay.prepare_to_enable);