From patchwork Mon Jul 5 01:20:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 470174 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3547075jao; Sun, 4 Jul 2021 18:25:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybv6FEFTOspbS+P0ONnVISr+vY5WgnzhGu3af0m/3RR0GMGTsyH0F7+TkGXuQLDUZkhNCU X-Received: by 2002:a17:906:940b:: with SMTP id q11mr11078662ejx.79.1625448313555; Sun, 04 Jul 2021 18:25:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625448313; cv=none; d=google.com; s=arc-20160816; b=t0NauvEBb4GVF+R8JF3IcV/onpH6VUluAs9DuHL3iRGJp1EmPyw4F54JyhTdkXNSVz u6fegScLe59kPSUF89VrdqiDsjFxKOkTukmDNjn4FL2QCI4LOmB4XLNV6Ez3NsG1LGKA BsJ78Gf+NVSv3TvYstdLF8IV3adQmj1ZI4Zazic8p00PNIfRvuCvLIZCOQOStdcBKq3S 8ntvkxfkN8s+1sWjIBY9mL6CgmX4lPXBFohatYWx3wb1SvD+FrN5tu49A5Up4fuvHixS PCj/YrhJ/bz5Uqm721ZtoX7YUsyMyFWKkRPX26jWtMoBodlHsPQJ2CjKdLlwpKk6Fxec bI1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uKeS2D6NI+nwzdlSN/CbA1/E6G9yn+fxXMAvAL8n5i8=; b=Ak5ATAYMPuv5YrQgJo/l00ttS+1CsGCf5SWw+MqbGRz/O10VW+PtSukIOWArUpZEWJ msXFG8sfenxTccOm7DASi2+iHZb4ComPBTqi4Uce9CfDRRpiyEqXN4d+7oVHLsvHyuPl b1Dd35OBjWzVXqaX2XtrBPXhRjqdQIZgrIpZ4f4V1ICPS0FtP11cw+Vg6xJIfgTWJtmb xmeEdC4qCsZF/opAp38nbFctckaDZ5093LaJiMrzH9RvSThY6ayW+Lbd+ZyEjQCZ849Z ByJHdqGUuP1EpEigcO1dYE15XOw00pjWtj8vyvXc/SWLphLFcsoBKTUINeVP63OgTqF1 3h1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbEqMc75; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cn17si4805170edb.13.2021.07.04.18.25.13; Sun, 04 Jul 2021 18:25:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbEqMc75; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbhGEB1s (ORCPT + 17 others); Sun, 4 Jul 2021 21:27:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbhGEB1s (ORCPT ); Sun, 4 Jul 2021 21:27:48 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53F2AC061762 for ; Sun, 4 Jul 2021 18:25:11 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id f13so2737126lfh.6 for ; Sun, 04 Jul 2021 18:25: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=uKeS2D6NI+nwzdlSN/CbA1/E6G9yn+fxXMAvAL8n5i8=; b=kbEqMc75qhYjbWdGft33GVhlyKhK9/+bCcBo03ADmlFC12a8qngXv5n1ggZiinROX4 6Um0s8Trw8RMLVpTTn6Lv4KRsC2PYb0ra77vxcCNopE0lgzotwK3ytqCAFn1hgJ4DVmL Zzf43ilzAP3KXlsGW8g3PX34n7K02N2wuNSdR/DvamDd4zeR8WeBLluLugA7E+dDnzzR xxmhseQV41BKkruW9hFW5URxrmZj6AET3wANfx4L6e4Gs+Lz6XTpOfkKabQrBQ2qIK1x dvG5L6d1zZPxVjL4vzf7rc9t6kSMUsIo21+3bK/N7Q/drs8ciejp0hrpzsVTunIlTWSG qKMg== 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=uKeS2D6NI+nwzdlSN/CbA1/E6G9yn+fxXMAvAL8n5i8=; b=WS5dok595DM4tXcOqbWP3OwsLJQy/9b8iZwuXuTOWIf63L2Io+LAlXYekOoiigvSoV BGuN/1EKem7T5mDKlhnoSDOTDMZDmhLEyx9T+7r4s/dK2XfyztqWRtce+TscI1978yqV cpGpsYN+OCkdHZXw8P5JbNNbw9jYp8nUgqeuXPvP4VcZOU/EInrwlt1ZKnIiszB4dVsW kzYNfNfqiduH4cIxIYx2oXmzZxsZRMjB2JbjccoD2UE4ivyI88AMklMznM62ZTG7rXsA euJI3FwcGn8ls9aGN93sy0JELYith8nolPvZ3Zts+9knDvJ6pOhfMpb1Y4v31lrWNBLT h3Ow== X-Gm-Message-State: AOAM533QmesdsY2VHX4jsMrYi+Fqx86C0hiIUxPlWN7kQoGHgWRt5iHf wjPWQwFBq/DTa9qhCYVwm42xWg== X-Received: by 2002:ac2:54ae:: with SMTP id w14mr1363691lfk.97.1625448309711; Sun, 04 Jul 2021 18:25:09 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id c7sm1004345lfm.50.2021.07.04.18.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 18:25:09 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Cc: Jonathan Marek , Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 04/22] drm/msm/dpu: remove stage_cfg from struct dpu_crtc Date: Mon, 5 Jul 2021 04:20:57 +0300 Message-Id: <20210705012115.4179824-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705012115.4179824-1-dmitry.baryshkov@linaro.org> References: <20210705012115.4179824-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The stage_cfg is not used outside of _dpu_crtc_blend_setup(), so remove the temporary config from global struct. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 11 ++++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 9a5c70c87cc8..ea678ddd4589 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -190,7 +190,8 @@ static void _dpu_crtc_program_lm_output_roi(struct drm_crtc *crtc) } static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, - struct dpu_crtc *dpu_crtc, struct dpu_crtc_mixer *mixer) + struct dpu_crtc *dpu_crtc, struct dpu_crtc_mixer *mixer, + struct dpu_hw_stage_cfg *stage_cfg) { struct drm_plane *plane; struct drm_framebuffer *fb; @@ -199,7 +200,6 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc, struct dpu_plane_state *pstate = NULL; struct dpu_format *format; struct dpu_hw_ctl *ctl = mixer->lm_ctl; - struct dpu_hw_stage_cfg *stage_cfg = &dpu_crtc->stage_cfg; u32 flush_mask; uint32_t stage_idx, lm_idx; @@ -275,6 +275,7 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) struct dpu_crtc_mixer *mixer = cstate->mixers; struct dpu_hw_ctl *ctl; struct dpu_hw_mixer *lm; + struct dpu_hw_stage_cfg stage_cfg; int i; DRM_DEBUG_ATOMIC("%s\n", dpu_crtc->name); @@ -288,9 +289,9 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) } /* initialize stage cfg */ - memset(&dpu_crtc->stage_cfg, 0, sizeof(struct dpu_hw_stage_cfg)); + memset(&stage_cfg, 0, sizeof(struct dpu_hw_stage_cfg)); - _dpu_crtc_blend_setup_mixer(crtc, dpu_crtc, mixer); + _dpu_crtc_blend_setup_mixer(crtc, dpu_crtc, mixer, &stage_cfg); for (i = 0; i < cstate->num_mixers; i++) { ctl = mixer[i].lm_ctl; @@ -311,7 +312,7 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) mixer[i].flush_mask); ctl->ops.setup_blendstage(ctl, mixer[i].hw_lm->idx, - &dpu_crtc->stage_cfg); + &stage_cfg); } } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h index cec3474340e8..30535acec670 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h @@ -116,7 +116,6 @@ struct dpu_crtc_frame_event { * @drm_requested_vblank : Whether vblanks have been enabled in the encoder * @property_info : Opaque structure for generic property support * @property_defaults : Array of default values for generic property support - * @stage_cfg : H/w mixer stage configuration * @debugfs_root : Parent of debugfs node * @vblank_cb_count : count of vblank callback since last reset * @play_count : frame count between crtc enable and disable @@ -147,7 +146,6 @@ struct dpu_crtc { struct drm_pending_vblank_event *event; u32 vsync_count; - struct dpu_hw_stage_cfg stage_cfg; struct dentry *debugfs_root; u32 vblank_cb_count;