53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ryzer58 <[email protected]>
|
|
Date: Sun, 8 Jun 2025 22:19:27 +0100
|
|
Subject: Backport DRM atomic check function change from upstream kernel to
|
|
restore HDMI output functionality
|
|
|
|
Signed-off-by: Ryzer58 <[email protected]>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 20 +---------
|
|
1 file changed, 1 insertion(+), 19 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
|
|
@@ -199,24 +199,6 @@ sun4i_hdmi_connector_clock_valid(const struct drm_connector *connector,
|
|
return MODE_NOCLOCK;
|
|
}
|
|
|
|
-static int sun4i_hdmi_connector_atomic_check(struct drm_connector *connector,
|
|
- struct drm_atomic_state *state)
|
|
-{
|
|
- struct drm_connector_state *conn_state =
|
|
- drm_atomic_get_new_connector_state(state, connector);
|
|
- struct drm_crtc *crtc = conn_state->crtc;
|
|
- struct drm_crtc_state *crtc_state = crtc->state;
|
|
- struct drm_display_mode *mode = &crtc_state->adjusted_mode;
|
|
- enum drm_mode_status status;
|
|
-
|
|
- status = sun4i_hdmi_connector_clock_valid(connector, mode,
|
|
- conn_state->hdmi.tmds_char_rate);
|
|
- if (status != MODE_OK)
|
|
- return -EINVAL;
|
|
-
|
|
- return 0;
|
|
-}
|
|
-
|
|
static enum drm_mode_status
|
|
sun4i_hdmi_connector_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
@@ -280,7 +262,7 @@ static const struct drm_connector_hdmi_funcs sun4i_hdmi_hdmi_connector_funcs = {
|
|
};
|
|
|
|
static const struct drm_connector_helper_funcs sun4i_hdmi_connector_helper_funcs = {
|
|
- .atomic_check = sun4i_hdmi_connector_atomic_check,
|
|
+ .atomic_check = drm_atomic_helper_connector_hdmi_check,
|
|
.mode_valid = sun4i_hdmi_connector_mode_valid,
|
|
.get_modes = sun4i_hdmi_get_modes,
|
|
};
|
|
--
|
|
Armbian
|
|
|