From nobody Thu Dec 18 22:47:27 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.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 7A0481F4614 for ; Thu, 20 Feb 2025 11:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740050111; cv=none; b=lScVwRDWR6AFU10ny0IsvvZ5pHs3cX5DhA3tbS4o/WrhiFJ0hLSLMfljcdRZWG333+HR/4jIuCk7Q+W9s6yminBFXFWHng+WRQdKv+bmgzrCJV/qDzVBeaisRI9AGGXvfJKdz7Eg9A7kP0ODHuBUL7kMdniaGQDE/B2EPYCdgkY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740050111; c=relaxed/simple; bh=sd81US2AbqPojIDQwuSaetI1ujs5Ko+pXwBs3VRaHGk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QLltybe8PX6c+iqSotroSmspTK3QebuRoTe1isGC0ciH3hLVN5/hif+1z2sLvD4yLxGLFqDRL37DX7iOXgVHwmLUwhvrzs0HR86c7y6DUw87EiPRUlHoBmk2RB67+yarP4mb1XcaFoINktAXRyK1RZG+kmCwBpfQ8cjihbWL2ls= 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=J844hpP7; arc=none smtp.client-ip=209.85.167.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="J844hpP7" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-54524740032so894627e87.3 for ; Thu, 20 Feb 2025 03:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740050107; x=1740654907; 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=atkE0DuTwytlFBGYlZ0GLoUvtN43x5D45gLKOUS3e3I=; b=J844hpP7zXL8UyTZOhKNL1Tgpietyg2gDlHJqpUidrSHzSXAhdjQL7WarK70KjWXvs 8ev2jSP36nbHntm1oElu5AGQwin+RxLKm2if21z4WlVYS52qMwVRTUGu3h7k2HiL+3Lj n+DdV6Y/dOSByPThG4bq3kZTBKbAYXcQQmSOrSkYcxBr/N2D1vF9VhvicIKb8vYiPwaF UryD7CgPP8PZ3dEkZ6ywqX3HPkUUu9+7T5i/YpgD7pOuSn8alzecdpvjfD1mFDzfFwdX GNhmDr+ht7Q4pWgvTapjOmQeFYUMeUqwSBShBEw5tO6mwx7U+coPw5ChNl0MdidUBUCr M8Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740050107; x=1740654907; 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=atkE0DuTwytlFBGYlZ0GLoUvtN43x5D45gLKOUS3e3I=; b=JtUdc7y4m7USprCN+QMwQllL8FVA4OzdFZSy0VjATXoCNCuyek7Q7qyiZ+2NMxHEzy 4sY2kl6zkHhpd39SV5qSXYcN3sx0ndh7xjbNy2pkPdireqNbKVB9OMvzM0vYm1LO+lYR Bw54lfFJ+iCNO9Q0MTnBuPhsyYYok2ob9uR7UWdRL7WSPW+uulccXevu48acubeit5am 9ylXiINmI9Z8wxrW7GYP3ZLj3MOQJD2+B6CGgMKLKF4hCP3BXVSFmDQvatB53M9oY6JG 9OWnMLtQCfZfa1GffaUFQMcPduR/DdNRxhBhtmD2ipSjOARB19iafqWNLwsFq3I0d113 XQdw== X-Forwarded-Encrypted: i=1; AJvYcCVc640UJWX8COmeA0MNnaQ20FX8ImK2N1Wzq3A116xx5uULbzLzsthbK3lZLjAyEg0DOBaxniK5hlSNjlE=@vger.kernel.org X-Gm-Message-State: AOJu0YzHpqHB2VzSiOP67sNKaAHQC9/NqWVtKz6EOOMHn9MVyJ7lSdoI fz6tr2X+kUNkPbPq7kCiSwfp+L9PI/4NnIwHxD6xYXWK/kIiwE206S8R2dWUFv4= X-Gm-Gg: ASbGnct9yMUfB+fU4bFqMw81HgxXJ905hw7A+foVv8KCF/lgzzOiNL4V9uws41ZOjME Vz8lqttFKTcuPtxh4qWkunGd1/jWpDIJZlnFj6cTR2aOeX7G5eaC4DuL7srhGRxBhpYuyt3k01U lrxIe+paXZTIXTxyFCeaLSxTB7EC7SzNAR0xPQwbudyJSi6TOihmkxncSbaYv7wjJsELa+ZUZ0q tzL+XcOiUi5f5SEz8yDuOLJE8JLQpb/WJkRpR6UaIloByPcfJD4vqhNjjk9ucz3a69+cyYCKk3t OIPbWgvWSuafV98HpHWUW+I= X-Google-Smtp-Source: AGHT+IGeL3hIO5IEL/UFM93w49MRwYtCVueI+BviXB8wj/vAF/fCqwh+GCrLx80hGd4UkPc4SzjieQ== X-Received: by 2002:a05:6512:e97:b0:545:56c:36c7 with SMTP id 2adb3069b0e04-5452fe86dddmr6819562e87.41.1740050107328; Thu, 20 Feb 2025 03:15:07 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-545297856c6sm2056164e87.142.2025.02.20.03.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 03:15:06 -0800 (PST) From: Dmitry Baryshkov Date: Thu, 20 Feb 2025 13:14:47 +0200 Subject: [PATCH v2 5/7] drm/msm/mdp4: move move_valid callback to lcdc_encoder 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: <20250220-fd-mdp4-lvds-v2-5-15afe5578a31@linaro.org> References: <20250220-fd-mdp4-lvds-v2-0-15afe5578a31@linaro.org> In-Reply-To: <20250220-fd-mdp4-lvds-v2-0-15afe5578a31@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4269; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=sd81US2AbqPojIDQwuSaetI1ujs5Ko+pXwBs3VRaHGk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBntw6rTPm+AqJ3Oe00AJ8yppJULkHQ9dKbM/18U NNC9+ZJDDaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ7cOqwAKCRCLPIo+Aiko 1UEECACKjmUdHIogEsc92biZ7CHLmnmFDJoK5DYBGMrRoc0gq30rOLHn/DGpybnuVUOoTRhcCQ/ srxTbAtPHYKz5GPZ6HU0nzSuZXLeXlZa/Ai98jYxQvVyvkSayLovY3UkjzoHNOyXfwc38FLIPvM UIMP/EawAuFJbkq5PFnq1nTdWXtjlEIS+cmao+5TlRnb4Gbgw5l6KI1unJiMLewApO8qtZaYaGI 3Qr0lVOLugDL+admaJR4HlV1P6LFCZnMPDwaYuDVzuhgww34I9LV303cDXMY2wBVZnDFH5d14j0 WWj6ag03DsV2nNjKI2J0brnn0vx8z7++w82J9fjQuvZwj+rQ X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A We can check the LCDC clock directly from the LCDC encoder driver, so remove it from the LVDS connector. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 1 - drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 27 ++++++++++++++++--= ---- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 21 ----------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.h index b8bdc3712c73b14f3547dce3439a895e3d10f193..e0380d3b7e0cee99c4c376bf636= 9887106f44ede 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h @@ -191,7 +191,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate= ); struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev); =20 -long mdp4_lcdc_round_pixclk(struct drm_encoder *encoder, unsigned long rat= e); struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev, struct device_node *panel_node); =20 diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c b/drivers/gp= u/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c index db93795916cdaa87ac8e61d3b44c2dadac10fd9e..cfcedd8a635cf0297365e845ef4= 15a8f0d553183 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c @@ -348,19 +348,32 @@ static void mdp4_lcdc_encoder_enable(struct drm_encod= er *encoder) mdp4_lcdc_encoder->enabled =3D true; } =20 +static enum drm_mode_status +mdp4_lcdc_encoder_mode_valid(struct drm_encoder *encoder, + const struct drm_display_mode *mode) +{ + struct mdp4_lcdc_encoder *mdp4_lcdc_encoder =3D + to_mdp4_lcdc_encoder(encoder); + long actual, requested; + + requested =3D 1000 * mode->clock; + actual =3D clk_round_rate(mdp4_lcdc_encoder->lcdc_clk, requested); + + DBG("requested=3D%ld, actual=3D%ld", requested, actual); + + if (actual !=3D requested) + return MODE_CLOCK_RANGE; + + return MODE_OK; +} + static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_func= s =3D { .mode_set =3D mdp4_lcdc_encoder_mode_set, .disable =3D mdp4_lcdc_encoder_disable, .enable =3D mdp4_lcdc_encoder_enable, + .mode_valid =3D mdp4_lcdc_encoder_mode_valid, }; =20 -long mdp4_lcdc_round_pixclk(struct drm_encoder *encoder, unsigned long rat= e) -{ - struct mdp4_lcdc_encoder *mdp4_lcdc_encoder =3D - to_mdp4_lcdc_encoder(encoder); - return clk_round_rate(mdp4_lcdc_encoder->lcdc_clk, rate); -} - /* initialize encoder */ struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev, struct device_node *panel_node) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/= gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c index 52e728181b523cc3380d7718b5956e7e2dbd4cad..4755eb13ef79f313d2be088145c= 8cd2e615226fe 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c @@ -56,26 +56,6 @@ static int mdp4_lvds_connector_get_modes(struct drm_conn= ector *connector) return ret; } =20 -static enum drm_mode_status -mdp4_lvds_connector_mode_valid(struct drm_connector *connector, - const struct drm_display_mode *mode) -{ - struct mdp4_lvds_connector *mdp4_lvds_connector =3D - to_mdp4_lvds_connector(connector); - struct drm_encoder *encoder =3D mdp4_lvds_connector->encoder; - long actual, requested; - - requested =3D 1000 * mode->clock; - actual =3D mdp4_lcdc_round_pixclk(encoder, requested); - - DBG("requested=3D%ld, actual=3D%ld", requested, actual); - - if (actual !=3D requested) - return MODE_CLOCK_RANGE; - - return MODE_OK; -} - static const struct drm_connector_funcs mdp4_lvds_connector_funcs =3D { .detect =3D mdp4_lvds_connector_detect, .fill_modes =3D drm_helper_probe_single_connector_modes, @@ -87,7 +67,6 @@ static const struct drm_connector_funcs mdp4_lvds_connect= or_funcs =3D { =20 static const struct drm_connector_helper_funcs mdp4_lvds_connector_helper_= funcs =3D { .get_modes =3D mdp4_lvds_connector_get_modes, - .mode_valid =3D mdp4_lvds_connector_mode_valid, }; =20 /* initialize connector */ --=20 2.39.5