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

drm/rockchip: vop: assign crtc atomic API mode_valid

Browse Source 
In order to avoid the invalid settings of display mode,
assign crtc atomic API mode_valid as vop_crtc_mode_valid.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I9abc1e93308d18bde55027163b4c01f32a8429a4
This commit is contained in:
Damon Ding
2022-03-22 19:28:47 +08:00
committed by Tao Huang
parent 87ee2e0862
commit 8e04534d8c
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_vop.c
View File

@@ -2651,10 +2651,10 @@ remove:
}
static enum drm_mode_status
vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode,
int output_type)
vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
{
struct vop *vop = to_vop(crtc);
struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
const struct vop_data *vop_data = vop->data;
int request_clock = mode->clock;
int clock;
@@ -2674,8 +2674,8 @@ vop_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 (s->output_type == DRM_MODE_CONNECTOR_HDMIA ||
s->output_type == DRM_MODE_CONNECTOR_DisplayPort)
if (clock != request_clock)
return MODE_CLOCK_RANGE;
@@ -2957,7 +2957,6 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = {
.debugfs_init = vop_crtc_debugfs_init,
.debugfs_dump = vop_crtc_debugfs_dump,
.regs_dump = vop_crtc_regs_dump,
.mode_valid = vop_crtc_mode_valid,
.bandwidth = vop_crtc_bandwidth,
.crtc_close = vop_crtc_close,
.crtc_send_mcu_cmd = vop_crtc_send_mcu_cmd,
@@ -3946,6 +3945,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
.mode_fixup = vop_crtc_mode_fixup,
.mode_valid = vop_crtc_mode_valid,
.atomic_check = vop_crtc_atomic_check,
.atomic_flush = vop_crtc_atomic_flush,
.atomic_enable = vop_crtc_atomic_enable,