From: Dave Airlie <airlied@redhat.com>
Date: Mon, 19 May 2014 01:15:08 +0000 (+1000)
Subject: Merge branch 'ast-updates' of ssh://people.freedesktop.org/~/linux into drm-next
X-Git-Tag: v3.16-rc1~35^2~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=263432b021cd252570001c10404367e948ac10f0;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'ast-updates' of ssh://people.freedesktop.org/~/linux into drm-next

Pull in latest updates to AST driver.

* 'ast-updates' of ssh://people.freedesktop.org/~/linux:
  drm/ast: initial DP501 support (v0.2)
  drm/ast: rename the mindwm/moutdwm and deinline them
  drm/ast: resync the dram post code with upstream
  drm/ast: add AST 2400 support.
  drm/ast: add widescreen + rb modes from X.org driver (v2)
---

263432b021cd252570001c10404367e948ac10f0
diff --cc drivers/gpu/drm/ast/ast_mode.c
index e599d64,208dc45..114aee9
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@@ -175,14 -181,17 +181,17 @@@ static bool ast_get_vbios_mode_info(str
  		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x8d, refresh_rate_index & 0xff);
  		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x8e, mode_id & 0xff);
  
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0xa8);
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->primary->fb->bits_per_pixel);
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x93, adjusted_mode->clock / 1000);
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x94, adjusted_mode->crtc_hdisplay);
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x95, adjusted_mode->crtc_hdisplay >> 8);
+ 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0x00);
+ 		if (vbios_mode->enh_table->flags & NewModeInfo) {
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0xa8);
 -			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->fb->bits_per_pixel);
++			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->primary->fb->bits_per_pixel);
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x93, adjusted_mode->clock / 1000);
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x94, adjusted_mode->crtc_hdisplay);
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x95, adjusted_mode->crtc_hdisplay >> 8);
  
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x96, adjusted_mode->crtc_vdisplay);
- 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x97, adjusted_mode->crtc_vdisplay >> 8);
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x96, adjusted_mode->crtc_vdisplay);
+ 			ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x97, adjusted_mode->crtc_vdisplay >> 8);
+ 		}
  	}
  
  	return true;