Skip to content

drm/rockchip: vop: check mode_valid by total pixels #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

drm/rockchip: vop: check mode_valid by total pixels #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2755,8 +2755,8 @@ vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
int request_clock = mode->clock;
int clock;

if (mode->hdisplay > vop_data->max_output.width)
return MODE_BAD_HVALUE;
if (mode->hdisplay * mode->vdisplay > vop_data->max_output.width * vop_data->max_output.height)
return MODE_BAD;

if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
VOP_MAJOR(vop->version) == 3 &&
Expand Down
7 changes: 2 additions & 5 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3133,11 +3133,8 @@ vop2_wb_connector_mode_valid(struct drm_connector *connector,
h = mode->vdisplay;


if (w > vop2->data->wb->max_output.width)
return MODE_BAD_HVALUE;

if (h > vop2->data->wb->max_output.height)
return MODE_BAD_VVALUE;
if (w * h > vop2->data->wb->max_output.width * vop2->data->wb->max_output.height)
return MODE_BAD;

return MODE_OK;
}
Expand Down