From patchwork Thu Aug 17 19:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 110341 Delivered-To: patches@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2573073obb; Thu, 17 Aug 2017 12:00:12 -0700 (PDT) X-Received: by 10.99.49.16 with SMTP id x16mr5975937pgx.309.1502996412020; Thu, 17 Aug 2017 12:00:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502996412; cv=none; d=google.com; s=arc-20160816; b=MwOtXaPGxgEv8P5xKZ/ABRUSfVlzwgFoFOLdDJwZGj1r0u2jtso+JtRFWaQ/0wW0S9 SfyNNYIhJz5rGYnACSRLQV/zt8Pshj7Y21m5iZst3HEhXDnz0piQ3Y3lvXqjAKa2wUpB vLsC5QueFEJqnfZ+HtciKGRTc32izQeAlLSfTcJaSdbGnrg1M124jmXFzP1XW9IhDKw/ eBX0rhdATaZ8FsAaXgeMErOOxvR8/quqzEpL61GAG0/rfZXAwoayehjAAXgG47KmU0fn FButASfRVY+GbpJsmoDhqv1d9Fr9iO8Y8RQggMO6F+wadIYBD8jnP7Qvn0jE/y+KlPPo C0YQ== 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=tjt8C7TtMerkTryydQFsKJNVml6DMrD8jfs1XRhoH/2pm/B6xleJMbYNcZ1/P330Zm bXlmdRmifuF5EuntH5KAJGE0laRF4Y0oNvaZDlfwcq+N1mDFdIAA+hALk6+UMCMu45Sa Ux2HkFvax0nT8JY84xgcirPonFxD/i7MqKYZrwL4gVqcuwnQJaCmTnSqdyPlHHdfjKxE n+BssD8VLikgdWoyFP/Gn+fMQ1BBtb52+0iRrkFNfHVDli1YMQUK17k/AG9VePVaJ8Wt LOHch1KEwKQqUfka90O+Q7vRF84cgH6sY7dAN0ycMucUIxLCnrm9ev4GGcjPHCxaJKOS DKsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=THRe094o; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e 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-x22e.google.com (mail-pg0-x22e.google.com. [2607:f8b0:400e:c05::22e]) by mx.google.com with ESMTPS id s3si2627931plb.503.2017.08.17.12.00.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 12:00:11 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e as permitted sender) client-ip=2607:f8b0:400e:c05::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=THRe094o; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e 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-x22e.google.com with SMTP id t3so20528589pgt.0 for ; Thu, 17 Aug 2017 12:00:11 -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=THRe094ocxtleNkVkbSrTxw+Z5ykZuXS3gWJ08QdGC3KCNjqnFX46eo2pG+WVwQ/rx T+2UxxjnviLbEwIkg1zhloLDv2nwmBLn4oGu+Ag9jHqO1Y2N+adTch8ToomKRZWMg4In ThALpWZ28YjdGN7vLz7Uq1LuwSmHOb8VpKgHg= 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=QZtdAaJPbRSqk+CJXgeyyDPQDWrB2d1ray3tJcGVyjHj3PROlkXiR3Ei8TRZOBqUvT RNA3ICSqIHLF11csLURA+PLV3Pmy4YM6dnAWujzj0hVqJdgbkK5C0sHJEtiNyXIvoCcf s24AvoOZApzmQjaT814mI/G1DGJ8jRwkD64suE3UoQtx2A+KNLX5AD7dELT9P//Xrb+X 4asz8mi9p65EHonjXoZLNwiurMwqmQaOGB47Wf+YkKNyR2jMNfKyC8RbQ/RgrbfAwVMq MlyzD+EhHWZWKNdMwG5KdwNm22louSU7xvbmAH/t2uuOcP/WShIQFsAj2cVyj4LZr/0L UBeA== X-Gm-Message-State: AHYfb5ime2+HQb190584ct4SEBBNd+kNY78UOc2zCdJ7LL4VlLhvDsgT X8lnve1rfAE9itowHxs= X-Received: by 10.84.211.136 with SMTP id c8mr7076399pli.273.1502996411557; Thu, 17 Aug 2017 12:00:11 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l2sm3588087pfe.168.2017.08.17.12.00.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Aug 2017 12:00:09 -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: [RESEND][PATCH v4] drm: kirin: Add mode_valid logic to avoid mode clocks we can't generate Date: Thu, 17 Aug 2017 12:00:04 -0700 Message-Id: <1502996404-15143-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 Reviewed-by: Sean Paul 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,