Skip to content
This repository was archived by the owner on Oct 5, 2018. It is now read-only.

Revert commit 72b15e5cb6be4e6ae36 'gpu/drm: hisilicon: Correct 720P's pixel clock' 720P timing change #27

Merged
merged 1 commit into from
Mar 19, 2015
Merged
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
7 changes: 5 additions & 2 deletions drivers/gpu/drm/hisilicon/hisi_drm_dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,10 @@ static void hisi_drm_encoder_mode_set(struct drm_encoder *encoder,
vm->hsync_len = mode->hsync_end - mode->hsync_start;

/* laneBitRate >= pixelClk*24/lanes */
dsi->dphy_freq = vm->pixelclock*24/dsi->lanes;
if (vm->vactive == 720 && vm->pixelclock == 75)
dsi->dphy_freq = 640; /* for 720p 640M is more stable */
else
dsi->dphy_freq = vm->pixelclock*24/dsi->lanes;

vm->flags = 0;
if (mode->flags & DRM_MODE_FLAG_PHSYNC)
Expand Down Expand Up @@ -853,7 +856,7 @@ static int hisi_get_default_modes(struct drm_connector *connector)
}

mode->vrefresh = 60;
mode->clock = 74175;
mode->clock = 75000;
mode->hdisplay = 1280;
mode->hsync_start = 1500;
mode->hsync_end = 1540;
Expand Down