From patchwork Fri Feb 28 04:14:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869339 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 283EE1B041F for ; Fri, 28 Feb 2025 04:14:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716059; cv=none; b=QHppMxBMn5e4mT3Tfjv5NsWl55TqXxi9HAaPhuOIrjL3P05lYUT15kK5fu8c+womRcqwKTKC46rYBZULUGrUB9GSXYNDHRNmVRkcAcRY9JsNxW5aFZFXxTRO0QFlgGCI9zgDDt/IeJpRxlswSx+eHjVfUOQNKFkdW61GfYpAXcA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716059; c=relaxed/simple; bh=AoDhO2t+dIdRoZkxxXCA28rPq8VTkQxMjsmlolETDOo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PcD36gyGkymoe7ULa9Y89jsXMee75JTz8pgLhmz673/DGS+bN27zR6ZvwhN3P74weSX+glV69eNxTdKLpWO1Ye/R9W6mCF3XZZyJNRvK9Vuw8IW5swlzVPAUu7qv6CWafj/SJL7sS9/o2oiOcaEti9c6FyW+ToSFOOFu9WtiXyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JPO7JSdl; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JPO7JSdl" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5495078cd59so191093e87.1 for ; Thu, 27 Feb 2025 20:14:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740716055; x=1741320855; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=229LaQQs3AtVYpVY7CYXwuqYuFTusa/OnRSCiJVHHMQ=; b=JPO7JSdlglpxMeiGfDKfk+kHDTYiQ6sTFYELLEe625gQqXEEGaWVcCfUG8GbPM7805 SnxiP38GEQeUHIsnR1bRu3KBC4NEWyVagFixxDsVJohczSu0lYA385ZHNbmz6T78g4m5 prhR00uLd7B/n1E1pMENNdDyp+JzGCH5uoer45fI5l3wIOCLXd8VQezQ3lx3lnFIzgy/ zTN1epPmlsQEL7xJ09MRRxii9aY4Hyv9LuD8z6xPXmbHmdN4cLF9AFcSUStx/VBkWxHK 86NPkxSH45lVvTpWjTsAOlvSRu2+p1sB7ezSefF6FvSb/vwaZcXe226yFw7g3/4btNw7 IOmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740716055; x=1741320855; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=229LaQQs3AtVYpVY7CYXwuqYuFTusa/OnRSCiJVHHMQ=; b=sU2Fk5stKWEaivsqy77ttw/tgJ6Z8ApwdjZf0qqgM89eGPqAT0cTJ9EcVRztLfLyp4 fTEt9CylRKpZU0gyDmZLWCq7AIO1oGs3PURTCxCgBYZcQhsOudbfOhgkWvNECHlW688p KJEGCdHDMR22wOkZDgs9BJZCxFbdFlxWVaAV3/Bcxocsppimqa2FwJ+y0bdkg2b2VS/w Q37Sd6+8XcHg0CnieKTYdIH/phyzOQ4+UqoWBwPqHXDCCVnaDygm6/uEAXde3xu/8+KZ AjUcjnxB2jJ5lOgP/ZyOWoiyThDR7KOYKt8NfammxQOQ8gHHpX5iqFWmNekvtsFiNisj 8ojw== X-Gm-Message-State: AOJu0YzeHn/NyuJY+hgYc3TEiWEGgyEGTQkY0v9JSWWyKiDBZG9sOZhd FRCENlM7X/TdlW7qipFZJ7aCpypi+xH1FVTodKW+DhmYIw5UBJNKvMAS2n4CFAA= X-Gm-Gg: ASbGncvv91Qga71+i9YosG+FZ5iWGufxqVOlS5cJ71stWDpL4gA3K/MydLhyWwm9Kl4 NimXLi63x1YIic3SVKfVCvqeLICBIUpQy5LLKk6+mmaiCdsHN2FetsPStbJ8QQrRItj8c5EwGKg KSVXL85BVq7cjqz7u3uLpBXJfMpbZlvfHrAadBkhzVcUWTtyfm45zvvc/hUBhxHT8QBPsqgnIkk fx4HGofgmT8tz3+OGSP/kz/P/mGtyYw1/wiasnb+piGHnk3t4dSP/0wWcvKlU63/ZwyNjENlDPM QYO2SsIutQtX7lngS4kYrk6ho9qxEDUTIg== X-Google-Smtp-Source: AGHT+IESa8qolAMTFNqWbMDxjYResyR5kPLAkWzhjfwsqrBTG4hn9eOwmrwmXsP01jgv8LizRkO9Kw== X-Received: by 2002:a05:6512:3ca8:b0:545:1dea:7b2f with SMTP id 2adb3069b0e04-5494c38bd76mr634215e87.45.1740716055177; Thu, 27 Feb 2025 20:14:15 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549441262b9sm361101e87.0.2025.02.27.20.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 20:14:13 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 06:14:06 +0200 Subject: [PATCH v2 2/8] drm/msm/dpu: program master INTF value Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-dpu-active-ctl-v2-2-9a9df2ee5193@linaro.org> References: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> In-Reply-To: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2935; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=AoDhO2t+dIdRoZkxxXCA28rPq8VTkQxMjsmlolETDOo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwTgOI2a12c5nnpkFzuRBe/F8av9QAf5AGQdLt PAmBneIexiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8E4DgAKCRCLPIo+Aiko 1c/NB/4ld7gG0gXOmNt1fY0qrRWkykgxbJC059ytvMKjIFROSR3D9yGOy2W6VW5i3SVUU4RWYD5 4HDjTvWuaP9iBjO/AqntSMDzuAS3xupXntxShitM4JcZDrRSXk2Gdy8C1B3TYfnArBSQOJOTyA7 R3krlOq4v3n9me4V0BBsdQMbYzpTZIm11r6T2diA9NLtyXPoTPL3K8qj704t2d3ngq6hXjV7+et c6g/uznC+99Z8AbvtxmJ8ZciTFk5CaZofU4sqSOvoMUH5jVzkFiVesvv2oA4lT5zfv9L8uNxRca I1ELPXN4oFJVMUE30IPHTEP9+NYsOocTtEOF5QBMAOJKmTUa X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A If several interfaces are being handled through a single CTL, a main ('master') INTF needs to be programmed into a separate register. Write corresponding value into that register. Co-developed-by: Marijn Suijten Signed-off-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 12 ++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 32ab33b314fc44e12ccb935c1695d2eea5c7d9b2..ffff60c4206c6f2833293fdcc56b653f7d3124a5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -583,6 +583,9 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx, DPU_REG_WRITE(c, CTL_DSC_ACTIVE, dsc_active); DPU_REG_WRITE(c, CTL_MERGE_3D_ACTIVE, merge_3d_active); + if (cfg->intf_master) + DPU_REG_WRITE(c, CTL_INTF_MASTER, BIT(cfg->intf_master - INTF_0)); + if (cfg->cdm) DPU_REG_WRITE(c, CTL_CDM_ACTIVE, cfg->cdm); } @@ -625,6 +628,7 @@ static void dpu_hw_ctl_reset_intf_cfg_v1(struct dpu_hw_ctl *ctx, { struct dpu_hw_blk_reg_map *c = &ctx->hw; u32 intf_active = 0; + u32 intf_master = 0; u32 wb_active = 0; u32 merge3d_active = 0; u32 dsc_active; @@ -651,6 +655,14 @@ static void dpu_hw_ctl_reset_intf_cfg_v1(struct dpu_hw_ctl *ctx, intf_active = DPU_REG_READ(c, CTL_INTF_ACTIVE); intf_active &= ~BIT(cfg->intf - INTF_0); DPU_REG_WRITE(c, CTL_INTF_ACTIVE, intf_active); + + intf_master = DPU_REG_READ(c, CTL_INTF_MASTER); + + /* Unset this intf as master, if it is the current master */ + if (intf_master == BIT(cfg->intf - INTF_0)) { + DPU_DEBUG_DRIVER("Unsetting INTF_%d master\n", cfg->intf - INTF_0); + DPU_REG_WRITE(c, CTL_INTF_MASTER, 0); + } } if (cfg->wb) { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h index 85c6c835cc8780e6cb66f3a262d9897c91962935..e95989a2fdda6344d0cb9d3036e6ed22a0458675 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h @@ -36,6 +36,7 @@ struct dpu_hw_stage_cfg { /** * struct dpu_hw_intf_cfg :Describes how the DPU writes data to output interface * @intf : Interface id + * @intf_master: Master interface id in the dual pipe topology * @mode_3d: 3d mux configuration * @merge_3d: 3d merge block used * @intf_mode_sel: Interface mode, cmd / vid @@ -45,6 +46,7 @@ struct dpu_hw_stage_cfg { */ struct dpu_hw_intf_cfg { enum dpu_intf intf; + enum dpu_intf intf_master; enum dpu_wb wb; enum dpu_3d_blend_mode mode_3d; enum dpu_merge_3d merge_3d; From patchwork Fri Feb 28 04:14:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869338 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E3471B041F for ; Fri, 28 Feb 2025 04:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716065; cv=none; b=jBYD0Fuw41gbpgI5gQ+bKCQyEEk0pExwBpCbctFrQM2MA23bYIoeg1uQMHacZW63Mzv3sGiW9fSibXfcDXnjwulQDABXd+wS+O6KId6Q+RyVyQ6SmLb5GEZJ+GTuYG9vXq7JRSiEM46l4v/LCe/ocbmMYs1s8Gyd9Yoz0UF9gxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716065; c=relaxed/simple; bh=GhhCZJjEajy0jFOjY9R54kVOCzIOaWWu2XrVcVmmfhQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H0HWgE4xCx6Vd1B5PbWT+CJ+fXI8rvI8NWNuiJegS7s5di8HYX00ioF+8BhfBXyyZQu3oVwT8a2yuM9X/ERb4+Vllt7OiTBSsor9bHbHZHWA7cYloLPOK8/1T0jufDrGjK2Op4uFS/gXl/uexp011GT47hAWA1KTP/XCJ8UVnOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=pRok49+7; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pRok49+7" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-54943bb8006so1723655e87.0 for ; Thu, 27 Feb 2025 20:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740716060; x=1741320860; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qlvs3krFui5VM4RI+RTWfvb2I0najIuzQ1OGaYdSCdA=; b=pRok49+7H8OF5oxlOpXg2skncqCNCTPs2FpgMyCIP2zqOHoAwL90Le8rtAvV7n2Ru4 Bxq36MtWC8Ei1F06OPVuRIPaub3tsufv4hRcZQ1tif0FvxnkOEZvpC9IRm5yX62ZZKDq bnSaOXZE2dD5wJ8qH6IXHWsYx7uWkTRFsfMKwgcut5TjmUbY++Imy0ZkUB3zWZN46qNX rvUBA3TX6/FDHY3rWiLr/qb34PGHd4LrDapLn1QEnm2A7/VhARdCujqfTKFhe7viNv8O 6cqKHEMjWEQ/X11OSpWiR0wkOHzfwgjcNHtoh50kSg2Sx8JzA542yDyyUpItSv83OgTL nY1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740716060; x=1741320860; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qlvs3krFui5VM4RI+RTWfvb2I0najIuzQ1OGaYdSCdA=; b=sVpmM4WOeziNts+e9sLACn0608xJnuFWh99qDWlE9Sl0m6QYJFTZiuQbmcH91Nmpab NOrlACzYxVYH7Yu6kjmDc3Eky49+1kqoo8y/9+vBVLAqPUx9Gc2Ihp4ygtpqrmwY3N2c 8MM7BeCf3+Mn/zYQrSUgMz4sfeZXao9pBoNIdk7mnCMijlwlU6gEMdu4WZk6SOhdfUjE yzeZng/0MmBnDHyuzekRbcejEqkgSKxrcHHj38ivbBo3Y5VUyDVVBHr8iQQTpaMfq87Q fjEF/0lbsSP2g3rr/Vv5iIm61zX/SiYJ/+7xlygzMwqCLlvCejzqCCAgLuhuqSygiU/9 sFUA== X-Gm-Message-State: AOJu0YwpB1EHqQix0WwGyM0vDTpdwkWOtzwXnJMH2WD/kgQJpJev8kgv S4zKWqsopLdIhN323p4e17EHqQxcaj5wp5sVaOxmg/zY76N1LgWlzCdwPVb+vjg= X-Gm-Gg: ASbGncsZokMhWYx+4uURfyD/YRpim3dEOziECBTF9SsKdD29yO6Z/Es8DfOOODAdOoC R26JjrEXVoXOtfYsnTFqa5o/JmlWAmM8awIPzVsR3n81z6Z6N/Wa/EiuahqgIBtOn0bHIEf/nIi 2+S+XWh/oRgFFpzPznk47E7GMttwJ36rHW4Am80qenUdtFyV7jS/hifuQB9zSuuFT/X7amJGGNv JKrtu2JlvrrvgdJzzHIimmSQH2nGSbb20Sz+lihCkKnBZmGXzZTa/+Rgudy6Y+AAyQMDZT6zxRM 8qu22LU/7Ntpd+BPsrA2g/4jboioHm2kgg== X-Google-Smtp-Source: AGHT+IGrnEWMPE2WkcbT7JIvexF88rB0I+CKgbkhNnFe45kc4J3u2IM/i+GrBzAjghv03i/XJfxOOA== X-Received: by 2002:a05:6512:3d19:b0:544:e61:a1f1 with SMTP id 2adb3069b0e04-5494c11a280mr714153e87.14.1740716060111; Thu, 27 Feb 2025 20:14:20 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549441262b9sm361101e87.0.2025.02.27.20.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 20:14:18 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 06:14:08 +0200 Subject: [PATCH v2 4/8] drm/msm/dpu: use single CTL if it is the only CTL returned by RM Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-dpu-active-ctl-v2-4-9a9df2ee5193@linaro.org> References: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> In-Reply-To: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1258; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=GhhCZJjEajy0jFOjY9R54kVOCzIOaWWu2XrVcVmmfhQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwTgO3RF6v4/ky5eEIRQSKeqiOSPOMFzE4bKwP 7MT1jG0WbSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8E4DgAKCRCLPIo+Aiko 1T/vB/0Wymc/HhBvJljvIgyIsJdh3NY6aNpzKXKMO+cdPwVsVqJkFWOoTCpDCbEllSIJv/TrwyK WnWQr9oOj0lTApx3SG/Of/mzx9UBElIAhdwyjiY3oM/fkG94DGyrhD6xmyjbS4O2GOY+5QlJQkN vVTgDQGjqKD/L8hzGzztmeVG734r9jCkB9iFgm4vJ3ktwPNfuaUjrID44OT0gEyAcbrkgu+mgKO 6Culz7HEx40OG9eOecbTfYuaAQh5QI8agbkpVzh5HLjJPVYH9sRGA4H5cghPbPnxNQFJe0tczyJ T5fIyQQiSunfcEflM1qHEgna8v1MdyyQHqUUMaCplzmV/w9Z X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A On DPU >= 5.0 CTL blocks were reworked in order to support using a single CTL for all outputs. In preparation of reworking the RM code to return single CTL make sure that dpu_encoder can cope with that. Reviewed-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 32992e9525530ea4dec2f46643fc06d40d3bca7b..e7dad94d91a7b6e99adb9aadb48aa8cd164babfa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1288,7 +1288,11 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, return; } - phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; + /* Use first (and only) CTL if active CTLs are supported */ + if (num_ctl == 1) + phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[0]); + else + phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; if (!phys->hw_ctl) { DPU_ERROR_ENC(dpu_enc, "no ctl block assigned at idx: %d\n", i); From patchwork Fri Feb 28 04:14:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869337 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F0601BDA99 for ; Fri, 28 Feb 2025 04:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716069; cv=none; b=JValYzXdnJc+dPcmAB5roL4Mvo7V7BNIiTPo8oUB2HQzNqfoHoKE6FDd7slMuk2lPvYXvvz7YlCDvxrvW40JTNGN1YHi5rRRh7hxi3TS6UI+5DZvlQ7TEqcszjY1zzcxeH4VlXG58nGwZJHb89yBLkZMDpKSArDmSn+7/pNGjhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716069; c=relaxed/simple; bh=9ME/m1J0a8xy6pkwPYSmuv8Gj0s9JDUVh/PU+W77WMM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jjc4l/kzMvzrwtP9DRUWVd6BcaeaN/6+hzmYD8x8ppUcc3a1LH3bpjEvgf4WkXKXXrveFWGktMAWEqgLjOeSoYuai4ROpkOOuwH9M9agk9RhxNIFLczIzHZua3HqsmD3jmL8I7TuyjGGCeFRSBP94w2Rg8AgDXljhl3D9RoQbIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MCf3lpz8; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MCf3lpz8" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5493b5bc6e8so1854458e87.2 for ; Thu, 27 Feb 2025 20:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740716065; x=1741320865; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wKmEhSMCDJBoOlvCmALSOOybeelc7567Ow0tL2ku5rA=; b=MCf3lpz8BDqh7VmVrlJ74ej2jAjPsWZ+G3OXUgQTioXLjBh9r1pgIBouXC8SCLR59h 2iU7sg5pbN5LhtamriOsSWa6gvG3p6M8w/T2rOFWkWIxNcFQqcFRmG1g2gPvy4BEAeI6 H288Fcztq6eK27fH7lpz99P+n/qomFoSarxtPCCTIBBtD8tB7cKH7o3HrW/m3O1R6N7W TX2AEntqfDtvFWZEm55HtKYUjxcS4/WwAgC7gveCbe+T+ConCwuZCDAnY4n3Gz8tUr5M IHKSL9cKEGU+m16GecP4nZkW77/Hxiv1xEzJuJZec2eXifaI4byWvJtMcAp8RszDECtD z0MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740716065; x=1741320865; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wKmEhSMCDJBoOlvCmALSOOybeelc7567Ow0tL2ku5rA=; b=PcGvUL7zUNFB4CLsjOL3ea/KeF/In2M4nmPrVAt8qWFTDGYlI9kVlDz0GqDU8U7K5E Dodsv/QJIhVHzpDm5RvxFYF+HErSVFN/XKF78jhZOHW3D6QSjDR8iatAFuXaHtdIHOCO aLo/g7T9A8tbFSRUOJoWEVvhrNG/2dozwXt/ZT3+QPYq9EeFdmKuwT7BCcdmJnHr4J3V VFjfZSqTy4H6UUGdIH698t9Ps98qh/HFCQMMfg+TCXYedrHCAkYpaY63UtN6Mw9tcYHk MBdpQoN9FnTW306N8BXsd0sDSSO5hvYtJ4cVB7ENUTqcwrBX/Rx/sFeDsK5DUFaRE4oj Cn2g== X-Gm-Message-State: AOJu0YzR73GEVQsdBVwVEuW7M11eBI/6tCoMP4iW+9yFVlIwg+Wwx4L4 yCHuZPM8YlVlvj8zXSW4NDHHVu5a7R8ctKj9laWCsUd4fDZJVGYn0U0R1HFbiuE= X-Gm-Gg: ASbGncuDlbeG4P2HmCz+gTQIXY1U96yuI+YOD8AlL+rrZqL2uZ7OduuNQgr5hJ/CmQK cHy3BwD9043tDPJcL61uDzidkmOPFDHlH/U6dhNq/Jd9s7nHPfq9XyWZHY7LznGahGUIiSuyVuk JIe+5MzgYCM4oDdI3ugFQRaXMsIWKAma6liZW7jX712IIBAk0//UWFAVyKmXh76UF2+/DFnI1Wa fG5GC9FjIYC+fUUgqJyCQRiidqimW4pO5DdlWOcwNb9h236u7IdrRP1y6ZEB3HhiF4ep8QDT70K lVWb8SKbdAe3K2APEn37Ji/px/vKcZCO+g== X-Google-Smtp-Source: AGHT+IFrTPCwHoGYny5G5ckuZI9C77r7UCSKuEcNlsrjyiXZzEXpDmSCPxAlcfpE49ug1V57noOTpw== X-Received: by 2002:a05:6512:281d:b0:53e:3a7c:c0b5 with SMTP id 2adb3069b0e04-5494c129c16mr531065e87.10.1740716065030; Thu, 27 Feb 2025 20:14:25 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549441262b9sm361101e87.0.2025.02.27.20.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 20:14:23 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 06:14:10 +0200 Subject: [PATCH v2 6/8] drm/msm/dpu: allocate single CTL for DPU >= 5.0 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-dpu-active-ctl-v2-6-9a9df2ee5193@linaro.org> References: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> In-Reply-To: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2950; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=9ME/m1J0a8xy6pkwPYSmuv8Gj0s9JDUVh/PU+W77WMM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwTgPW1XbcApwPVKDVEeAb03bL+wmkGORnOawA uH15T8hTtGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8E4DwAKCRCLPIo+Aiko 1e9OB/9D4+zlNGC1yj7F8c0RRfwqJqfV6I3eZX/gkilovYH5z/qUEgL4iDR5UHJToEYT9jih8N5 vw5J2AqH2CDEhPbTizrPvX3j3/inVKMqWYVYjoLNpB7iJoiCJPv7v1yXN6e3DYuuuRdgh7+hfoa 3Hp5ahV7CNuJonfRI0RIXQ62eadvSDgEmTA552kowBP/MaHzLAMuAdrch+v0FANs2bPI6u2zYE8 zrXe9dacEQQ+7IFFHchXWk/dHNkwt7ayZ5HYJ3YZiSlS8gEgC34U+sAGo3VZAl1XogSJJsIUWFY J1GuLCirv3jYxmdpvlncb1RdAaHRAyF/GuGl5Xz8KhFpeSe8 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Unlike previous generation, since DPU 5.0 it is possible to use just one CTL to handle all INTF and WB blocks for a single output. And one has to use single CTL to support bonded DSI config. Allocate single CTL for these DPU versions. Reviewed-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 17 +++++++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index 5baf9df702b84b74ba00e703ad3cc12afb0e94a4..4dbc9bc7eb4f151f83055220665ee5fd238ae7ba 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -53,6 +53,8 @@ int dpu_rm_init(struct drm_device *dev, /* Clear, setup lists */ memset(rm, 0, sizeof(*rm)); + rm->has_legacy_ctls = (cat->mdss_ver->core_major_ver < 5); + /* Interrogate HW catalog and create tracking items for hw blocks */ for (i = 0; i < cat->mixer_count; i++) { struct dpu_hw_mixer *hw; @@ -381,10 +383,16 @@ static int _dpu_rm_reserve_ctls( int i = 0, j, num_ctls; bool needs_split_display; - /* each hw_intf needs its own hw_ctrl to program its control path */ - num_ctls = top->num_intf; + if (rm->has_legacy_ctls) { + /* each hw_intf needs its own hw_ctrl to program its control path */ + num_ctls = top->num_intf; - needs_split_display = _dpu_rm_needs_split_display(top); + needs_split_display = _dpu_rm_needs_split_display(top); + } else { + /* use single CTL */ + num_ctls = 1; + needs_split_display = false; + } for (j = 0; j < ARRAY_SIZE(rm->ctl_blks); j++) { const struct dpu_hw_ctl *ctl; @@ -402,7 +410,8 @@ static int _dpu_rm_reserve_ctls( DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features); - if (needs_split_display != has_split_display) + if (rm->has_legacy_ctls && + needs_split_display != has_split_display) continue; ctl_idx[i] = j; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h index 99bd594ee0d1995eca5a1f661b15e24fdf6acf39..130f753c36338544e84a305b266c3b47fa028d84 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h @@ -24,6 +24,7 @@ struct dpu_global_state; * @dspp_blks: array of dspp hardware resources * @hw_sspp: array of sspp hardware resources * @cdm_blk: cdm hardware resource + * @has_legacy_ctls: DPU uses pre-ACTIVE CTL blocks. */ struct dpu_rm { struct dpu_hw_blk *pingpong_blks[PINGPONG_MAX - PINGPONG_0]; @@ -37,6 +38,7 @@ struct dpu_rm { struct dpu_hw_blk *dsc_blks[DSC_MAX - DSC_0]; struct dpu_hw_sspp *hw_sspp[SSPP_MAX - SSPP_NONE]; struct dpu_hw_blk *cdm_blk; + bool has_legacy_ctls; }; struct dpu_rm_sspp_requirements { From patchwork Fri Feb 28 04:14:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869336 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C07E1C54AF for ; Fri, 28 Feb 2025 04:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716073; cv=none; b=cLA+7RSr9je+EsGcG5uODzV+SridIYjOU0bSIRGrMdiqAihSHXqL4LpZC/+SL8aUOuZhj2NJz/k0Jy2q4ysopnzpr7kTxV2P5pYnZMYpS+iWZUbGSQ+FAjuKqE8QQsbJsg4utglFv39dXW+B3C+i7QUBDKo6ylBlVkvBYU+3Bx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740716073; c=relaxed/simple; bh=gbAmmg7YrMzJ9XNxwCPOatERTxM1Dbe3+ajpkL6KPO8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MLg9A8t/Q1VogppvecTAc3SsaGo35dsU8u1i8DPO2Ovos6QoK1d2LPDWMfK+27+UOSxhqM4T7C1l8btr0VH/sKOYhRcSSfYTudDGxc4mbedbuiqwJx8ZwFiv+JiY9+8Eu9N2vunWGVx8bRQ4slbtDuQeZPhae1OvtvHxAdgXVgk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=IFY0tDo+; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IFY0tDo+" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-548878c6a5aso1737761e87.3 for ; Thu, 27 Feb 2025 20:14:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740716070; x=1741320870; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=k3kLn8+jQchoUvHapCVtAnDT2HhczV+P/3nKNxhd/mI=; b=IFY0tDo+C0bFruux1M+XTLWb4bI5ITNY/XTODarN3eDTy+wVpjV/b1GtL/+UXYBoPC BsE90wrHZ+RyIlRbbHKtS9iVfGc7JXX5qirnkS1ZSkQ1YLR9V/E6ucAEGaBJIJdgXnRk RWurGGqfRNaYPeZe/SkWPw7gBOabDrpELPNqwVC4jgMQ6Io0HgTS5Jbm++4UkuRXoaeq oCtwvg7cuHoWA0lq1BteasswTlaKI17HzRBdwUoA7u8vmh9kPpexTdyBh4PwmDzegqCU u5mnQXDLyz34wGAdGx/h4I4Yb9tsIHKyEUS9FKYR1ksmF1toNI5PSQOAuLG6GUF61tqj JBMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740716070; x=1741320870; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k3kLn8+jQchoUvHapCVtAnDT2HhczV+P/3nKNxhd/mI=; b=Fs/5Ee9Tal+WBNBWghcXm+WusTQiTQwXEonV8aPkuckghwr6ooxYctwDWntoPp/a9/ Xpsx6X93Cn87OrHg6ACXq8IRIFFuN5SkVmTlsII63YgNlv86UphE0CRR2JcgUhl6j7uF ok1zWMEVdBzgzBSla6jv1zoP95kdBHbJotb1xSKwvNVZX1XKk3LrFC6vPIHCTXsuydcg 1TcS28+hdT6S+oB1/OK03ZgP/zE0ncYuEQ8DvcZc5oSu7Y4Wj6xTrlRYLv0fmr5AveGs Jd/wco1PVzBQacPWmNZu9/B8KzrplUy46174rj9VdI8FchRmqac7wuVwInK9+iKUrJfX RBjw== X-Gm-Message-State: AOJu0Yxo8PQxC4M95qNTj+xjXidddQgIDlULCXzquRo1QDeGMxGld7sJ D+FNmd9sIbXLFFhlzcc84RQK3jeZZpD1F4+HOT426bZVM0AxM5kG40f+rE0nsjs= X-Gm-Gg: ASbGncvC2tmu1pjKsmmyyMD5ZtKI3weRV0+AXVD2dm2XVtPRRsyGri39LFZu6LjkYdn 7o18o4q8ix+5fE432wqc+Xp1n10eFQjVCaP8cSKpdtEMvMdCUig4h96HmEQSUsuRUfOBHlUQDvS 1cTB05H3MoXLl6XF3ofuZIQw0T/f/SXRFIUqclQJ2Gi624IyP89leYGjZpcOI1wovYX38hTf9Ip QRJbrVDjo5xVaktftKTlAMWY+3dHBsmW2PQ6RqS01wghns448ATHNoJawiiIrzBYh1nwwEeGroV ekcxQKeyr9vL2U7h6MmJKpjwaP3NHHopkQ== X-Google-Smtp-Source: AGHT+IFDSc3I2mqP5qdXMpIRdHJvwKMmhG7fxY3oSiaLL4XJ56Lr0lDFiJk8seHX0EAq0LMWQw0Tdw== X-Received: by 2002:a05:6512:693:b0:546:2a27:ec35 with SMTP id 2adb3069b0e04-5494c37d6dcmr634988e87.37.1740716069990; Thu, 27 Feb 2025 20:14:29 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549441262b9sm361101e87.0.2025.02.27.20.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 20:14:28 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 06:14:12 +0200 Subject: [PATCH v2 8/8] drm/msm/dpu: drop now-unused condition for has_legacy_ctls Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-dpu-active-ctl-v2-8-9a9df2ee5193@linaro.org> References: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> In-Reply-To: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1163; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=gbAmmg7YrMzJ9XNxwCPOatERTxM1Dbe3+ajpkL6KPO8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwTgPgCbq+XDOYj4H5rvYaOVt6Lx/s7AaC8vhi DkF7csW16yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8E4DwAKCRCLPIo+Aiko 1arGB/9gEroWlk0T+tDjWT0IrtdxlhHsIIkLIlfrjs+HlEfUh1WEodAZTwZ9DWE07tG3DNCmZpn c3YEYkngaozD/ybdEE51nsh1lEdop/cJhejr/tusiBpBB3fvZ0M1nfUxsKfVut+XDfA+VaIqbQm sGNHgulMZGb1AX+2QY8LAxfVbV4MXZLt4GSmh5ZJhFqPxRHP3LqNh/yAoGYdYQoi6P4981GJwh6 ZZG3Vq65duMphoVG53KKXxs87SPOdjM68WYAVpfclLHF4DyCHtBoPlUPxPKMpDurxwKVphZSete e7/Ks+NJ6bjmi2liXy02qC0fUERYj/Dr8KMxiyyrWS4tvvUe X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Now as we have dropped the DPU_CTL_SPLIT_DISPLAY from DPU >= 5.0 configuration, drop the rm->has_legacy_ctl condition which short-cutted the check for those platforms. Suggested-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov --- Note, it is imposible to reoder commits in any other sensible way. The DPU_CTL_SPLIT_DISPLAY can not be dropped before the patch that enables single-CTL support. --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index 4dbc9bc7eb4f151f83055220665ee5fd238ae7ba..2557effe639b5360bc948a49b0cccdb59ee35dab 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -410,8 +410,7 @@ static int _dpu_rm_reserve_ctls( DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features); - if (rm->has_legacy_ctls && - needs_split_display != has_split_display) + if (needs_split_display != has_split_display) continue; ctl_idx[i] = j;