From patchwork Fri Jul 17 09:04:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11669599 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8850E14E3 for ; Fri, 17 Jul 2020 09:04:58 +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 6605F20829 for ; Fri, 17 Jul 2020 09:04:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ALwYn273" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6605F20829 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE8F56ED72; Fri, 17 Jul 2020 09:04:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DE126ED6F for ; Fri, 17 Jul 2020 09:04:46 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id o2so16115080wmh.2 for ; Fri, 17 Jul 2020 02:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ezYDdxg/7mPn9HTGFQP0CvWZcnlJPLHe1q3mg74ENb4=; b=ALwYn273RhTLJBZWUYezsHm5z+SEI4l4ikHUK3HiUhXTD2wYHnPG8cqY/v4bWi5EBg RF0HffJ5wSvyZO8CREtlXlSsB4rimzQCbdTw6kmYIwHxXG0rBi3S1WbVoz7LcdoCBA/1 xsuDZ7sZ/eINbNlCk+cyoA1ZXOPAEhKk8kuJI= 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=ezYDdxg/7mPn9HTGFQP0CvWZcnlJPLHe1q3mg74ENb4=; b=O26VseKpCjsgxlLE2Dbl6Mn9ers2NND3/LRn1cV6GOTEH2B5oAGiq0asQYpPDG4CK9 VeDgGfQcpWTTEXwgxaHRQrsCm5HaOfc6pv1cvRulZ7Zc4/X4KFpoERSbNA22iQIzsQ9l EaqvA5oMFgFlB5t6g+l7P/rKkWjiVNy0OiUPA86cbBrEzRgBzGXk0JNIOPwM6BixQxTZ pZEN1+B8DLxRpwUSQSy9Yh/szg6cqAAJBD+G3hcN82SzFrOh/Hxdknowu6OTAOdV5dBi iTSnwQqjkPll0+to3MiLabSQ1GJ/tmh/G56u2Gvkil0JXizx8RlZxcMghrZ9DXlR744a BdZg== X-Gm-Message-State: AOAM530XgfhWWyAOBWkmODde2H4o8rb1Ng2a3TTUEg/I+IQ9WkcaXOlg ik7maFUqTeO+8GP6OuH8Ec0xtSmFEBY= X-Google-Smtp-Source: ABdhPJxjCXPrSYMXos5w7Z/yYLPe2nq9iilBnBTpidNYntr91zV04kjtM2D40ljy+AfoLi8M2kWM3w== X-Received: by 2002:a1c:2905:: with SMTP id p5mr8659909wmp.91.1594976684638; Fri, 17 Jul 2020 02:04:44 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l67sm14520833wml.13.2020.07.17.02.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 02:04:44 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/18] drm/arc: Align with simple pipe helpers Date: Fri, 17 Jul 2020 11:04:22 +0200 Message-Id: <20200717090430.1146256-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717090430.1146256-1-daniel.vetter@ffwll.ch> References: <20200717090430.1146256-1-daniel.vetter@ffwll.ch> 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: , Cc: Daniel Vetter , Alexey Brodkin , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Simple pipe helpers only have an enable and disable hook, no more mode_set_nofb. Call it from our enable hook to align with that conversions. Atomic helpers always call mode_set_nofb and enable together, so there's no functional change here. Signed-off-by: Daniel Vetter Cc: Alexey Brodkin --- drivers/gpu/drm/arc/arcpgu_crtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c index 72719556debb..c7769edeefdf 100644 --- a/drivers/gpu/drm/arc/arcpgu_crtc.c +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c @@ -73,10 +73,9 @@ static enum drm_mode_status arc_pgu_crtc_mode_valid(struct drm_crtc *crtc, return MODE_NOCLOCK; } -static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc) +static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu) { - struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); - struct drm_display_mode *m = &crtc->state->adjusted_mode; + struct drm_display_mode *m = &arcpgu->pipe.crtc.state->adjusted_mode; u32 val; arc_pgu_write(arcpgu, ARCPGU_REG_FMT, @@ -110,7 +109,7 @@ static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc) arc_pgu_write(arcpgu, ARCPGU_REG_STRIDE, 0); arc_pgu_write(arcpgu, ARCPGU_REG_START_SET, 1); - arc_pgu_set_pxl_fmt(crtc); + arc_pgu_set_pxl_fmt(&arcpgu->pipe.crtc); clk_set_rate(arcpgu->clk, m->crtc_clock * 1000); } @@ -120,6 +119,8 @@ static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc, { struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); + arc_pgu_mode_set(arcpgu); + clk_prepare_enable(arcpgu->clk); arc_pgu_write(arcpgu, ARCPGU_REG_CTRL, arc_pgu_read(arcpgu, ARCPGU_REG_CTRL) | @@ -139,7 +140,6 @@ static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc, static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = { .mode_valid = arc_pgu_crtc_mode_valid, - .mode_set_nofb = arc_pgu_crtc_mode_set_nofb, .atomic_enable = arc_pgu_crtc_atomic_enable, .atomic_disable = arc_pgu_crtc_atomic_disable, };