50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
|
From cc76c1934b5fc2603a1218425c4adbd04cff5227 Mon Sep 17 00:00:00 2001
|
||
|
From: jamess_huang <Jamess_Huang@asus.com>
|
||
|
Date: Wed, 2 Aug 2017 20:36:39 +0800
|
||
|
Subject: [PATCH] added the missing commit of GPU after update code base to
|
||
|
release-4.4
|
||
|
MIME-Version: 1.0
|
||
|
Content-Type: text/plain; charset=UTF-8
|
||
|
Content-Transfer-Encoding: 8bit
|
||
|
|
||
|
Change-Id: Icbf9e970dce948ce5001fa944f04b7d41b9ce1af
|
||
|
Reviewed-on: https://tp-biosrd-v02/gerrit/80047
|
||
|
Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
|
||
|
Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
|
||
|
---
|
||
|
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++
|
||
|
drivers/miniarm/dsi/panel-toshiba-tc358762.c | 6 +++---
|
||
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
||
|
index 079e3651ae01..23f192386e5c 100755
|
||
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
||
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
||
|
@@ -1605,6 +1605,9 @@ vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode,
|
||
|
int request_clock = mode->clock;
|
||
|
int clock;
|
||
|
|
||
|
+ if (mode->clock >= 594000 || mode->clock <= 27500)
|
||
|
+ return MODE_CLOCK_RANGE;
|
||
|
+
|
||
|
if (mode->hdisplay > vop_data->max_output.width)
|
||
|
return MODE_BAD_HVALUE;
|
||
|
|
||
|
diff --git a/drivers/tinkerboard/dsi/panel-toshiba-tc358762.c b/drivers/tinkerboard/dsi/panel-toshiba-tc358762.c
|
||
|
index 6d85b0f30136..30a2ca446ea7 100755
|
||
|
--- a/drivers/tinkerboard/dsi/panel-toshiba-tc358762.c
|
||
|
+++ b/drivers/tinkerboard/dsi/panel-toshiba-tc358762.c
|
||
|
@@ -488,9 +488,9 @@ struct bridge_desc {
|
||
|
static const struct drm_display_mode tc358762_mode = {
|
||
|
.clock = 27448,
|
||
|
.hdisplay = 800,
|
||
|
- .hsync_start = 800 + 65,
|
||
|
- .hsync_end = 800 + 65 + 20,
|
||
|
- .htotal = 800 + 65 + 20 + 26,
|
||
|
+ .hsync_start = 800 + 70,
|
||
|
+ .hsync_end = 800 + 70 + 20,
|
||
|
+ .htotal = 800 + 70 + 20 + 26,
|
||
|
.vdisplay = 480,
|
||
|
.vsync_start = 480 + 7,
|
||
|
.vsync_end = 480 + 7 + 2,
|