From: hjc <hjc@rock-chips.com>
Date: Mon, 18 Aug 2014 10:25:07 +0000 (+0800)
Subject: rk fb: fix disp error for box
X-Git-Tag: firefly_0821_release~4868
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f17e4d6bc912c5133f87514daba8cc6520c6614;p=firefly-linux-kernel-4.4.55.git

rk fb: fix disp error for box
---

diff --git a/arch/arm/boot/dts/lcd-box.dtsi b/arch/arm/boot/dts/lcd-box.dtsi
index 8d7710b6cb47..d5822467d0c9 100755
--- a/arch/arm/boot/dts/lcd-box.dtsi
+++ b/arch/arm/boot/dts/lcd-box.dtsi
@@ -34,7 +34,7 @@
 		disp_timings: display-timings {
 			native-mode = <&timing0>;
 			timing0: timing0 {
-				screen-type = <SCREEN_RGB>;
+				screen-type = <SCREEN_HDMI>;
 				out-face    = <OUT_P888>;
 				clock-frequency = <74250000>;
 				hactive = <1280>;
@@ -54,7 +54,7 @@
 				swap-gb = <0>;
                      	};
                      	timing1: timing1 {
-				screen-type = <SCREEN_RGB>;
+				screen-type = <SCREEN_HDMI>;
 				out-face    = <OUT_P888>;
 				clock-frequency = <148500000>;
 				hactive = <1920>;
@@ -74,7 +74,7 @@
 				swap-gb = <0>;
                      	};
                      	timing2: timing2 {
-				screen-type = <SCREEN_RGB>;
+				screen-type = <SCREEN_HDMI>;
 				out-face    = <OUT_P888>;
 				clock-frequency = <297000000>;
 				hactive = <3840>;
diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 90bbcfb8d320..f8819bf9fc44 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3490,6 +3490,11 @@ int rk_fb_disp_scale(u8 scale_x, u8 scale_y, u8 lcdc_id)
 	u16 screen_x, screen_y;
 	u16 xpos, ypos;
 	char name[6];
+	struct rk_screen primary_screen;
+	rk_fb_get_prmry_screen(&primary_screen);
+	if (primary_screen.type == SCREEN_HDMI) {
+		return 0;
+	}
 
 	sprintf(name, "lcdc%d", lcdc_id);