From patchwork Wed Feb 9 17:25:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 541146 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1530733imo; Wed, 9 Feb 2022 09:26:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmb+NQTwpwHS1uARgQlSNqGcyudBhqTXNKSDesRWvgV7psGWmV17Api7fZDdQWJ0ZDn6zZ X-Received: by 2002:a63:6a46:: with SMTP id f67mr2680840pgc.541.1644427584062; Wed, 09 Feb 2022 09:26:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644427584; cv=none; d=google.com; s=arc-20160816; b=CfC/gvgEBq7UCplYGUd9+Kx0z0srVDLYXpSadAqDxdENektguXo3y94/AsOopugECP TxkLsqpzbdhDP2eklqEaLMBYV/luHbcwXYB4slkWt4XxQMETJ7XPvLj9eB/w/f63R0Ao 5QdRK4HXiqupotsWhqfks1r46p/ZdB0B3QI0F5odI6UmepLTUzVVpoLvs8Yh8eghmI2h x+G7+IkVqDLYMvpgI8cjFkIkkZxFky7fUrilbgxN0Ss1oImpiA1++rvwLNiRWAFQS/FP g3o3hYyD/P5wO+fgKva84gw/eJ+f4MgkxISakeg31/fQlt6UkhKrz91va2J5FIDnAhlw lsQA== 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=KlXJh/oij3IFeqlWuJgcoMFVaedivMEjjROIIO+IawE=; b=ZIERPBAPjXM7vEr2ghbluEE4IBQxPOoVihZyp5+M4o4n3gWn3cQWlEVdZ84MZcuXTB XtwOKayEeJc25B2xa1OnftA5DTmqSfSNqSGmqABNJwdMY7aYRng90mvhV93jT1g48fp3 bc2y8p9Cm4vnYb3hHdsYEn2VcLMPKVBxqw9q4DGQkS3HeeVCmwsoQ1zfQtIxTB+coqvJ pTvpJyrg6uwHfqi6iprWvaHIWHaoynfMI3oOv19jvWDqZz6g4jcbnfTfK18wGRIdIBY6 dgJVIq0jOaDxmM6kmTKJNehJhWn0fge7tZGzzzNDDbPZmwD3NFyCZ8JP9JURD9N6PtuT SpDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f5ZNLXXB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id k20si14817463pfa.326.2022.02.09.09.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 09:26:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f5ZNLXXB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 8F03D10E4E8; Wed, 9 Feb 2022 17:25:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C6C410E4EE for ; Wed, 9 Feb 2022 17:25:43 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id bx31so4517692ljb.0 for ; Wed, 09 Feb 2022 09:25:43 -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=KlXJh/oij3IFeqlWuJgcoMFVaedivMEjjROIIO+IawE=; b=f5ZNLXXB7rVo1loml3byRNJjtT8hKPJWsvT+Dro3yEZwUUfP4XiL4qcyxHy/O0aoT/ La4BYx9p/yNVnLwO0aA9ZINZ88z+EwHkft493hjP5TrCC5DbxKPYswzsidRR2dScO2s0 V1DZngz8X4U437JBpBbJHlk9aHt8CWur6ChS56pGlHt5gGPa2ly50h02aq/jityrxto+ 6SxgH51/ekiu2J+o9iMIDGszK3WR0ilLLyJ3xzbIZRGiXI0nsTkzlzh3yxzkarzXuslb cR4jKOI6kNvcNDlARF6Fe1rIsLG7k5XH87KQXATOEoEcV3DiQQoqvzLbPWU4JHfnhNec 2pEw== 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=KlXJh/oij3IFeqlWuJgcoMFVaedivMEjjROIIO+IawE=; b=M5yKoNEdujpdcPEq0zX8nSGLs+8ISN4tMjvG2kROKFcPkrVV9EjeBatJUD5kLMZoOx cjg5zmVv+BATAWhElJl4LxqGieQYFAN/9tyZtz9NgRUSDmnQUNwwN2K09IVoqn1OrUp5 SPE/os1JKbExveoC/X+Pn+xK8l+ONXBA+b6d9D5CNUY7HwFXaWy7jM15jp6ITk6WyvTQ x7ty/2jX95Xql75ZxmxpFL51h9j0sqQumSho1SI98+mOXRmjs0oZKogqefbUsnIjpwuO ALt5AUzJ9p7+R1Ro4hq4eHVQLNYCPJ62+lDqBx7vgqIFJTz5UA4PkTCdHofbJIfLfAVM mxUg== X-Gm-Message-State: AOAM533Vv60/5jvJiFGP7PnxCiF7mpL8KTNLFNRHX93K59b5UjAFRJbb GU0RJc04K7/Ab91U+u1xj84GnQ== X-Received: by 2002:a05:651c:b0e:: with SMTP id b14mr2270897ljr.345.1644427541887; Wed, 09 Feb 2022 09:25:41 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u14sm2560055lji.40.2022.02.09.09.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 09:25:39 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH 19/25] drm/msm/dpu: don't use unsupported blend stages Date: Wed, 9 Feb 2022 20:25:14 +0300 Message-Id: <20220209172520.3719906-20-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209172520.3719906-1-dmitry.baryshkov@linaro.org> References: <20220209172520.3719906-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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The atomic_check compares blending stage with DPU_STAGE_MAX (maximum amount of blending stages supported by the driver), however we should compare it against .max_mixer_blendstages, the maximum blend stage supported by the mixer. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 637d164667e9..952ff11162c0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -927,9 +927,9 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE; pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos; - if (pstate->stage >= DPU_STAGE_MAX) { + if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) { DPU_ERROR("> %d plane stages assigned\n", - DPU_STAGE_MAX - DPU_STAGE_0); + pdpu->catalog->caps->max_mixer_blendstages - DPU_STAGE_0); return -EINVAL; }