shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: Move vop2_crtc_mode_valid to drm_crtc_helper_funcs

Browse Source 
This function is inherit from linux-4.4, only connector
has mode_valid callback at that age, so we should tie
it to rockchip_crtc_funcs and called by connector driver.

Now drm_crtc_helper_funcs has a mode_valid callback,
so we can tie it here and called by drm framework.

This make connector driver simple.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib15906d8ab54907c20811e3ac9c531f7113c20c3
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Wyon Bi
2021-11-16 15:12:26 +08:00
committed by Tao Huang
parent fd00e36819
commit 3ce8a83106
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -4649,9 +4649,9 @@ remove:
}
static enum drm_mode_status
vop2_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode,
int output_type)
vop2_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
{
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct vop2 *vop2 = vp->vop2;
const struct vop2_data *vop2_data = vop2->data;
@@ -4670,8 +4670,8 @@ vop2_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode,
/*
* Hdmi or DisplayPort request a Accurate clock.
*/
if (output_type == DRM_MODE_CONNECTOR_HDMIA ||
output_type == DRM_MODE_CONNECTOR_DisplayPort)
if (vcstate->output_type == DRM_MODE_CONNECTOR_HDMIA ||
vcstate->output_type == DRM_MODE_CONNECTOR_DisplayPort)
if (clock != request_clock)
return MODE_CLOCK_RANGE;
@@ -4854,7 +4854,6 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = {
.debugfs_init = vop2_crtc_debugfs_init,
.debugfs_dump = vop2_crtc_debugfs_dump,
.regs_dump = vop2_crtc_regs_dump,
.mode_valid = vop2_crtc_mode_valid,
.bandwidth = vop2_crtc_bandwidth,
.crtc_close = vop2_crtc_close,
};
@@ -6867,6 +6866,7 @@ static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state
}
static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = {
.mode_valid = vop2_crtc_mode_valid,
.mode_fixup = vop2_crtc_mode_fixup,
.atomic_check = vop2_crtc_atomic_check,
.atomic_begin = vop2_crtc_atomic_begin,