From nobody Sun Dec 14 21:56:09 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 2FC1428DB3 for ; Thu, 16 Jan 2025 07:26:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737012378; cv=none; b=sGHpYKddnW92Ajb+TUmhw+SFmDOc1DRX/xWzYBVnWUbQ9gXiSRDMV+Om/7VnIYSObz0yxHhKvCBavRHURLK+0xeeH9GTWLCfOkhTR4WYmLl3FwQBUVvyoOtjfTyPKBhIRgoopk9jOjTMCow6d7k/1t7y0KGLWVW5yf5DeU7MekE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737012378; c=relaxed/simple; bh=u2GFE12qLfx13hrjSJDIvSRgATGg2YWsZ6oSOw/ZiU4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pfqF2xl1SNIU4dLcBGONoSiVH2rk6MQg64DSf2pVPwnD/fnLD6hnQWW8iyIvGjhxUkGK9zqYYrm4z166Up7V5XMSxbdfLeU/WISmZC6lHGa80w0ah00FRhAaonIJvTyHpo+BZ6tTQ07JvwTBAcnmxRMT2XpSjgXihqeUMBbUwMQ= 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=Xjo0EejM; arc=none smtp.client-ip=209.85.214.173 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="Xjo0EejM" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21644aca3a0so12263805ad.3 for ; Wed, 15 Jan 2025 23:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737012376; x=1737617176; 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=bQBV9g8vPMf8Uq4Wh2MqOnJmIVXoZ+dnuZKYDKl6oH8=; b=Xjo0EejMVYOzbry9CyB3XBDoa1+HDNyXZcDiamjoNYizrE8BINPUfVUrr0YpZN3FGy erJQyHf4hFm8oM3e5K3Bvc6mHnR8fo9J77wg01mVH4yWWxjRqdfy0bgtBkPr2hJcTciL z6e7+Z3Cf+tz3tzCA8IbmngZHgIWHPhH5yA9YqVrcebWRFlfjDMC8pVe0VQSTyLhzvmy 3FQlMhStv4sIG/vhegzmqfRbb1LBr+Jgyqcxgp3Bl3NeOAuVTb9NhASUYV6UTNOEcRHz 5EQ8z00WXGgitOWJmv2G/awznrP6Burop0/RQYTMjpJFAJ4tiDywE+IXXcFUNGWhO7ow +9cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737012376; x=1737617176; 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=bQBV9g8vPMf8Uq4Wh2MqOnJmIVXoZ+dnuZKYDKl6oH8=; b=xUXvonSt/Hn470bV/MlBMQAWZwiaM5ZYEra9QlwBgz32m7QhvUyEtarzEgHXnBKA4V CpucxxhLBVXr2q5gT6iDgKa6YomH5Dde9DvMsGoRi3env4UvGnwKzq+zGxRKVEeY0p5N ELIWZIz5pG2jptpNu3i8IWfjoTyBqmvt0KdNUyw3y4ZcvMk4tIotJKJdQX6C9tTpf+5A G5yNKqR5FYd5qKQ0mUq9ho45w+Ws+c3UkbEDnEzMw36KFaFND1malha4LkQDmkalkLui a5acZZIekYm7R8YoMRqOXajKrb1O6puqBDs/ezNpKHa/iFqudOKhBhikPuoERDpjfcIO 5XnA== X-Forwarded-Encrypted: i=1; AJvYcCWwwAbIjqe7qM6C3eABcH/3UsRIFPMup9y/nNRBFMR0OqemeJ9Y62Ejcs6KmnssvFvBcOypVs+kwE4JXvA=@vger.kernel.org X-Gm-Message-State: AOJu0YwDNGinW5sD1xFF3ZJFUw5qJYaMXKuGW2szwiscpemiL+5WhPcC uALWDQ22UNZzcetwOVutePN/rTXbcNvjymiM3SVGSw0RI9rOh0XfZkasPlIZC0I= X-Gm-Gg: ASbGnctoGNNqQheHkk2nVb4ivYos0EE5GLaT7TRSKjCqPwXhRPj6+KtCq3XhqdFko8g pd1LMBkoSPEkPsuOCzlnNydZ/+r/2nEkH5p10NUpYUeF9IQpzuJgXFwNMGsah+YHpeFWdrLhk0O YtssuU6dV01GhJGE+4z0sRVB02WZyUrYXEzUSGAsx6F9c2wIzLpPGQt3O7ahoc36lJHBYAmXn3p x3FUlRp22raaqzqlCEDVuWmFeJRNmLBxxuvSPWseWdyYeA5z41x5A== X-Google-Smtp-Source: AGHT+IF00SipaBn5NPWzgB5ZXnkdSOutUT9Qtc1tzeasYpsYLXBSfDlP3UkZIDf63uh/CeUtkd32rg== X-Received: by 2002:a05:6a00:1942:b0:71e:6b8:2f4a with SMTP id d2e1a72fcca58-72d21f7bcccmr46697624b3a.12.1737012376528; Wed, 15 Jan 2025 23:26:16 -0800 (PST) Received: from [127.0.1.1] ([112.65.12.217]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d4059485bsm10164583b3a.83.2025.01.15.23.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 23:26:16 -0800 (PST) From: Jun Nie Date: Thu, 16 Jan 2025 15:25:51 +0800 Subject: [PATCH v4 02/16] drm/msm/dpu: Do not fix number of DSC Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-2-74749c6eba33@linaro.org> References: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-0-74749c6eba33@linaro.org> In-Reply-To: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-0-74749c6eba33@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , 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, Jun Nie X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737012353; l=1814; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=u2GFE12qLfx13hrjSJDIvSRgATGg2YWsZ6oSOw/ZiU4=; b=B2zJX6OxJVLb1nrnneDJA+HhPR1wU8/wgPl7b3y+aZsPSv5T//cZ1Jt1PN18xaQ2mrJoaqZBN 5jJJG51NEgnAV9vF7u6k+bPJ9d7rg4hiMBWYlezra+R9lwvwAnGaIVL 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 --- 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 eaac172141ede..c734d2c5790d2 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; =20 u32 idle_timeout; + u32 num_dscs; =20 bool wide_bus_en; =20 @@ -622,9 +624,8 @@ bool dpu_encoder_use_dsc_merge(struct drm_encoder *drm_= enc) if (dpu_enc->phys_encs[i]) intf_count++; =20 - /* See dpu_encoder_get_topology, we only support 2:2:1 topology */ if (dpu_enc->dsc) - num_dsc =3D 2; + num_dsc =3D dpu_enc->num_dscs; =20 return (num_dsc > 0) && (num_dsc > intf_count); } @@ -1261,6 +1262,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct d= rm_encoder *drm_enc, dsc_mask |=3D BIT(dpu_enc->hw_dsc[i]->idx - DSC_0); } =20 + dpu_enc->num_dscs =3D num_dsc; dpu_enc->dsc_mask =3D dsc_mask; =20 if ((dpu_enc->disp_info.intf_type =3D=3D INTF_WB && conn_state->writeback= _job) || --=20 2.34.1