From patchwork Wed Feb 9 17:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 541149 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1530785imo; Wed, 9 Feb 2022 09:26:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyl2pmtIutMwn+Q7Bntjqeb4atr9G+H2j4MC5no+hTb4A91ugruJ0TS1OocbpMtt9ccAf1E X-Received: by 2002:a17:90a:e549:: with SMTP id ei9mr3664249pjb.190.1644427588603; Wed, 09 Feb 2022 09:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644427588; cv=none; d=google.com; s=arc-20160816; b=K8ftUgf4uUbgVumd4oYLeYk131dYlS/Iu0c/perFrE13Zujm03D3RWZ6Y0Pp4stYZK mPhQH4Hf5UmhtzcUQQuCLWmUyWNmuZY6J4Sj2KCkaokV+1VHnXxQ671TSLwKvoWIIo7y kyQcbQJ3cWIqpBqgwEdN90TPE7loitnG72u8M8lfhvB+KPUfhoSGldQQiveIGefmz1TR Kz/Onys0ORrD450Ruv2hWbcz3QesR4fG7mdsDOQzEk+8Uz8ix9EFLnjlzpA8IBHN+L+f I2FdW2E4F4N93yYCr+R3SSJvQt1HIT3X2LhRT0v7TygZhA/MZGRdhIjDzykpwh75z/l5 ThKg== 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=hcKdYcy2gg8ZNxU2vs4D1XtYhBHKzBGRudwCCATIQNs=; b=JiHwt/1gEviW6sIlOqPu+9qKsumrGFwy5j4Ms0wm0mxb2PD5jv92H8al2f+23cHM73 PDmehHzw8fq3H62m3jODIza3REPXOMMt2XZp+BHRq1IvvPXMUia13welY1MDmkkis2b3 YDIcMUoeFnsHdnd6/sDj32+I6LnaB8g48ck7qibuE3bXNf/hHxEH5lfSEeFES4idnLdV W7p0O3lGdToJI5XXrhpAdZ8ET4m0MDaavavH7AObg6d24eQfcUMXy+pgJ8bS5ZeDks01 pesy9I5fhwtRGfDiXuIBnEzjF+/4T6rMe5kxMRNmUS6rW1ubql+/4iufMwijYt/9lgxA vS4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b8IR7h5d; 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 y4si5233520pjg.126.2022.02.09.09.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 09:26:28 -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=b8IR7h5d; 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 16F1B10E40C; Wed, 9 Feb 2022 17:26:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DF5710E50A for ; Wed, 9 Feb 2022 17:25:48 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id b9so5552500lfq.6 for ; Wed, 09 Feb 2022 09:25: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=hcKdYcy2gg8ZNxU2vs4D1XtYhBHKzBGRudwCCATIQNs=; b=b8IR7h5dbRXHphEJjKal5av2yFLfFOoWDbpU/y21y7SUYjXIY3R6u4gHM5E7CnQUsT yPoUE1h7KasAhtKVMzYmbWzgaGwAPzYeGt6ARJQxgV1/X2O/JbXpWEVRg4WXGApzgJFQ Q7zBeky8DJNnb/P3wwz9eiyPPYMSosqlV0RJ/I2fo5eeg5UQcWm23Q5lhM26hqwtmZZ4 9mA0rgMoPxvfp2kRlb0aUsTFdsPVzTkjliKap2hcDnh03/sILrrMUcIDHtHxwb8q1JGJ n2ZNZ3CFDziviIfDkH4meJ88URKtFxl4ajc7ijVsOjIPDQI8GOYjd24RRkUs5FUHB+m9 lyIw== 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=hcKdYcy2gg8ZNxU2vs4D1XtYhBHKzBGRudwCCATIQNs=; b=rYgbWs1+zWiENW7HBsD0pylF5Arn83UHC52vEd2r0RTbAh2Pw6nPeKOGRph/Dtx7R2 +yj2qcesPzhFs2rmTb3A/b2jg09JLiB3dz9s+fNVdN4mGtcIwxzH3wh7gppss12IvxeM +EZgis+imEmhvKKqtLUIyJ61JFmLmdZYXkjTSthCMigSLElTVZq+Dde9DoLWYT0Q0giB +184YgSKTHVAdYM6TMWV6awk4j+VM6byqruzj1l+lSrnDZ7XPah7EwLR5uREFZ/0rKO4 w68Ph4hXZ+LbP/0+Xjm6+IbWhmfmrGZM9GLSFI8SmGjafnV7WUW45HnaFAjdBRw1Ecgl aPGA== X-Gm-Message-State: AOAM532lDSvp4QXLkAbNB6OlVCUYdGeJxbmSLvCydXm0iLy5El0celeC BvrQAUd/Sr/5AOBxd0I5Nw3VYJfuPmwCdg== X-Received: by 2002:a05:6512:398a:: with SMTP id j10mr2241899lfu.189.1644427546995; Wed, 09 Feb 2022 09:25:46 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u14sm2560055lji.40.2022.02.09.09.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 09:25:46 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH 24/25] drm/msm/dpu: populate SmartDMA features in hw catalog Date: Wed, 9 Feb 2022 20:25:19 +0300 Message-Id: <20220209172520.3719906-25-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" Downstream driver uses dpu->caps->smart_dma_rev to update sspp->cap->features with the bit corresponding to the supported SmartDMA version. Upstream driver does not do this, resulting in SSPP subdriver not enbaling setup_multirect callback. Add corresponding SmartDMA SSPP feature bits to dpu hw catalog. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index aa75991903a6..3564eea29563 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -17,17 +17,21 @@ BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_EXCL_RECT)) #define VIG_SDM845_MASK \ - (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3)) + (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3) |\ + BIT(DPU_SSPP_SMART_DMA_V2)) #define VIG_SC7180_MASK \ - (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED4)) + (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED4) |\ + BIT(DPU_SSPP_SMART_DMA_V2)) #define VIG_SM8250_MASK \ - (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3LITE)) + (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3LITE) |\ + BIT(DPU_SSPP_SMART_DMA_V2)) #define DMA_SDM845_MASK \ (BIT(DPU_SSPP_SRC) | BIT(DPU_SSPP_QOS) | BIT(DPU_SSPP_QOS_8LVL) |\ BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_TS_PREFILL_REC1) |\ + BIT(DPU_SSPP_SMART_DMA_V2) |\ BIT(DPU_SSPP_CDP) | BIT(DPU_SSPP_EXCL_RECT)) #define DMA_CURSOR_SDM845_MASK \