Skip to content
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.

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

drm : allow framebuffer and videomodes not to have same size #1

Merged
merged 1 commit into from
Apr 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions drivers/gpu/drm/drm_atomic_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -1830,11 +1830,11 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set,
primary_state->src_x = set->x << 16;
primary_state->src_y = set->y << 16;
if (primary_state->rotation & (BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270))) {
primary_state->src_h = hdisplay << 16;
primary_state->src_w = vdisplay << 16;
primary_state->src_h = set->fb->width << 16;
primary_state->src_w = set->fb->height << 16;
} else {
primary_state->src_h = vdisplay << 16;
primary_state->src_w = hdisplay << 16;
primary_state->src_h = set->fb->height << 16;
primary_state->src_w = set->fb->width << 16;
}

commit:
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2879,6 +2879,8 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc,

{
int hdisplay, vdisplay;
pr_info("%s: skip check\n", __func__);
return 0;

drm_crtc_get_hv_timing(mode, &hdisplay, &vdisplay);

Expand Down