From patchwork Mon Feb 17 14:15:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 13977968 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 19FF721D585 for ; Mon, 17 Feb 2025 14:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801812; cv=none; b=DdllbGJ41teL+K9so4rz6b491GfnL15TYGhzQj8aJDKPuVxz8R2j95jS+iaFePc3XDsNek9U8mqDLRmTxB0ZvDdewTKUxfm0O7DSgkaDAOGdw1LydUgVyUu7fbYmDVxmhiwNaQG4aEjEKGb2ftcctWYLjywYPs0perQyzD75Sos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801812; c=relaxed/simple; bh=WBM/p7IonF+GUTkphvNqY034IFJPvXxbXKnpEjol144=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f4emlts3BxzV0CufwoMSMXXdh+4rDnMCj9QvZR9ICQk18f9OU68Ag19+gxfIn/+fTTkNTC0fB1KQPt4vfGcIi/ncwmfJBf3xcxEY3BegqmqR+TRATTAfzokbqHNIkjZgXnqHoSkW9nrzjZfTzUSIE6lWQdDfZMo3yGu23/FTm6Q= 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=Onux4puq; arc=none smtp.client-ip=209.85.216.51 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="Onux4puq" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2fbfa8c73a6so8266386a91.2 for ; Mon, 17 Feb 2025 06:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739801810; x=1740406610; 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=rajdpuATf4cHrwTeJ8T+ZsyTPgo2DiGPUjAIn6iu1Wg=; b=Onux4puqw8f/4y3SkXQXq2EFJKWEKQRhEqXAJdrd6xiawgoMZqqVkv7cLqXskup/JF U/tqgVTMWaWtFHDQ5WJ/+RllT7D6FKlNiXyeWsIbLsRk+RgoKRg+vneOzwOe9zLK2Uog /egq5iAW5qYr5svaixPGpvzZniBS6/MTKqeWTZgB75rdQEXW+HdgGvQTZEegUXAIMHxi bfjgRGxpvrWm1v6V7G52eJoEv4W0t24FDq6V35TXVvptYXqnZTmfBJC1F6FicL1nHFqH RfanSmeaairDPlkcC8VlcocY2I8v+teJb7uTm5paGa1lO4Fa+GICbjYf7FL4bIvXiJOy Ri7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739801810; x=1740406610; 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=rajdpuATf4cHrwTeJ8T+ZsyTPgo2DiGPUjAIn6iu1Wg=; b=QKunefsnLye1v500xDKozXjEPqlGZRGtjZR5Y6BgSF7PnVRiwpATR7+rYFUH8B9Cus DNmN92hcW22aGF3uslG4mnKLhwUdSHe2yKuwrgzyU2+9WOq8vhtL7tyNRd38xGwTeVAd lF79eBX6wsv2QaMp7YI2RXJ1EPnVn2hqthIrhRHVtTnbK6z8aExqILZoLKkpMg1G1hd/ SEHfUZmS9NhXq8C6v/ZjB/MvbECnRMLBMyZgBicjR1zM29xmTXiWy5SYeYoDm58BU70n S8zebFNVvdkeLxZe5w4tVJPZcBwkO5OrIpuxKdlbsvyRoU0DFt31U/WrTjE9IGR/dVZW UkbA== X-Gm-Message-State: AOJu0YxmVmlTI9cw2c0s5VgH/ANrO7yXGlds1RHg/VgMogYBtTH0MGBG Gevhf8csWKOgBYi+Dc+5yde00ghz8F+AbA+Ts9McabWGVcmL/DvRKFYv5d1OOkI= X-Gm-Gg: ASbGncvaraGhDuJcmIxNoCyGepKMtTQCkV+ikDaSntZeD+rC37xlNTfdntRUjmHw7Te qkPYYnzfw0V9ahKLGn9ehDsVqPtKaVmHNt+ovqH4ZgFk4X+3NxibJchF/TCIXcaq7GhJwcc8Uv1 WTS5DouQRIg1sgMfrTbWFl+aPjaWNpF9VU7phHjDBRUe3fCCp62/D8zHckBpblDPxG+Gu3iCtsT U4mJ6XdMH9NXzew0sVNs0yLov+I3cJYtvNw80ycGX9GcvSjKbo8mkmkRtR8QhKabTJ3KbbthELf OrIwxnXWAkAK X-Google-Smtp-Source: AGHT+IGU0FyPjwmxRoPaGDsf+N+koULFGoADf0/rSjEWbWDRJqGiRCi3XPxpi3patdoZmzDMZvgdqw== X-Received: by 2002:a17:90b:380f:b0:2fa:ba3:5451 with SMTP id 98e67ed59e1d1-2fc4115089fmr14918129a91.35.1739801810264; Mon, 17 Feb 2025 06:16:50 -0800 (PST) Received: from [127.0.1.1] ([112.65.12.217]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5366984sm71900845ad.60.2025.02.17.06.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 06:16:49 -0800 (PST) From: Jun Nie Date: Mon, 17 Feb 2025 22:15:51 +0800 Subject: [PATCH v6 02/15] drm/msm/dpu: Do not fix number of DSC Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-2-c11402574367@linaro.org> References: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-0-c11402574367@linaro.org> In-Reply-To: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-0-c11402574367@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jun Nie X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739801787; l=1985; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=WBM/p7IonF+GUTkphvNqY034IFJPvXxbXKnpEjol144=; b=mcXuCakUN4KMWaFmxuYcUpbFO6rXbt/WIvqiY/25a8klCfKl7bIvE0DvHvDTCKwU+id3pVIq6 kD9VT2lfBCkDMeibmtyY2fQ1YAGkFlOEZhqnwXA6HzuKx21ogcHiIyF X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Currently, if DSC is enabled, only 2 DSC engines are supported so far. More usage cases will be added, such as 4 DSC in 4:4:2 topology. So get the real number of DSCs to decide whether DSC merging is needed. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index eaac172141ede7bb4002ce1d0268b2f436fffc6c..c734d2c5790d2a8f5f20c4b5aa1e316062d9b34d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -164,6 +164,7 @@ enum dpu_enc_rc_states { * clks and resources after IDLE_TIMEOUT time. * @topology: topology of the display * @idle_timeout: idle timeout duration in milliseconds + * @num_dscs: Number of DSCs in use * @wide_bus_en: wide bus is enabled on this interface * @dsc: drm_dsc_config pointer, for DSC-enabled encoders */ @@ -204,6 +205,7 @@ struct dpu_encoder_virt { struct msm_display_topology topology; u32 idle_timeout; + u32 num_dscs; bool wide_bus_en; @@ -622,9 +624,8 @@ bool dpu_encoder_use_dsc_merge(struct drm_encoder *drm_enc) if (dpu_enc->phys_encs[i]) intf_count++; - /* See dpu_encoder_get_topology, we only support 2:2:1 topology */ if (dpu_enc->dsc) - num_dsc = 2; + num_dsc = dpu_enc->num_dscs; return (num_dsc > 0) && (num_dsc > intf_count); } @@ -1261,6 +1262,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, dsc_mask |= BIT(dpu_enc->hw_dsc[i]->idx - DSC_0); } + dpu_enc->num_dscs = num_dsc; dpu_enc->dsc_mask = dsc_mask; if ((dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) ||