From patchwork Wed Dec 1 22:51:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 519747 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp927218imb; Wed, 1 Dec 2021 14:52:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLrYYECvsQvj8iMeVUbjkVw6i9IlZHmhyJyWEPPFIG4aWiT5b56eOHZWUNKRKMUDevCL+n X-Received: by 2002:a17:90b:50c:: with SMTP id r12mr1401199pjz.71.1638399122107; Wed, 01 Dec 2021 14:52:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638399122; cv=none; d=google.com; s=arc-20160816; b=OnZbXbmUmGEpIRIehdolZVD2atuzzBuGtZ2sjEOusZbbv8dqXKhJt5wuN9h1C+Ro26 i9MDwhVlayymYD2cJYo11DXTNgFSduFUeB0W2m716z59UbanASltBNn8JWyX2OCOwyXC fukLaDzRFElnOryq4he2IMF72BH2jPJ+KYo3/21Ahj07KgfyCmXgmgmbMjgqbAJobev0 5BxwQIpxaIykZuvP9ZCl6jSAlqZFt3cCNADyiaTKJ/DrO+WR8vWG9ZH8ShKqrvf5mMAB dawpdQGOIU+CoN51uTguxjLrxeM57O1yxg1oykLrmisK9F/BjqP23Mi/CSHO3AP26T22 lONQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=GvsWfL7mbOVefyoKeCj6Q5Bk0eV0IEAIU/XkuhNVYgo=; b=zqx+6lVAYUkpPzwVhBYojI4K63QvF6SvuJPOjO6zR+PG0P5H+h0IieQ8lLFs308cWZ 0nHwA2mH8trzpiZ3ew8QnJaA3uTZPxa3smPuZrLvaT+Z5XFlBfW9vgx4Uck+vqCz9wza m+42JHrVffFBIZBSKJAUQyjPT1K1MNTKFeq7/f2smVAnN3ff5fC6o0xsCKoF4BWABYBX Cib8fjd0s1Kv9Bh91tdMni0aJw1NqGYpJ68TQ0d1KBjhHAS3X3iGMlXvD2hSVt/Vo7RM qNxYTvDM6EsE2dRM+6U5E16H2DRjKMU/VyElbGhET90SB99XowqU6JMhLfSoK1DEI0+r uQZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o2Kluvlh; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id h13si347451pgp.231.2021.12.01.14.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 14:52:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o2Kluvlh; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE51B6E8EC; Wed, 1 Dec 2021 22:51:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by gabe.freedesktop.org (Postfix) with ESMTPS id A29016E89D for ; Wed, 1 Dec 2021 22:51:48 +0000 (UTC) Received: by mail-lf1-x130.google.com with SMTP id b40so66792487lfv.10 for ; Wed, 01 Dec 2021 14:51:48 -0800 (PST) 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=GvsWfL7mbOVefyoKeCj6Q5Bk0eV0IEAIU/XkuhNVYgo=; b=o2KluvlhXKOWt4Xt6mrtsYmjh0cHuQobULvXY8yR8HgIZQZUCdXW+fDuoTdlXP7X34 xfSUNrxKE6hAF5wDd5wUbrtHrSya3p6gPazNYn7IuAGnd3g2fpBRHdJitVIWBXx9Pt7B kw/Mj+RpOaNUvGlID3rCNmn2+GJrpVgqv3U53MzQjfMWbtcAXBgcm2N9rqgBntMgSpI2 PU8uoT4rhCobjeMKCgppx/xCrb+iTQm0yzfcCJ9zTLVpD/VvcQpZ4JKcPaWvTG4D/0tU hAvQqEIGzcKZ4sdn6qsNUmZCTa2Xnm7WwPPnkxMlrxIQxdLlI7bNHlSaLx9Tdv84/aKC /JjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GvsWfL7mbOVefyoKeCj6Q5Bk0eV0IEAIU/XkuhNVYgo=; b=c4EQl31IBfa8D1kJ0K45tBwU0mlsFstN9g1zCUEmNCqkEc2DORdyVy02t6vtDokdZL FCD0HaH86CV84nnFGy2IEl0+Tr+xtl+cWTEW3JNthwlc4iFxRE0cKlAq3u67klsfE1yu n1K4wD5odG1IeaCPf8NUQySEkIitW2Cd4w9MF/tY4q451nHxA3uqPgvMtTnWE9VUGj7S 74tJtEm+YTCeddRr3qtk87vVK5wCO+At8j10ZOfIFtXAQUmqnOQVjcDEd4EJ1UnbAycX 7xsKPbQjcVn/OIvc3we7zVcqwf/Mcq4WzLgIlGZ3PBhFw6W+35vvvmhJyFZQriYZ1Syr YIBg== X-Gm-Message-State: AOAM530NlKn/EJ3ZqERPPcjCW7DdBZEiLHngWpdiWxjyVCZhocOlA8Ei Jzu5GzH8iD6BTgvsxoK6tHyoSC+RUPaNFA== X-Received: by 2002:a05:6512:150c:: with SMTP id bq12mr8569303lfb.687.1638399106986; Wed, 01 Dec 2021 14:51:46 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u7sm124819ljh.49.2021.12.01.14.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 14:51:46 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v2 2/4] drm/msm/dpu: drop pe argument from _dpu_hw_sspp_setup_scaler3 Date: Thu, 2 Dec 2021 01:51:38 +0300 Message-Id: <20211201225140.2481577-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211201225140.2481577-1-dmitry.baryshkov@linaro.org> References: <20211201225140.2481577-1-dmitry.baryshkov@linaro.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: , Cc: Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The _dpu_hw_sspp_setup_scaler3 (hw_sspp->setup_scaler) does not use pe argument. Let's remove it while we are cleaning scaled configuration. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index d77eb7da5daf..7235605bfc9e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -413,13 +413,11 @@ static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_pipe *ctx, static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_pipe *ctx, struct dpu_hw_pipe_cfg *sspp, - struct dpu_hw_pixel_ext *pe, void *scaler_cfg) { u32 idx; struct dpu_hw_scaler3_cfg *scaler3_cfg = scaler_cfg; - (void)pe; if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp || !scaler3_cfg) return; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index e8939d7387cb..ad2002d75739 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -334,12 +334,10 @@ struct dpu_hw_sspp_ops { * setup_scaler - setup scaler * @ctx: Pointer to pipe context * @pipe_cfg: Pointer to pipe configuration - * @pe_cfg: Pointer to pixel extension configuration * @scaler_cfg: Pointer to scaler configuration */ void (*setup_scaler)(struct dpu_hw_pipe *ctx, struct dpu_hw_pipe_cfg *pipe_cfg, - struct dpu_hw_pixel_ext *pe_cfg, void *scaler_cfg); /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 4c373abbe89c..c7b065b14c5c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -688,7 +688,7 @@ static void _dpu_plane_setup_scaler(struct dpu_plane *pdpu, if (pdpu->pipe_hw->ops.setup_scaler && pstate->multirect_index != DPU_SSPP_RECT_1) pdpu->pipe_hw->ops.setup_scaler(pdpu->pipe_hw, - pipe_cfg, &pixel_ext, + pipe_cfg, &scaler3_cfg); }