From 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 13 May 2024 10:30:14 +0000
Subject: [PATCH] modify sin led gpio
---
kernel/drivers/gpu/drm/rockchip/rockchip_drm_tve.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/kernel/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/kernel/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
index 990b9cf..6fbd17c 100644
--- a/kernel/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
+++ b/kernel/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
@@ -11,10 +11,10 @@
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
#include <uapi/linux/videodev2.h>
@@ -29,13 +29,13 @@
816, 864, 0, 576, 580, 586, 625, 0,
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
- .vrefresh = 50, 0, },
+ 0, },
{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 753,
815, 858, 0, 480, 480, 486, 525, 0,
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
- .vrefresh = 60, 0, },
+ 0, },
};
struct env_config {
@@ -421,8 +421,6 @@
static void rockchip_tve_encoder_disable(struct drm_encoder *encoder)
{
struct rockchip_tve *tve = encoder_to_tve(encoder);
- struct drm_crtc *crtc = encoder->crtc;
- struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
mutex_lock(&tve->suspend_lock);
@@ -430,8 +428,6 @@
cvbs_set_disable(tve);
mutex_unlock(&tve->suspend_lock);
-
- s->output_if &= ~VOP_OUTPUT_IF_TV;
}
static void rockchip_tve_encoder_mode_set(struct drm_encoder *encoder,
@@ -487,8 +483,6 @@
*/
if (tve->soc_type == SOC_RK3528)
s->output_if |= VOP_OUTPUT_IF_BT656;
- else
- s->output_if |= VOP_OUTPUT_IF_TV;
s->color_space = V4L2_COLORSPACE_SMPTE170M;
s->tv_state = &conn_state->tv;
@@ -849,7 +843,7 @@
}
tve->dev = &pdev->dev;
- tve_data = device_get_match_data(dev);
+ tve_data = of_device_get_match_data(dev);
if (tve_data) {
tve->soc_type = tve_data->soc_type;
tve->input_format = tve_data->input_format;
@@ -957,8 +951,8 @@
check_uboot_logo(tve);
tve->tv_format = TVOUT_CVBS_PAL;
encoder = &tve->encoder;
- encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
- dev->of_node);
+ encoder->possible_crtcs = rockchip_drm_of_find_possible_crtcs(drm_dev,
+ dev->of_node);
dev_dbg(tve->dev, "possible_crtc:%d\n", encoder->possible_crtcs);
ret = drm_encoder_init(drm_dev, encoder, &rockchip_tve_encoder_funcs,
--
Gitblit v1.6.2