From patchwork Sat Aug 5 00:54:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 109472 Delivered-To: patches@linaro.org Received: by 10.140.101.6 with SMTP id t6csp18341qge; Fri, 4 Aug 2017 17:54:26 -0700 (PDT) X-Received: by 10.99.116.84 with SMTP id e20mr4174696pgn.62.1501894466666; Fri, 04 Aug 2017 17:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501894466; cv=none; d=google.com; s=arc-20160816; b=JpU3qHwCALZQH94kMuTEHAFlsYulHvysy0SB34PFJ2llI3j/WU6OmXoPW4mNm9zggT xvC5BMASbo3VBijOFw2bJjIWra0HouFcdwSQY5MXdOPu/O+5wqo+ZkDPvHVGfbAgN7ZT bJeuIzpfJAFW66Aw7GDnTUxph8FccPB7e9SuNY+3ZBDmr7O7ksm9ejr38bCKuubDlyhr NesdEvyl0fUQLM8WRaWwMTRz8TNPHdjwIrsDUDIycqdIxWQ8M+OPH8DKSUqPcoaRB26b kROoHRHOehxUShtrPOmmpT3FRBvCwl7ajrhkYfwh7U6txzJjuI8KpiP1jtpUe+0NE6Gm Qkzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=rpa5P9nm6rXETAAK1L+fNRDE9dXbUsCusWOepYuPLt8=; b=s6V7SGTFPK6HTHcyY95NPHQfm2rZTvjuR5iz2DfYmu6ZVgZJHCetovADm0SPmIiiuG b7cv9UG4nhI15TQJ8FKmTQ65jHf4H2pKkiO6EP6ihQ+FN2IEyZMXI8qCjRlOgbZ88UkT 7bXZlJeFSU7ajQSTInT+t/NTCqw1oft+0C2Jsg1WwzuSTZTWHgQd+rTrULdjczIgYub7 xWY2/NWz1EP+WNf7+PqnkxjC/jrug3qvq7zCf08B7PQqaZgfYh6kbN7yqEuhEC5tG1Nj CJ68zAQSkxZxF31nPnFgC/dSGSUwoS/nzSc7YjebGVOovJbia3Unsn3YTtKc35if/Xsb 7sGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=P4dRdAHy; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-pg0-x22c.google.com (mail-pg0-x22c.google.com. [2607:f8b0:400e:c05::22c]) by mx.google.com with ESMTPS id i61si1782716plb.756.2017.08.04.17.54.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 17:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) client-ip=2607:f8b0:400e:c05::22c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=P4dRdAHy; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22c.google.com with SMTP id y129so13666071pgy.4 for ; Fri, 04 Aug 2017 17:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=rpa5P9nm6rXETAAK1L+fNRDE9dXbUsCusWOepYuPLt8=; b=P4dRdAHyfxXLmMGgs0iSFV1WUg0oOPiVfPEhRWvgNTLou8we6Jf/T/d0HRtWdaTFcd XdyFq8B7SlI0+M5uxk+laCZ+weBtxdVNNmb6wZOyfT/h+kA9JBFcVcbpwKjbrndIUs+V C0iUktVNZoThG2TVIDge126cX5nSNToetpDA0= 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; bh=rpa5P9nm6rXETAAK1L+fNRDE9dXbUsCusWOepYuPLt8=; b=WJBzeJJvQ/FgEnKYOcHXneJQ/9L5dp/YQKni1pl5ASnL723LKqB/NqB81MQ2iuWzCK JGC7IAFvRXW3PwfAaWs12HdWpGPCh3iXtnG2wQi6EYPzW2wBt0vRuKGEBfC4dy2fxqdd ScZDfntSROz7SKk/ACyqFa7M++4GkhVtokGkq815AQQU2ILearvtaaioAIIQBJOy3etg BsNyE3reVkUJJ2b+KRCPPZqeLYVzW39v9L8eumq7YlQsx1jiLoN+6ylnH/54dBOhbobV C0IrNvtfiZJVO2nUiFv8MpoEJdXdscDch1YRVHiJALzxQP+5sFjBJk/W6VBzu7tLqP6+ vANg== X-Gm-Message-State: AIVw113d7TuJ+rZDqzu8tjmq9PwSsjYhLmdoXTjUvFngmXlzELmVN2N7 P8TysjL1xdInXmMXR7A= X-Received: by 10.99.60.12 with SMTP id j12mr4319522pga.18.1501894466243; Fri, 04 Aug 2017 17:54:26 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id i66sm912936pfk.146.2017.08.04.17.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Aug 2017 17:54:24 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , Jani Nikula , Sean Paul , David Airlie , Rob Clark , Xinliang Liu , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , Jose Abreu , Archit Taneja , dri-devel@lists.freedesktop.org Subject: [PATCH v4] drm: kirin: Add mode_valid logic to avoid mode clocks we can't generate Date: Fri, 4 Aug 2017 17:54:22 -0700 Message-Id: <1501894462-9342-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 Currently the hikey dsi logic cannot generate accurate byte clocks values for all pixel clock values. Thus if a mode clock is selected that cannot match the calculated byte clock, the device will boot with a blank screen. This patch uses the new mode_valid callback (many thanks to Jose Abreu for upstreaming it!) to ensure we don't select modes we cannot generate. Also, since the ade crtc code will adjust the mode in mode_set, this patch also adds a mode_fixup callback which we use to make sure we are validating the mode clock that will eventually be used. Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: David Airlie Cc: Rob Clark Cc: Xinliang Liu Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: Jose Abreu Cc: Archit Taneja Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- v2: Reworked to calculate if modeclock matches the phy's byteclock, rather then using a whitelist of known modes. v3: Reworked to check across all possible crtcs (even though for us there is only one), and use mode_fixup instead of a custom function, as suggested by Jose and Daniel. v4: Fixes and improved error handling as suggested by Jose. --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 67 +++++++++++++++++++++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 14 ++++++ 2 files changed, 81 insertions(+) -- 2.7.4 diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index f77dcfa..043a50d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -603,6 +603,72 @@ static void dsi_encoder_enable(struct drm_encoder *encoder) dsi->enable = true; } +static enum drm_mode_status dsi_encoder_phy_mode_valid( + struct drm_encoder *encoder, + const struct drm_display_mode *mode) +{ + struct dw_dsi *dsi = encoder_to_dsi(encoder); + struct mipi_phy_params phy; + u32 bpp = mipi_dsi_pixel_format_to_bpp(dsi->format); + u32 req_kHz, act_kHz, lane_byte_clk_kHz; + + /* Calculate the lane byte clk using the adjusted mode clk */ + memset(&phy, 0, sizeof(phy)); + req_kHz = mode->clock * bpp / dsi->lanes; + act_kHz = dsi_calc_phy_rate(req_kHz, &phy); + lane_byte_clk_kHz = act_kHz / 8; + + DRM_DEBUG_DRIVER("Checking mode %ix%i-%i@%i clock: %i...", + mode->hdisplay, mode->vdisplay, bpp, + drm_mode_vrefresh(mode), mode->clock); + + /* + * Make sure the adjused mode clock and the lane byte clk + * have a common denominator base frequency + */ + if (mode->clock/dsi->lanes == lane_byte_clk_kHz/3) { + DRM_DEBUG_DRIVER("OK!\n"); + return MODE_OK; + } + + DRM_DEBUG_DRIVER("BAD!\n"); + return MODE_BAD; +} + +static enum drm_mode_status dsi_encoder_mode_valid(struct drm_encoder *encoder, + const struct drm_display_mode *mode) + +{ + const struct drm_crtc_helper_funcs *crtc_funcs = NULL; + struct drm_crtc *crtc = NULL; + struct drm_display_mode adj_mode; + enum drm_mode_status ret; + + /* + * The crtc might adjust the mode, so go through the + * possible crtcs (technically just one) and call + * mode_fixup to figure out the adjusted mode before we + * validate it. + */ + drm_for_each_crtc(crtc, encoder->dev) { + /* + * reset adj_mode to the mode value each time, + * so we don't adjust the mode twice + */ + drm_mode_copy(&adj_mode, mode); + + crtc_funcs = crtc->helper_private; + if (crtc_funcs && crtc_funcs->mode_fixup) + if (!crtc_funcs->mode_fixup(crtc, mode, &adj_mode)) + return MODE_BAD; + + ret = dsi_encoder_phy_mode_valid(encoder, &adj_mode); + if (ret != MODE_OK) + return ret; + } + return MODE_OK; +} + static void dsi_encoder_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adj_mode) @@ -622,6 +688,7 @@ static int dsi_encoder_atomic_check(struct drm_encoder *encoder, static const struct drm_encoder_helper_funcs dw_encoder_helper_funcs = { .atomic_check = dsi_encoder_atomic_check, + .mode_valid = dsi_encoder_mode_valid, .mode_set = dsi_encoder_mode_set, .enable = dsi_encoder_enable, .disable = dsi_encoder_disable diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index c96c228..dec7f4e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -178,6 +178,19 @@ static void ade_init(struct ade_hw_ctx *ctx) FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND); } +static bool ade_crtc_mode_fixup(struct drm_crtc *crtc, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + struct ade_crtc *acrtc = to_ade_crtc(crtc); + struct ade_hw_ctx *ctx = acrtc->ctx; + + adjusted_mode->clock = + clk_round_rate(ctx->ade_pix_clk, mode->clock * 1000) / 1000; + return true; +} + + static void ade_set_pix_clk(struct ade_hw_ctx *ctx, struct drm_display_mode *mode, struct drm_display_mode *adj_mode) @@ -555,6 +568,7 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc, static const struct drm_crtc_helper_funcs ade_crtc_helper_funcs = { .enable = ade_crtc_enable, .disable = ade_crtc_disable, + .mode_fixup = ade_crtc_mode_fixup, .mode_set_nofb = ade_crtc_mode_set_nofb, .atomic_begin = ade_crtc_atomic_begin, .atomic_flush = ade_crtc_atomic_flush,