[PATCH 00/10] drm/ast: Split POST code per hardware gen

[PATCH 00/10] drm/ast: Split POST code per hardware gen

[Thomas Zimmermann]

Move the POST code for each hardware generation into a separate source
file. Split some functions per gen, as necessary. Makes the code more
maintainable. Support for future hardware generations can now be added
easily in a new source file without interfering with existing code.

Gen3 and Gen5 share their POST code with earlier hardware generations.
The other generations have individual POST. Patch 1 makes the few
shared cross-gen helpers available.

Patches 2 to 5 move individual POST functionality into separate files,
split by hardware generation and addresses some coding-style issues.

Patches 6 and 7 fix the use of struct ast_dramstruct to be less of a
blackbox. It's used for DRAM initialization in Gen1 and Gen2 hardware.

Patch 8 splits up default settings for various registers. This brings
up an issue with Gen7, which likely uses outdated values from Gen1.

Patches 9 and 10 attempt to fix the default settings for Gen7. It's
done separately from the rest, so it can be bisected and reverted
easily, if necessary.

Tested on AST2600 (Gen7) and AST2500 (Gen6).

Thomas Zimmermann (10):
  drm/ast: Declare helpers for POST in header
  drm/ast: Move Gen7+ POST code to separate source file
  drm/ast: Move Gen6+ POST code to separate source file
  drm/ast: Move Gen4+ POST code to separate source file
  drm/ast: Move Gen2+ and Gen1 POST code to separate source files
  drm/ast: Move struct ast_dramstruct to ast_post.h
  drm/ast: Handle known struct ast_dramstruct with helpers
  drm/ast: Split ast_set_def_ext_reg() by chip generation
  drm/ast: Gen7: Disable VGASR0[1] as on Gen4+
  drm/ast: Gen7: Switch default registers to gen4+ state

 drivers/gpu/drm/ast/Makefile          |    5 +
 drivers/gpu/drm/ast/ast_2000.c        |  149 ++
 drivers/gpu/drm/ast/ast_2100.c        |  348 +++++
 drivers/gpu/drm/ast/ast_2300.c        | 1328 ++++++++++++++++
 drivers/gpu/drm/ast/ast_2500.c        |  569 +++++++
 drivers/gpu/drm/ast/ast_2600.c        |   49 +
 drivers/gpu/drm/ast/ast_dram_tables.h |  207 ---
 drivers/gpu/drm/ast/ast_drv.c         |    2 +-
 drivers/gpu/drm/ast/ast_drv.h         |   17 +-
 drivers/gpu/drm/ast/ast_post.c        | 2027 +------------------------
 drivers/gpu/drm/ast/ast_post.h        |   50 +
 11 files changed, 2536 insertions(+), 2215 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_2000.c
 create mode 100644 drivers/gpu/drm/ast/ast_2100.c
 create mode 100644 drivers/gpu/drm/ast/ast_2300.c
 create mode 100644 drivers/gpu/drm/ast/ast_2500.c
 create mode 100644 drivers/gpu/drm/ast/ast_2600.c
 delete mode 100644 drivers/gpu/drm/ast/ast_dram_tables.h
 create mode 100644 drivers/gpu/drm/ast/ast_post.h

-- 
2.50.0

[PATCH 01/10] drm/ast: Declare helpers for POST in header

[Thomas Zimmermann]

Provide POST helpers in header file before splitting up the AST
POST code.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_post.c | 10 +++++-----
 drivers/gpu/drm/ast/ast_post.h | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_post.h

diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 37568cf3822c..36542d266f9c 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -33,6 +33,7 @@
 
 #include "ast_dram_tables.h"
 #include "ast_drv.h"
+#include "ast_post.h"
 
 static void ast_post_chip_2300(struct ast_device *ast);
 static void ast_post_chip_2500(struct ast_device *ast);
@@ -75,7 +76,7 @@ static void ast_set_def_ext_reg(struct ast_device *ast)
 	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
 }
 
-static u32 __ast_mindwm(void __iomem *regs, u32 r)
+u32 __ast_mindwm(void __iomem *regs, u32 r)
 {
 	u32 data;
 
@@ -89,7 +90,7 @@ static u32 __ast_mindwm(void __iomem *regs, u32 r)
 	return __ast_read32(regs, 0x10000 + (r & 0x0000ffff));
 }
 
-static void __ast_moutdwm(void __iomem *regs, u32 r, u32 v)
+void __ast_moutdwm(void __iomem *regs, u32 r, u32 v)
 {
 	u32 data;
 
@@ -438,7 +439,7 @@ static const u32 pattern[8] = {
 	0x7C61D253
 };
 
-static bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
+bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
 {
 	u32 data, timeout;
 
@@ -478,8 +479,7 @@ static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
 	return data;
 }
 
-
-static bool mmc_test_burst(struct ast_device *ast, u32 datagen)
+bool mmc_test_burst(struct ast_device *ast, u32 datagen)
 {
 	return mmc_test(ast, datagen, 0xc1);
 }
diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
new file mode 100644
index 000000000000..314fa0475c79
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_post.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+
+#ifndef AST_POST_H
+#define AST_POST_H
+
+#include <linux/types.h>
+
+struct ast_device;
+
+u32 __ast_mindwm(void __iomem *regs, u32 r);
+void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
+
+bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl);
+bool mmc_test_burst(struct ast_device *ast, u32 datagen);
+
+#endif
-- 
2.50.0

Re: [PATCH 01/10] drm/ast: Declare helpers for POST in header

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Provide POST helpers in header file before splitting up the AST
> POST code.

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_post.c | 10 +++++-----
>   drivers/gpu/drm/ast/ast_post.h | 16 ++++++++++++++++
>   2 files changed, 21 insertions(+), 5 deletions(-)
>   create mode 100644 drivers/gpu/drm/ast/ast_post.h
> 
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 37568cf3822c..36542d266f9c 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -33,6 +33,7 @@
>   
>   #include "ast_dram_tables.h"
>   #include "ast_drv.h"
> +#include "ast_post.h"
>   
>   static void ast_post_chip_2300(struct ast_device *ast);
>   static void ast_post_chip_2500(struct ast_device *ast);
> @@ -75,7 +76,7 @@ static void ast_set_def_ext_reg(struct ast_device *ast)
>   	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
>   }
>   
> -static u32 __ast_mindwm(void __iomem *regs, u32 r)
> +u32 __ast_mindwm(void __iomem *regs, u32 r)
>   {
>   	u32 data;
>   
> @@ -89,7 +90,7 @@ static u32 __ast_mindwm(void __iomem *regs, u32 r)
>   	return __ast_read32(regs, 0x10000 + (r & 0x0000ffff));
>   }
>   
> -static void __ast_moutdwm(void __iomem *regs, u32 r, u32 v)
> +void __ast_moutdwm(void __iomem *regs, u32 r, u32 v)
>   {
>   	u32 data;
>   
> @@ -438,7 +439,7 @@ static const u32 pattern[8] = {
>   	0x7C61D253
>   };
>   
> -static bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
> +bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
>   {
>   	u32 data, timeout;
>   
> @@ -478,8 +479,7 @@ static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
>   	return data;
>   }
>   
> -
> -static bool mmc_test_burst(struct ast_device *ast, u32 datagen)
> +bool mmc_test_burst(struct ast_device *ast, u32 datagen)
>   {
>   	return mmc_test(ast, datagen, 0xc1);
>   }
> diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
> new file mode 100644
> index 000000000000..314fa0475c79
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_post.h
> @@ -0,0 +1,16 @@
> +/* SPDX-License-Identifier: MIT */
> +
> +#ifndef AST_POST_H
> +#define AST_POST_H
> +
> +#include <linux/types.h>
> +
> +struct ast_device;
> +
> +u32 __ast_mindwm(void __iomem *regs, u32 r);
> +void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
> +
> +bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl);
> +bool mmc_test_burst(struct ast_device *ast, u32 datagen);
> +
> +#endif

[PATCH 02/10] drm/ast: Move Gen7+ POST code to separate source file

[Thomas Zimmermann]

Move POST code for Gen7+ to separate source file and hide it in
ast_2600_post(). There's not much going on here except for enabling
the DP transmitter chip.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/Makefile   |  1 +
 drivers/gpu/drm/ast/ast_2600.c | 46 ++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_drv.h  |  3 +++
 drivers/gpu/drm/ast/ast_post.c |  8 +++---
 4 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_2600.c

diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index 8d09ba5d5889..0f09e0fa741b 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -4,6 +4,7 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ast-y := \
+	ast_2600.o \
 	ast_cursor.o \
 	ast_ddc.o \
 	ast_dp501.o \
diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
new file mode 100644
index 000000000000..556571efa0b2
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_2600.c
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+/*
+ * Authors: Dave Airlie <airlied@redhat.com>
+ */
+
+#include "ast_drv.h"
+
+/*
+ * POST
+ */
+
+int ast_2600_post(struct ast_device *ast)
+{
+	int ret;
+
+	if (ast->tx_chip == AST_TX_ASTDP) {
+		ret = ast_dp_launch(ast);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 2ee402096cd9..570c2fe98b58 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -417,6 +417,9 @@ struct ast_crtc_state {
 
 int ast_mm_init(struct ast_device *ast);
 
+/* ast_2600.c */
+int ast_2600_post(struct ast_device *ast);
+
 /* ast post */
 int ast_post_gpu(struct ast_device *ast);
 u32 ast_mindwm(struct ast_device *ast, u32 r);
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 36542d266f9c..03a7367bdc71 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -348,11 +348,9 @@ int ast_post_gpu(struct ast_device *ast)
 	ast_set_def_ext_reg(ast);
 
 	if (AST_GEN(ast) >= 7) {
-		if (ast->tx_chip == AST_TX_ASTDP) {
-			ret = ast_dp_launch(ast);
-			if (ret)
-				return ret;
-		}
+		ret = ast_2600_post(ast);
+		if (ret)
+			return ret;
 	} else if (AST_GEN(ast) >= 6) {
 		if (ast->config_mode == ast_use_p2a) {
 			ast_post_chip_2500(ast);
-- 
2.50.0

Re: [PATCH 02/10] drm/ast: Move Gen7+ POST code to separate source file

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Move POST code for Gen7+ to separate source file and hide it in
> ast_2600_post(). There's not much going on here except for enabling
> the DP transmitter chip.

Thanks, it looks good to me.

Only a cosmetic comment below.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/Makefile   |  1 +
>   drivers/gpu/drm/ast/ast_2600.c | 46 ++++++++++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_drv.h  |  3 +++
>   drivers/gpu/drm/ast/ast_post.c |  8 +++---
>   4 files changed, 53 insertions(+), 5 deletions(-)
>   create mode 100644 drivers/gpu/drm/ast/ast_2600.c
> 
> diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
> index 8d09ba5d5889..0f09e0fa741b 100644
> --- a/drivers/gpu/drm/ast/Makefile
> +++ b/drivers/gpu/drm/ast/Makefile
> @@ -4,6 +4,7 @@
>   # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>   
>   ast-y := \
> +	ast_2600.o \
>   	ast_cursor.o \
>   	ast_ddc.o \
>   	ast_dp501.o \
> diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
> new file mode 100644
> index 000000000000..556571efa0b2
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_2600.c
> @@ -0,0 +1,46 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2012 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors: Dave Airlie <airlied@redhat.com>
> + */
> +
> +#include "ast_drv.h"
> +
> +/*
> + * POST
> + */
> +
> +int ast_2600_post(struct ast_device *ast)
> +{
> +	int ret;
> +
> +	if (ast->tx_chip == AST_TX_ASTDP) {
> +		ret = ast_dp_launch(ast);
> +		if (ret)
> +			return ret;

That can be simplified, as the ret variable isn't useful.

if (ast->tx_chip == AST_TX_ASTDP)
	return ast_dp_launch(ast0);

> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 2ee402096cd9..570c2fe98b58 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -417,6 +417,9 @@ struct ast_crtc_state {
>   
>   int ast_mm_init(struct ast_device *ast);
>   
> +/* ast_2600.c */
> +int ast_2600_post(struct ast_device *ast);
> +
>   /* ast post */
>   int ast_post_gpu(struct ast_device *ast);
>   u32 ast_mindwm(struct ast_device *ast, u32 r);
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 36542d266f9c..03a7367bdc71 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -348,11 +348,9 @@ int ast_post_gpu(struct ast_device *ast)
>   	ast_set_def_ext_reg(ast);
>   
>   	if (AST_GEN(ast) >= 7) {
> -		if (ast->tx_chip == AST_TX_ASTDP) {
> -			ret = ast_dp_launch(ast);
> -			if (ret)
> -				return ret;
> -		}
> +		ret = ast_2600_post(ast);
> +		if (ret)
> +			return ret;
>   	} else if (AST_GEN(ast) >= 6) {
>   		if (ast->config_mode == ast_use_p2a) {
>   			ast_post_chip_2500(ast);

[PATCH 03/10] drm/ast: Move Gen6+ POST code to separate source file

[Thomas Zimmermann]

Move POST code for Gen6+ to separate source file and hide it in
ast_2500_post(). With P2A configuration, it performs a full board
POST; otherwise it enables the transmitter chip. No changes to the
overall logic.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/Makefile          |   1 +
 drivers/gpu/drm/ast/ast_2500.c        | 567 ++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_dram_tables.h |  62 ---
 drivers/gpu/drm/ast/ast_drv.c         |   2 +-
 drivers/gpu/drm/ast/ast_drv.h         |   5 +-
 drivers/gpu/drm/ast/ast_post.c        | 461 +--------------------
 6 files changed, 576 insertions(+), 522 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_2500.c

diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index 0f09e0fa741b..38374720e32e 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -4,6 +4,7 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ast-y := \
+	ast_2500.o \
 	ast_2600.o \
 	ast_cursor.o \
 	ast_ddc.o \
diff --git a/drivers/gpu/drm/ast/ast_2500.c b/drivers/gpu/drm/ast/ast_2500.c
new file mode 100644
index 000000000000..e5b3e0c63222
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_2500.c
@@ -0,0 +1,567 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+/*
+ * Authors: Dave Airlie <airlied@redhat.com>
+ */
+
+#include <linux/delay.h>
+
+#include <drm/drm_print.h>
+
+#include "ast_drv.h"
+#include "ast_post.h"
+
+/*
+ * POST
+ */
+
+/*
+ * AST2500 DRAM settings modules
+ */
+
+#define REGTBL_NUM           17
+#define REGIDX_010           0
+#define REGIDX_014           1
+#define REGIDX_018           2
+#define REGIDX_020           3
+#define REGIDX_024           4
+#define REGIDX_02C           5
+#define REGIDX_030           6
+#define REGIDX_214           7
+#define REGIDX_2E0           8
+#define REGIDX_2E4           9
+#define REGIDX_2E8           10
+#define REGIDX_2EC           11
+#define REGIDX_2F0           12
+#define REGIDX_2F4           13
+#define REGIDX_2F8           14
+#define REGIDX_RFC           15
+#define REGIDX_PLL           16
+
+static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
+	0x64604D38,		     /* 0x010 */
+	0x29690599,		     /* 0x014 */
+	0x00000300,		     /* 0x018 */
+	0x00000000,		     /* 0x020 */
+	0x00000000,		     /* 0x024 */
+	0x02181E70,		     /* 0x02C */
+	0x00000040,		     /* 0x030 */
+	0x00000024,		     /* 0x214 */
+	0x02001300,		     /* 0x2E0 */
+	0x0E0000A0,		     /* 0x2E4 */
+	0x000E001B,		     /* 0x2E8 */
+	0x35B8C105,		     /* 0x2EC */
+	0x08090408,		     /* 0x2F0 */
+	0x9B000800,		     /* 0x2F4 */
+	0x0E400A00,		     /* 0x2F8 */
+	0x9971452F,		     /* tRFC  */
+	0x000071C1		     /* PLL   */
+};
+
+static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
+	0x63604E37,		     /* 0x010 */
+	0xE97AFA99,		     /* 0x014 */
+	0x00019000,		     /* 0x018 */
+	0x08000000,		     /* 0x020 */
+	0x00000400,		     /* 0x024 */
+	0x00000410,		     /* 0x02C */
+	0x00000101,		     /* 0x030 */
+	0x00000024,		     /* 0x214 */
+	0x03002900,		     /* 0x2E0 */
+	0x0E0000A0,		     /* 0x2E4 */
+	0x000E001C,		     /* 0x2E8 */
+	0x35B8C106,		     /* 0x2EC */
+	0x08080607,		     /* 0x2F0 */
+	0x9B000900,		     /* 0x2F4 */
+	0x0E400A00,		     /* 0x2F8 */
+	0x99714545,		     /* tRFC  */
+	0x000071C1		     /* PLL   */
+};
+
+#define TIMEOUT              5000000
+
+void ast_2500_patch_ahb(void __iomem *regs)
+{
+	u32 data;
+
+	/* Clear bus lock condition */
+	__ast_moutdwm(regs, 0x1e600000, 0xAEED1A03);
+	__ast_moutdwm(regs, 0x1e600084, 0x00010000);
+	__ast_moutdwm(regs, 0x1e600088, 0x00000000);
+	__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
+
+	data = __ast_mindwm(regs, 0x1e6e2070);
+	if (data & 0x08000000) { /* check fast reset */
+		/*
+		 * If "Fast restet" is enabled for ARM-ICE debugger,
+		 * then WDT needs to enable, that
+		 * WDT04 is WDT#1 Reload reg.
+		 * WDT08 is WDT#1 counter restart reg to avoid system deadlock
+		 * WDT0C is WDT#1 control reg
+		 *	[6:5]:= 01:Full chip
+		 *	[4]:= 1:1MHz clock source
+		 *	[1]:= 1:WDT will be cleeared and disabled after timeout occurs
+		 *	[0]:= 1:WDT enable
+		 */
+		__ast_moutdwm(regs, 0x1E785004, 0x00000010);
+		__ast_moutdwm(regs, 0x1E785008, 0x00004755);
+		__ast_moutdwm(regs, 0x1E78500c, 0x00000033);
+		udelay(1000);
+	}
+
+	do {
+		__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
+		data = __ast_mindwm(regs, 0x1e6e2000);
+	} while (data != 1);
+
+	__ast_moutdwm(regs, 0x1e6e207c, 0x08000000); /* clear fast reset */
+}
+
+static bool mmc_test_single_2500(struct ast_device *ast, u32 datagen)
+{
+	return mmc_test(ast, datagen, 0x85);
+}
+
+static bool cbr_test_2500(struct ast_device *ast)
+{
+	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
+	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
+	if (!mmc_test_burst(ast, 0))
+		return false;
+	if (!mmc_test_single_2500(ast, 0))
+		return false;
+	return true;
+}
+
+static bool ddr_test_2500(struct ast_device *ast)
+{
+	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
+	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
+	if (!mmc_test_burst(ast, 0))
+		return false;
+	if (!mmc_test_burst(ast, 1))
+		return false;
+	if (!mmc_test_burst(ast, 2))
+		return false;
+	if (!mmc_test_burst(ast, 3))
+		return false;
+	if (!mmc_test_single_2500(ast, 0))
+		return false;
+	return true;
+}
+
+static void ddr_init_common_2500(struct ast_device *ast)
+{
+	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
+	ast_moutdwm(ast, 0x1E6E0008, 0x2003000F);
+	ast_moutdwm(ast, 0x1E6E0038, 0x00000FFF);
+	ast_moutdwm(ast, 0x1E6E0040, 0x88448844);
+	ast_moutdwm(ast, 0x1E6E0044, 0x24422288);
+	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
+	ast_moutdwm(ast, 0x1E6E004C, 0x22222222);
+	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E0208, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0218, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0220, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0228, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0230, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E02A8, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E02B0, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0240, 0x86000000);
+	ast_moutdwm(ast, 0x1E6E0244, 0x00008600);
+	ast_moutdwm(ast, 0x1E6E0248, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E024C, 0x80808080);
+}
+
+static void ddr_phy_init_2500(struct ast_device *ast)
+{
+	u32 data, pass, timecnt;
+
+	pass = 0;
+	ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
+	while (!pass) {
+		for (timecnt = 0; timecnt < TIMEOUT; timecnt++) {
+			data = ast_mindwm(ast, 0x1E6E0060) & 0x1;
+			if (!data)
+				break;
+		}
+		if (timecnt != TIMEOUT) {
+			data = ast_mindwm(ast, 0x1E6E0300) & 0x000A0000;
+			if (!data)
+				pass = 1;
+		}
+		if (!pass) {
+			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+			udelay(10); /* delay 10 us */
+			ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
+		}
+	}
+
+	ast_moutdwm(ast, 0x1E6E0060, 0x00000006);
+}
+
+/*
+ * Check DRAM Size
+ * 1Gb : 0x80000000 ~ 0x87FFFFFF
+ * 2Gb : 0x80000000 ~ 0x8FFFFFFF
+ * 4Gb : 0x80000000 ~ 0x9FFFFFFF
+ * 8Gb : 0x80000000 ~ 0xBFFFFFFF
+ */
+static void check_dram_size_2500(struct ast_device *ast, u32 tRFC)
+{
+	u32 reg_04, reg_14;
+
+	reg_04 = ast_mindwm(ast, 0x1E6E0004) & 0xfffffffc;
+	reg_14 = ast_mindwm(ast, 0x1E6E0014) & 0xffffff00;
+
+	ast_moutdwm(ast, 0xA0100000, 0x41424344);
+	ast_moutdwm(ast, 0x90100000, 0x35363738);
+	ast_moutdwm(ast, 0x88100000, 0x292A2B2C);
+	ast_moutdwm(ast, 0x80100000, 0x1D1E1F10);
+
+	/* Check 8Gbit */
+	if (ast_mindwm(ast, 0xA0100000) == 0x41424344) {
+		reg_04 |= 0x03;
+		reg_14 |= (tRFC >> 24) & 0xFF;
+		/* Check 4Gbit */
+	} else if (ast_mindwm(ast, 0x90100000) == 0x35363738) {
+		reg_04 |= 0x02;
+		reg_14 |= (tRFC >> 16) & 0xFF;
+		/* Check 2Gbit */
+	} else if (ast_mindwm(ast, 0x88100000) == 0x292A2B2C) {
+		reg_04 |= 0x01;
+		reg_14 |= (tRFC >> 8) & 0xFF;
+	} else {
+		reg_14 |= tRFC & 0xFF;
+	}
+	ast_moutdwm(ast, 0x1E6E0004, reg_04);
+	ast_moutdwm(ast, 0x1E6E0014, reg_14);
+}
+
+static void enable_cache_2500(struct ast_device *ast)
+{
+	u32 reg_04, data;
+
+	reg_04 = ast_mindwm(ast, 0x1E6E0004);
+	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x1000);
+
+	do
+		data = ast_mindwm(ast, 0x1E6E0004);
+	while (!(data & 0x80000));
+	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x400);
+}
+
+static void set_mpll_2500(struct ast_device *ast)
+{
+	u32 addr, data, param;
+
+	/* Reset MMC */
+	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
+	for (addr = 0x1e6e0004; addr < 0x1e6e0090;) {
+		ast_moutdwm(ast, addr, 0x0);
+		addr += 4;
+	}
+	ast_moutdwm(ast, 0x1E6E0034, 0x00020000);
+
+	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
+	data = ast_mindwm(ast, 0x1E6E2070) & 0x00800000;
+	if (data) {
+		/* CLKIN = 25MHz */
+		param = 0x930023E0;
+		ast_moutdwm(ast, 0x1E6E2160, 0x00011320);
+	} else {
+		/* CLKIN = 24MHz */
+		param = 0x93002400;
+	}
+	ast_moutdwm(ast, 0x1E6E2020, param);
+	udelay(100);
+}
+
+static void reset_mmc_2500(struct ast_device *ast)
+{
+	ast_moutdwm(ast, 0x1E78505C, 0x00000004);
+	ast_moutdwm(ast, 0x1E785044, 0x00000001);
+	ast_moutdwm(ast, 0x1E785048, 0x00004755);
+	ast_moutdwm(ast, 0x1E78504C, 0x00000013);
+	mdelay(100);
+	ast_moutdwm(ast, 0x1E785054, 0x00000077);
+	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+}
+
+static void ddr3_init_2500(struct ast_device *ast, const u32 *ddr_table)
+{
+	ast_moutdwm(ast, 0x1E6E0004, 0x00000303);
+	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
+	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
+	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
+	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
+	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
+	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
+	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
+
+	/* DDR PHY Setting */
+	ast_moutdwm(ast, 0x1E6E0200, 0x02492AAE);
+	ast_moutdwm(ast, 0x1E6E0204, 0x00001001);
+	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
+	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
+	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
+	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
+	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
+	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
+	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
+	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
+	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
+	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
+	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
+	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006);
+
+	/* Controller Setting */
+	ast_moutdwm(ast, 0x1E6E0034, 0x00020091);
+
+	/* Wait DDR PHY init done */
+	ddr_phy_init_2500(ast);
+
+	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
+	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
+	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
+
+	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
+	enable_cache_2500(ast);
+	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
+	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
+}
+
+static void ddr4_init_2500(struct ast_device *ast, const u32 *ddr_table)
+{
+	u32 data, data2, pass, retrycnt;
+	u32 ddr_vref, phy_vref;
+	u32 min_ddr_vref = 0, min_phy_vref = 0;
+	u32 max_ddr_vref = 0, max_phy_vref = 0;
+
+	ast_moutdwm(ast, 0x1E6E0004, 0x00000313);
+	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
+	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
+	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
+	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
+	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
+	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
+	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
+
+	/* DDR PHY Setting */
+	ast_moutdwm(ast, 0x1E6E0200, 0x42492AAE);
+	ast_moutdwm(ast, 0x1E6E0204, 0x09002000);
+	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
+	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
+	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
+	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
+	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
+	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
+	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
+	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
+	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
+	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
+	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
+	ast_moutdwm(ast, 0x1E6E02C4, 0x3C183C3C);
+	ast_moutdwm(ast, 0x1E6E02C8, 0x00631E0E);
+
+	/* Controller Setting */
+	ast_moutdwm(ast, 0x1E6E0034, 0x0001A991);
+
+	/* Train PHY Vref first */
+	pass = 0;
+
+	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
+		max_phy_vref = 0x0;
+		pass = 0;
+		ast_moutdwm(ast, 0x1E6E02C0, 0x00001C06);
+		for (phy_vref = 0x40; phy_vref < 0x80; phy_vref++) {
+			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+			ast_moutdwm(ast, 0x1E6E02CC, phy_vref | (phy_vref << 8));
+			/* Fire DFI Init */
+			ddr_phy_init_2500(ast);
+			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
+			if (cbr_test_2500(ast)) {
+				pass++;
+				data = ast_mindwm(ast, 0x1E6E03D0);
+				data2 = data >> 8;
+				data  = data & 0xff;
+				if (data > data2)
+					data = data2;
+				if (max_phy_vref < data) {
+					max_phy_vref = data;
+					min_phy_vref = phy_vref;
+				}
+			} else if (pass > 0) {
+				break;
+			}
+		}
+	}
+	ast_moutdwm(ast, 0x1E6E02CC, min_phy_vref | (min_phy_vref << 8));
+
+	/* Train DDR Vref next */
+	pass = 0;
+
+	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
+		min_ddr_vref = 0xFF;
+		max_ddr_vref = 0x0;
+		pass = 0;
+		for (ddr_vref = 0x00; ddr_vref < 0x40; ddr_vref++) {
+			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+			ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
+			/* Fire DFI Init */
+			ddr_phy_init_2500(ast);
+			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
+			if (cbr_test_2500(ast)) {
+				pass++;
+				if (min_ddr_vref > ddr_vref)
+					min_ddr_vref = ddr_vref;
+				if (max_ddr_vref < ddr_vref)
+					max_ddr_vref = ddr_vref;
+			} else if (pass != 0) {
+				break;
+			}
+		}
+	}
+
+	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+	ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1;
+	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
+
+	/* Wait DDR PHY init done */
+	ddr_phy_init_2500(ast);
+
+	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
+	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
+	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
+
+	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
+	enable_cache_2500(ast);
+	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
+	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
+}
+
+static bool ast_dram_init_2500(struct ast_device *ast)
+{
+	u32 data;
+	u32 max_tries = 5;
+
+	do {
+		if (max_tries-- == 0)
+			return false;
+		set_mpll_2500(ast);
+		reset_mmc_2500(ast);
+		ddr_init_common_2500(ast);
+
+		data = ast_mindwm(ast, 0x1E6E2070);
+		if (data & 0x01000000)
+			ddr4_init_2500(ast, ast2500_ddr4_1600_timing_table);
+		else
+			ddr3_init_2500(ast, ast2500_ddr3_1600_timing_table);
+	} while (!ddr_test_2500(ast));
+
+	ast_moutdwm(ast, 0x1E6E2040, ast_mindwm(ast, 0x1E6E2040) | 0x41);
+
+	/* Patch code */
+	data = ast_mindwm(ast, 0x1E6E200C) & 0xF9FFFFFF;
+	ast_moutdwm(ast, 0x1E6E200C, data | 0x10000000);
+
+	return true;
+}
+
+static void ast_post_chip_2500(struct ast_device *ast)
+{
+	struct drm_device *dev = &ast->base;
+	u32 temp;
+	u8 reg;
+
+	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	if ((reg & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
+		/* Clear bus lock condition */
+		ast_2500_patch_ahb(ast->regs);
+
+		/* Disable watchdog */
+		ast_moutdwm(ast, 0x1E78502C, 0x00000000);
+		ast_moutdwm(ast, 0x1E78504C, 0x00000000);
+
+		/*
+		 * Reset USB port to patch USB unknown device issue
+		 * SCU90 is Multi-function Pin Control #5
+		 *	[29]:= 1:Enable USB2.0 Host port#1 (that the mutually shared USB2.0 Hub
+		 *				port).
+		 * SCU94 is Multi-function Pin Control #6
+		 *	[14:13]:= 1x:USB2.0 Host2 controller
+		 * SCU70 is Hardware Strap reg
+		 *	[23]:= 1:CLKIN is 25MHz and USBCK1 = 24/48 MHz (determined by
+		 *				[18]: 0(24)/1(48) MHz)
+		 * SCU7C is Write clear reg to SCU70
+		 *	[23]:= write 1 and then SCU70[23] will be clear as 0b.
+		 */
+		ast_moutdwm(ast, 0x1E6E2090, 0x20000000);
+		ast_moutdwm(ast, 0x1E6E2094, 0x00004000);
+		if (ast_mindwm(ast, 0x1E6E2070) & 0x00800000) {
+			ast_moutdwm(ast, 0x1E6E207C, 0x00800000);
+			mdelay(100);
+			ast_moutdwm(ast, 0x1E6E2070, 0x00800000);
+		}
+		/* Modify eSPI reset pin */
+		temp = ast_mindwm(ast, 0x1E6E2070);
+		if (temp & 0x02000000)
+			ast_moutdwm(ast, 0x1E6E207C, 0x00004000);
+
+		/* Slow down CPU/AHB CLK in VGA only mode */
+		temp = ast_read32(ast, 0x12008);
+		temp |= 0x73;
+		ast_write32(ast, 0x12008, temp);
+
+		if (!ast_dram_init_2500(ast))
+			drm_err(dev, "DRAM init failed !\n");
+
+		temp = ast_mindwm(ast, 0x1e6e2040);
+		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
+	}
+
+	/* wait ready */
+	do {
+		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	} while ((reg & 0x40) == 0);
+}
+
+int ast_2500_post(struct ast_device *ast)
+{
+	if (ast->config_mode == ast_use_p2a) {
+		ast_post_chip_2500(ast);
+	} else {
+		if (ast->tx_chip == AST_TX_SIL164) {
+			/* Enable DVO */
+			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
index 1e9ac9d6d26c..45bd1afab0d5 100644
--- a/drivers/gpu/drm/ast/ast_dram_tables.h
+++ b/drivers/gpu/drm/ast/ast_dram_tables.h
@@ -142,66 +142,4 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
 	{ 0xffff, 0xffffffff },
 };
 
-/*
- * AST2500 DRAM settings modules
- */
-#define REGTBL_NUM           17
-#define REGIDX_010           0
-#define REGIDX_014           1
-#define REGIDX_018           2
-#define REGIDX_020           3
-#define REGIDX_024           4
-#define REGIDX_02C           5
-#define REGIDX_030           6
-#define REGIDX_214           7
-#define REGIDX_2E0           8
-#define REGIDX_2E4           9
-#define REGIDX_2E8           10
-#define REGIDX_2EC           11
-#define REGIDX_2F0           12
-#define REGIDX_2F4           13
-#define REGIDX_2F8           14
-#define REGIDX_RFC           15
-#define REGIDX_PLL           16
-
-static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
-	0x64604D38,		     /* 0x010 */
-	0x29690599,		     /* 0x014 */
-	0x00000300,		     /* 0x018 */
-	0x00000000,		     /* 0x020 */
-	0x00000000,		     /* 0x024 */
-	0x02181E70,		     /* 0x02C */
-	0x00000040,		     /* 0x030 */
-	0x00000024,		     /* 0x214 */
-	0x02001300,		     /* 0x2E0 */
-	0x0E0000A0,		     /* 0x2E4 */
-	0x000E001B,		     /* 0x2E8 */
-	0x35B8C105,		     /* 0x2EC */
-	0x08090408,		     /* 0x2F0 */
-	0x9B000800,		     /* 0x2F4 */
-	0x0E400A00,		     /* 0x2F8 */
-	0x9971452F,		     /* tRFC  */
-	0x000071C1		     /* PLL   */
-};
-
-static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
-	0x63604E37,		     /* 0x010 */
-	0xE97AFA99,		     /* 0x014 */
-	0x00019000,		     /* 0x018 */
-	0x08000000,		     /* 0x020 */
-	0x00000400,		     /* 0x024 */
-	0x00000410,		     /* 0x02C */
-	0x00000101,		     /* 0x030 */
-	0x00000024,		     /* 0x214 */
-	0x03002900,		     /* 0x2E0 */
-	0x0E0000A0,		     /* 0x2E4 */
-	0x000E001C,		     /* 0x2E8 */
-	0x35B8C106,		     /* 0x2EC */
-	0x08080607,		     /* 0x2F0 */
-	0x9B000900,		     /* 0x2F4 */
-	0x0E400A00,		     /* 0x2F8 */
-	0x99714545,		     /* tRFC  */
-	0x000071C1		     /* PLL   */
-};
-
 #endif
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index 054acda41909..356b3b7e52d2 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -171,7 +171,7 @@ static int ast_detect_chip(struct pci_dev *pdev,
 			/* Patch AST2500/AST2510 */
 			if ((pdev->revision & 0xf0) == 0x40) {
 				if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK))
-					ast_patch_ahb_2500(regs);
+					ast_2500_patch_ahb(regs);
 			}
 
 			/* Double check that it's actually working */
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 570c2fe98b58..4a92c377e9bd 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -417,6 +417,10 @@ struct ast_crtc_state {
 
 int ast_mm_init(struct ast_device *ast);
 
+/* ast_2500.c */
+void ast_2500_patch_ahb(void __iomem *regs);
+int ast_2500_post(struct ast_device *ast);
+
 /* ast_2600.c */
 int ast_2600_post(struct ast_device *ast);
 
@@ -424,7 +428,6 @@ int ast_2600_post(struct ast_device *ast);
 int ast_post_gpu(struct ast_device *ast);
 u32 ast_mindwm(struct ast_device *ast, u32 r);
 void ast_moutdwm(struct ast_device *ast, u32 r, u32 v);
-void ast_patch_ahb_2500(void __iomem *regs);
 
 int ast_vga_output_init(struct ast_device *ast);
 int ast_sil164_output_init(struct ast_device *ast);
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 03a7367bdc71..0d99270b58c4 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -36,7 +36,6 @@
 #include "ast_post.h"
 
 static void ast_post_chip_2300(struct ast_device *ast);
-static void ast_post_chip_2500(struct ast_device *ast);
 
 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
 static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
@@ -352,14 +351,9 @@ int ast_post_gpu(struct ast_device *ast)
 		if (ret)
 			return ret;
 	} else if (AST_GEN(ast) >= 6) {
-		if (ast->config_mode == ast_use_p2a) {
-			ast_post_chip_2500(ast);
-		} else {
-			if (ast->tx_chip == AST_TX_SIL164) {
-				/* Enable DVO */
-				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
-			}
-		}
+		ret = ast_2500_post(ast);
+		if (ret)
+			return ret;
 	} else if (AST_GEN(ast) >= 4) {
 		if (ast->config_mode == ast_use_p2a) {
 			ast_post_chip_2300(ast);
@@ -497,11 +491,6 @@ static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
 	return mmc_test2(ast, datagen, 0x05);
 }
 
-static bool mmc_test_single_2500(struct ast_device *ast, u32 datagen)
-{
-	return mmc_test(ast, datagen, 0x85);
-}
-
 static int cbr_test(struct ast_device *ast)
 {
 	u32 data;
@@ -1666,447 +1655,3 @@ static void ast_post_chip_2300(struct ast_device *ast)
 		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
 	} while ((reg & 0x40) == 0);
 }
-
-static bool cbr_test_2500(struct ast_device *ast)
-{
-	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
-	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
-	if (!mmc_test_burst(ast, 0))
-		return false;
-	if (!mmc_test_single_2500(ast, 0))
-		return false;
-	return true;
-}
-
-static bool ddr_test_2500(struct ast_device *ast)
-{
-	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
-	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
-	if (!mmc_test_burst(ast, 0))
-		return false;
-	if (!mmc_test_burst(ast, 1))
-		return false;
-	if (!mmc_test_burst(ast, 2))
-		return false;
-	if (!mmc_test_burst(ast, 3))
-		return false;
-	if (!mmc_test_single_2500(ast, 0))
-		return false;
-	return true;
-}
-
-static void ddr_init_common_2500(struct ast_device *ast)
-{
-	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
-	ast_moutdwm(ast, 0x1E6E0008, 0x2003000F);
-	ast_moutdwm(ast, 0x1E6E0038, 0x00000FFF);
-	ast_moutdwm(ast, 0x1E6E0040, 0x88448844);
-	ast_moutdwm(ast, 0x1E6E0044, 0x24422288);
-	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
-	ast_moutdwm(ast, 0x1E6E004C, 0x22222222);
-	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E0208, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0218, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0220, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0228, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0230, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E02A8, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E02B0, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0240, 0x86000000);
-	ast_moutdwm(ast, 0x1E6E0244, 0x00008600);
-	ast_moutdwm(ast, 0x1E6E0248, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E024C, 0x80808080);
-}
-
-static void ddr_phy_init_2500(struct ast_device *ast)
-{
-	u32 data, pass, timecnt;
-
-	pass = 0;
-	ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
-	while (!pass) {
-		for (timecnt = 0; timecnt < TIMEOUT; timecnt++) {
-			data = ast_mindwm(ast, 0x1E6E0060) & 0x1;
-			if (!data)
-				break;
-		}
-		if (timecnt != TIMEOUT) {
-			data = ast_mindwm(ast, 0x1E6E0300) & 0x000A0000;
-			if (!data)
-				pass = 1;
-		}
-		if (!pass) {
-			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
-			udelay(10); /* delay 10 us */
-			ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
-		}
-	}
-
-	ast_moutdwm(ast, 0x1E6E0060, 0x00000006);
-}
-
-/*
- * Check DRAM Size
- * 1Gb : 0x80000000 ~ 0x87FFFFFF
- * 2Gb : 0x80000000 ~ 0x8FFFFFFF
- * 4Gb : 0x80000000 ~ 0x9FFFFFFF
- * 8Gb : 0x80000000 ~ 0xBFFFFFFF
- */
-static void check_dram_size_2500(struct ast_device *ast, u32 tRFC)
-{
-	u32 reg_04, reg_14;
-
-	reg_04 = ast_mindwm(ast, 0x1E6E0004) & 0xfffffffc;
-	reg_14 = ast_mindwm(ast, 0x1E6E0014) & 0xffffff00;
-
-	ast_moutdwm(ast, 0xA0100000, 0x41424344);
-	ast_moutdwm(ast, 0x90100000, 0x35363738);
-	ast_moutdwm(ast, 0x88100000, 0x292A2B2C);
-	ast_moutdwm(ast, 0x80100000, 0x1D1E1F10);
-
-	/* Check 8Gbit */
-	if (ast_mindwm(ast, 0xA0100000) == 0x41424344) {
-		reg_04 |= 0x03;
-		reg_14 |= (tRFC >> 24) & 0xFF;
-		/* Check 4Gbit */
-	} else if (ast_mindwm(ast, 0x90100000) == 0x35363738) {
-		reg_04 |= 0x02;
-		reg_14 |= (tRFC >> 16) & 0xFF;
-		/* Check 2Gbit */
-	} else if (ast_mindwm(ast, 0x88100000) == 0x292A2B2C) {
-		reg_04 |= 0x01;
-		reg_14 |= (tRFC >> 8) & 0xFF;
-	} else {
-		reg_14 |= tRFC & 0xFF;
-	}
-	ast_moutdwm(ast, 0x1E6E0004, reg_04);
-	ast_moutdwm(ast, 0x1E6E0014, reg_14);
-}
-
-static void enable_cache_2500(struct ast_device *ast)
-{
-	u32 reg_04, data;
-
-	reg_04 = ast_mindwm(ast, 0x1E6E0004);
-	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x1000);
-
-	do
-		data = ast_mindwm(ast, 0x1E6E0004);
-	while (!(data & 0x80000));
-	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x400);
-}
-
-static void set_mpll_2500(struct ast_device *ast)
-{
-	u32 addr, data, param;
-
-	/* Reset MMC */
-	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
-	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
-	for (addr = 0x1e6e0004; addr < 0x1e6e0090;) {
-		ast_moutdwm(ast, addr, 0x0);
-		addr += 4;
-	}
-	ast_moutdwm(ast, 0x1E6E0034, 0x00020000);
-
-	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
-	data = ast_mindwm(ast, 0x1E6E2070) & 0x00800000;
-	if (data) {
-		/* CLKIN = 25MHz */
-		param = 0x930023E0;
-		ast_moutdwm(ast, 0x1E6E2160, 0x00011320);
-	} else {
-		/* CLKIN = 24MHz */
-		param = 0x93002400;
-	}
-	ast_moutdwm(ast, 0x1E6E2020, param);
-	udelay(100);
-}
-
-static void reset_mmc_2500(struct ast_device *ast)
-{
-	ast_moutdwm(ast, 0x1E78505C, 0x00000004);
-	ast_moutdwm(ast, 0x1E785044, 0x00000001);
-	ast_moutdwm(ast, 0x1E785048, 0x00004755);
-	ast_moutdwm(ast, 0x1E78504C, 0x00000013);
-	mdelay(100);
-	ast_moutdwm(ast, 0x1E785054, 0x00000077);
-	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
-}
-
-static void ddr3_init_2500(struct ast_device *ast, const u32 *ddr_table)
-{
-
-	ast_moutdwm(ast, 0x1E6E0004, 0x00000303);
-	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
-	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
-	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
-	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
-	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
-	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
-	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
-
-	/* DDR PHY Setting */
-	ast_moutdwm(ast, 0x1E6E0200, 0x02492AAE);
-	ast_moutdwm(ast, 0x1E6E0204, 0x00001001);
-	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
-	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
-	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
-	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
-	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
-	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
-	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
-	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
-	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
-	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
-	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
-	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006);
-
-	/* Controller Setting */
-	ast_moutdwm(ast, 0x1E6E0034, 0x00020091);
-
-	/* Wait DDR PHY init done */
-	ddr_phy_init_2500(ast);
-
-	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
-	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
-	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
-
-	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
-	enable_cache_2500(ast);
-	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
-	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
-}
-
-static void ddr4_init_2500(struct ast_device *ast, const u32 *ddr_table)
-{
-	u32 data, data2, pass, retrycnt;
-	u32 ddr_vref, phy_vref;
-	u32 min_ddr_vref = 0, min_phy_vref = 0;
-	u32 max_ddr_vref = 0, max_phy_vref = 0;
-
-	ast_moutdwm(ast, 0x1E6E0004, 0x00000313);
-	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
-	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
-	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
-	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
-	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
-	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
-	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
-
-	/* DDR PHY Setting */
-	ast_moutdwm(ast, 0x1E6E0200, 0x42492AAE);
-	ast_moutdwm(ast, 0x1E6E0204, 0x09002000);
-	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
-	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
-	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
-	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
-	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
-	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
-	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
-	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
-	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
-	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
-	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
-	ast_moutdwm(ast, 0x1E6E02C4, 0x3C183C3C);
-	ast_moutdwm(ast, 0x1E6E02C8, 0x00631E0E);
-
-	/* Controller Setting */
-	ast_moutdwm(ast, 0x1E6E0034, 0x0001A991);
-
-	/* Train PHY Vref first */
-	pass = 0;
-
-	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
-		max_phy_vref = 0x0;
-		pass = 0;
-		ast_moutdwm(ast, 0x1E6E02C0, 0x00001C06);
-		for (phy_vref = 0x40; phy_vref < 0x80; phy_vref++) {
-			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
-			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
-			ast_moutdwm(ast, 0x1E6E02CC, phy_vref | (phy_vref << 8));
-			/* Fire DFI Init */
-			ddr_phy_init_2500(ast);
-			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
-			if (cbr_test_2500(ast)) {
-				pass++;
-				data = ast_mindwm(ast, 0x1E6E03D0);
-				data2 = data >> 8;
-				data  = data & 0xff;
-				if (data > data2)
-					data = data2;
-				if (max_phy_vref < data) {
-					max_phy_vref = data;
-					min_phy_vref = phy_vref;
-				}
-			} else if (pass > 0)
-				break;
-		}
-	}
-	ast_moutdwm(ast, 0x1E6E02CC, min_phy_vref | (min_phy_vref << 8));
-
-	/* Train DDR Vref next */
-	pass = 0;
-
-	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
-		min_ddr_vref = 0xFF;
-		max_ddr_vref = 0x0;
-		pass = 0;
-		for (ddr_vref = 0x00; ddr_vref < 0x40; ddr_vref++) {
-			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
-			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
-			ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
-			/* Fire DFI Init */
-			ddr_phy_init_2500(ast);
-			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
-			if (cbr_test_2500(ast)) {
-				pass++;
-				if (min_ddr_vref > ddr_vref)
-					min_ddr_vref = ddr_vref;
-				if (max_ddr_vref < ddr_vref)
-					max_ddr_vref = ddr_vref;
-			} else if (pass != 0)
-				break;
-		}
-	}
-
-	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
-	ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1;
-	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
-
-	/* Wait DDR PHY init done */
-	ddr_phy_init_2500(ast);
-
-	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
-	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
-	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
-
-	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
-	enable_cache_2500(ast);
-	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
-	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
-}
-
-static bool ast_dram_init_2500(struct ast_device *ast)
-{
-	u32 data;
-	u32 max_tries = 5;
-
-	do {
-		if (max_tries-- == 0)
-			return false;
-		set_mpll_2500(ast);
-		reset_mmc_2500(ast);
-		ddr_init_common_2500(ast);
-
-		data = ast_mindwm(ast, 0x1E6E2070);
-		if (data & 0x01000000)
-			ddr4_init_2500(ast, ast2500_ddr4_1600_timing_table);
-		else
-			ddr3_init_2500(ast, ast2500_ddr3_1600_timing_table);
-	} while (!ddr_test_2500(ast));
-
-	ast_moutdwm(ast, 0x1E6E2040, ast_mindwm(ast, 0x1E6E2040) | 0x41);
-
-	/* Patch code */
-	data = ast_mindwm(ast, 0x1E6E200C) & 0xF9FFFFFF;
-	ast_moutdwm(ast, 0x1E6E200C, data | 0x10000000);
-
-	return true;
-}
-
-void ast_patch_ahb_2500(void __iomem *regs)
-{
-	u32 data;
-
-	/* Clear bus lock condition */
-	__ast_moutdwm(regs, 0x1e600000, 0xAEED1A03);
-	__ast_moutdwm(regs, 0x1e600084, 0x00010000);
-	__ast_moutdwm(regs, 0x1e600088, 0x00000000);
-	__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
-
-	data = __ast_mindwm(regs, 0x1e6e2070);
-	if (data & 0x08000000) { /* check fast reset */
-		/*
-		 * If "Fast restet" is enabled for ARM-ICE debugger,
-		 * then WDT needs to enable, that
-		 * WDT04 is WDT#1 Reload reg.
-		 * WDT08 is WDT#1 counter restart reg to avoid system deadlock
-		 * WDT0C is WDT#1 control reg
-		 *	[6:5]:= 01:Full chip
-		 *	[4]:= 1:1MHz clock source
-		 *	[1]:= 1:WDT will be cleeared and disabled after timeout occurs
-		 *	[0]:= 1:WDT enable
-		 */
-		__ast_moutdwm(regs, 0x1E785004, 0x00000010);
-		__ast_moutdwm(regs, 0x1E785008, 0x00004755);
-		__ast_moutdwm(regs, 0x1E78500c, 0x00000033);
-		udelay(1000);
-	}
-
-	do {
-		__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
-		data = __ast_mindwm(regs, 0x1e6e2000);
-	} while (data != 1);
-
-	__ast_moutdwm(regs, 0x1e6e207c, 0x08000000); /* clear fast reset */
-}
-
-void ast_post_chip_2500(struct ast_device *ast)
-{
-	struct drm_device *dev = &ast->base;
-	u32 temp;
-	u8 reg;
-
-	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-	if ((reg & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
-		/* Clear bus lock condition */
-		ast_patch_ahb_2500(ast->regs);
-
-		/* Disable watchdog */
-		ast_moutdwm(ast, 0x1E78502C, 0x00000000);
-		ast_moutdwm(ast, 0x1E78504C, 0x00000000);
-
-		/*
-		 * Reset USB port to patch USB unknown device issue
-		 * SCU90 is Multi-function Pin Control #5
-		 *	[29]:= 1:Enable USB2.0 Host port#1 (that the mutually shared USB2.0 Hub
-		 *				port).
-		 * SCU94 is Multi-function Pin Control #6
-		 *	[14:13]:= 1x:USB2.0 Host2 controller
-		 * SCU70 is Hardware Strap reg
-		 *	[23]:= 1:CLKIN is 25MHz and USBCK1 = 24/48 MHz (determined by
-		 *				[18]: 0(24)/1(48) MHz)
-		 * SCU7C is Write clear reg to SCU70
-		 *	[23]:= write 1 and then SCU70[23] will be clear as 0b.
-		 */
-		ast_moutdwm(ast, 0x1E6E2090, 0x20000000);
-		ast_moutdwm(ast, 0x1E6E2094, 0x00004000);
-		if (ast_mindwm(ast, 0x1E6E2070) & 0x00800000) {
-			ast_moutdwm(ast, 0x1E6E207C, 0x00800000);
-			mdelay(100);
-			ast_moutdwm(ast, 0x1E6E2070, 0x00800000);
-		}
-		/* Modify eSPI reset pin */
-		temp = ast_mindwm(ast, 0x1E6E2070);
-		if (temp & 0x02000000)
-			ast_moutdwm(ast, 0x1E6E207C, 0x00004000);
-
-		/* Slow down CPU/AHB CLK in VGA only mode */
-		temp = ast_read32(ast, 0x12008);
-		temp |= 0x73;
-		ast_write32(ast, 0x12008, temp);
-
-		if (!ast_dram_init_2500(ast))
-			drm_err(dev, "DRAM init failed !\n");
-
-		temp = ast_mindwm(ast, 0x1e6e2040);
-		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
-	}
-
-	/* wait ready */
-	do {
-		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-	} while ((reg & 0x40) == 0);
-}
-- 
2.50.0

Re: [PATCH 03/10] drm/ast: Move Gen6+ POST code to separate source file

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Move POST code for Gen6+ to separate source file and hide it in
> ast_2500_post(). With P2A configuration, it performs a full board
> POST; otherwise it enables the transmitter chip. No changes to the
> overall logic.

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/Makefile          |   1 +
>   drivers/gpu/drm/ast/ast_2500.c        | 567 ++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_dram_tables.h |  62 ---
>   drivers/gpu/drm/ast/ast_drv.c         |   2 +-
>   drivers/gpu/drm/ast/ast_drv.h         |   5 +-
>   drivers/gpu/drm/ast/ast_post.c        | 461 +--------------------
>   6 files changed, 576 insertions(+), 522 deletions(-)
>   create mode 100644 drivers/gpu/drm/ast/ast_2500.c
> 
> diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
> index 0f09e0fa741b..38374720e32e 100644
> --- a/drivers/gpu/drm/ast/Makefile
> +++ b/drivers/gpu/drm/ast/Makefile
> @@ -4,6 +4,7 @@
>   # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>   
>   ast-y := \
> +	ast_2500.o \
>   	ast_2600.o \
>   	ast_cursor.o \
>   	ast_ddc.o \
> diff --git a/drivers/gpu/drm/ast/ast_2500.c b/drivers/gpu/drm/ast/ast_2500.c
> new file mode 100644
> index 000000000000..e5b3e0c63222
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_2500.c
> @@ -0,0 +1,567 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2012 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors: Dave Airlie <airlied@redhat.com>
> + */
> +
> +#include <linux/delay.h>
> +
> +#include <drm/drm_print.h>
> +
> +#include "ast_drv.h"
> +#include "ast_post.h"
> +
> +/*
> + * POST
> + */
> +
> +/*
> + * AST2500 DRAM settings modules
> + */
> +
> +#define REGTBL_NUM           17
> +#define REGIDX_010           0
> +#define REGIDX_014           1
> +#define REGIDX_018           2
> +#define REGIDX_020           3
> +#define REGIDX_024           4
> +#define REGIDX_02C           5
> +#define REGIDX_030           6
> +#define REGIDX_214           7
> +#define REGIDX_2E0           8
> +#define REGIDX_2E4           9
> +#define REGIDX_2E8           10
> +#define REGIDX_2EC           11
> +#define REGIDX_2F0           12
> +#define REGIDX_2F4           13
> +#define REGIDX_2F8           14
> +#define REGIDX_RFC           15
> +#define REGIDX_PLL           16
> +
> +static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
> +	0x64604D38,		     /* 0x010 */
> +	0x29690599,		     /* 0x014 */
> +	0x00000300,		     /* 0x018 */
> +	0x00000000,		     /* 0x020 */
> +	0x00000000,		     /* 0x024 */
> +	0x02181E70,		     /* 0x02C */
> +	0x00000040,		     /* 0x030 */
> +	0x00000024,		     /* 0x214 */
> +	0x02001300,		     /* 0x2E0 */
> +	0x0E0000A0,		     /* 0x2E4 */
> +	0x000E001B,		     /* 0x2E8 */
> +	0x35B8C105,		     /* 0x2EC */
> +	0x08090408,		     /* 0x2F0 */
> +	0x9B000800,		     /* 0x2F4 */
> +	0x0E400A00,		     /* 0x2F8 */
> +	0x9971452F,		     /* tRFC  */
> +	0x000071C1		     /* PLL   */
> +};
> +
> +static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
> +	0x63604E37,		     /* 0x010 */
> +	0xE97AFA99,		     /* 0x014 */
> +	0x00019000,		     /* 0x018 */
> +	0x08000000,		     /* 0x020 */
> +	0x00000400,		     /* 0x024 */
> +	0x00000410,		     /* 0x02C */
> +	0x00000101,		     /* 0x030 */
> +	0x00000024,		     /* 0x214 */
> +	0x03002900,		     /* 0x2E0 */
> +	0x0E0000A0,		     /* 0x2E4 */
> +	0x000E001C,		     /* 0x2E8 */
> +	0x35B8C106,		     /* 0x2EC */
> +	0x08080607,		     /* 0x2F0 */
> +	0x9B000900,		     /* 0x2F4 */
> +	0x0E400A00,		     /* 0x2F8 */
> +	0x99714545,		     /* tRFC  */
> +	0x000071C1		     /* PLL   */
> +};
> +
> +#define TIMEOUT              5000000
> +
> +void ast_2500_patch_ahb(void __iomem *regs)
> +{
> +	u32 data;
> +
> +	/* Clear bus lock condition */
> +	__ast_moutdwm(regs, 0x1e600000, 0xAEED1A03);
> +	__ast_moutdwm(regs, 0x1e600084, 0x00010000);
> +	__ast_moutdwm(regs, 0x1e600088, 0x00000000);
> +	__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
> +
> +	data = __ast_mindwm(regs, 0x1e6e2070);
> +	if (data & 0x08000000) { /* check fast reset */
> +		/*
> +		 * If "Fast restet" is enabled for ARM-ICE debugger,
> +		 * then WDT needs to enable, that
> +		 * WDT04 is WDT#1 Reload reg.
> +		 * WDT08 is WDT#1 counter restart reg to avoid system deadlock
> +		 * WDT0C is WDT#1 control reg
> +		 *	[6:5]:= 01:Full chip
> +		 *	[4]:= 1:1MHz clock source
> +		 *	[1]:= 1:WDT will be cleeared and disabled after timeout occurs
> +		 *	[0]:= 1:WDT enable
> +		 */
> +		__ast_moutdwm(regs, 0x1E785004, 0x00000010);
> +		__ast_moutdwm(regs, 0x1E785008, 0x00004755);
> +		__ast_moutdwm(regs, 0x1E78500c, 0x00000033);
> +		udelay(1000);
> +	}
> +
> +	do {
> +		__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
> +		data = __ast_mindwm(regs, 0x1e6e2000);
> +	} while (data != 1);
> +
> +	__ast_moutdwm(regs, 0x1e6e207c, 0x08000000); /* clear fast reset */
> +}
> +
> +static bool mmc_test_single_2500(struct ast_device *ast, u32 datagen)
> +{
> +	return mmc_test(ast, datagen, 0x85);
> +}
> +
> +static bool cbr_test_2500(struct ast_device *ast)
> +{
> +	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
> +	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
> +	if (!mmc_test_burst(ast, 0))
> +		return false;
> +	if (!mmc_test_single_2500(ast, 0))
> +		return false;
> +	return true;
> +}
> +
> +static bool ddr_test_2500(struct ast_device *ast)
> +{
> +	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
> +	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
> +	if (!mmc_test_burst(ast, 0))
> +		return false;
> +	if (!mmc_test_burst(ast, 1))
> +		return false;
> +	if (!mmc_test_burst(ast, 2))
> +		return false;
> +	if (!mmc_test_burst(ast, 3))
> +		return false;
> +	if (!mmc_test_single_2500(ast, 0))
> +		return false;
> +	return true;
> +}
> +
> +static void ddr_init_common_2500(struct ast_device *ast)
> +{
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
> +	ast_moutdwm(ast, 0x1E6E0008, 0x2003000F);
> +	ast_moutdwm(ast, 0x1E6E0038, 0x00000FFF);
> +	ast_moutdwm(ast, 0x1E6E0040, 0x88448844);
> +	ast_moutdwm(ast, 0x1E6E0044, 0x24422288);
> +	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
> +	ast_moutdwm(ast, 0x1E6E004C, 0x22222222);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E0208, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0218, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0220, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0228, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0230, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E02A8, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E02B0, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0240, 0x86000000);
> +	ast_moutdwm(ast, 0x1E6E0244, 0x00008600);
> +	ast_moutdwm(ast, 0x1E6E0248, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E024C, 0x80808080);
> +}
> +
> +static void ddr_phy_init_2500(struct ast_device *ast)
> +{
> +	u32 data, pass, timecnt;
> +
> +	pass = 0;
> +	ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
> +	while (!pass) {
> +		for (timecnt = 0; timecnt < TIMEOUT; timecnt++) {
> +			data = ast_mindwm(ast, 0x1E6E0060) & 0x1;
> +			if (!data)
> +				break;
> +		}
> +		if (timecnt != TIMEOUT) {
> +			data = ast_mindwm(ast, 0x1E6E0300) & 0x000A0000;
> +			if (!data)
> +				pass = 1;
> +		}
> +		if (!pass) {
> +			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> +			udelay(10); /* delay 10 us */
> +			ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
> +		}
> +	}
> +
> +	ast_moutdwm(ast, 0x1E6E0060, 0x00000006);
> +}
> +
> +/*
> + * Check DRAM Size
> + * 1Gb : 0x80000000 ~ 0x87FFFFFF
> + * 2Gb : 0x80000000 ~ 0x8FFFFFFF
> + * 4Gb : 0x80000000 ~ 0x9FFFFFFF
> + * 8Gb : 0x80000000 ~ 0xBFFFFFFF
> + */
> +static void check_dram_size_2500(struct ast_device *ast, u32 tRFC)
> +{
> +	u32 reg_04, reg_14;
> +
> +	reg_04 = ast_mindwm(ast, 0x1E6E0004) & 0xfffffffc;
> +	reg_14 = ast_mindwm(ast, 0x1E6E0014) & 0xffffff00;
> +
> +	ast_moutdwm(ast, 0xA0100000, 0x41424344);
> +	ast_moutdwm(ast, 0x90100000, 0x35363738);
> +	ast_moutdwm(ast, 0x88100000, 0x292A2B2C);
> +	ast_moutdwm(ast, 0x80100000, 0x1D1E1F10);
> +
> +	/* Check 8Gbit */
> +	if (ast_mindwm(ast, 0xA0100000) == 0x41424344) {
> +		reg_04 |= 0x03;
> +		reg_14 |= (tRFC >> 24) & 0xFF;
> +		/* Check 4Gbit */
> +	} else if (ast_mindwm(ast, 0x90100000) == 0x35363738) {
> +		reg_04 |= 0x02;
> +		reg_14 |= (tRFC >> 16) & 0xFF;
> +		/* Check 2Gbit */
> +	} else if (ast_mindwm(ast, 0x88100000) == 0x292A2B2C) {
> +		reg_04 |= 0x01;
> +		reg_14 |= (tRFC >> 8) & 0xFF;
> +	} else {
> +		reg_14 |= tRFC & 0xFF;
> +	}
> +	ast_moutdwm(ast, 0x1E6E0004, reg_04);
> +	ast_moutdwm(ast, 0x1E6E0014, reg_14);
> +}
> +
> +static void enable_cache_2500(struct ast_device *ast)
> +{
> +	u32 reg_04, data;
> +
> +	reg_04 = ast_mindwm(ast, 0x1E6E0004);
> +	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x1000);
> +
> +	do
> +		data = ast_mindwm(ast, 0x1E6E0004);
> +	while (!(data & 0x80000));
> +	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x400);
> +}
> +
> +static void set_mpll_2500(struct ast_device *ast)
> +{
> +	u32 addr, data, param;
> +
> +	/* Reset MMC */
> +	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
> +	for (addr = 0x1e6e0004; addr < 0x1e6e0090;) {
> +		ast_moutdwm(ast, addr, 0x0);
> +		addr += 4;
> +	}
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00020000);
> +
> +	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> +	data = ast_mindwm(ast, 0x1E6E2070) & 0x00800000;
> +	if (data) {
> +		/* CLKIN = 25MHz */
> +		param = 0x930023E0;
> +		ast_moutdwm(ast, 0x1E6E2160, 0x00011320);
> +	} else {
> +		/* CLKIN = 24MHz */
> +		param = 0x93002400;
> +	}
> +	ast_moutdwm(ast, 0x1E6E2020, param);
> +	udelay(100);
> +}
> +
> +static void reset_mmc_2500(struct ast_device *ast)
> +{
> +	ast_moutdwm(ast, 0x1E78505C, 0x00000004);
> +	ast_moutdwm(ast, 0x1E785044, 0x00000001);
> +	ast_moutdwm(ast, 0x1E785048, 0x00004755);
> +	ast_moutdwm(ast, 0x1E78504C, 0x00000013);
> +	mdelay(100);
> +	ast_moutdwm(ast, 0x1E785054, 0x00000077);
> +	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> +}
> +
> +static void ddr3_init_2500(struct ast_device *ast, const u32 *ddr_table)
> +{
> +	ast_moutdwm(ast, 0x1E6E0004, 0x00000303);
> +	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
> +	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
> +	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
> +	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
> +	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
> +	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
> +	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
> +
> +	/* DDR PHY Setting */
> +	ast_moutdwm(ast, 0x1E6E0200, 0x02492AAE);
> +	ast_moutdwm(ast, 0x1E6E0204, 0x00001001);
> +	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
> +	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
> +	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
> +	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
> +	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
> +	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
> +	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
> +	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
> +	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
> +	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
> +	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
> +	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006);
> +
> +	/* Controller Setting */
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00020091);
> +
> +	/* Wait DDR PHY init done */
> +	ddr_phy_init_2500(ast);
> +
> +	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
> +	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
> +	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
> +
> +	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
> +	enable_cache_2500(ast);
> +	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
> +	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
> +}
> +
> +static void ddr4_init_2500(struct ast_device *ast, const u32 *ddr_table)
> +{
> +	u32 data, data2, pass, retrycnt;
> +	u32 ddr_vref, phy_vref;
> +	u32 min_ddr_vref = 0, min_phy_vref = 0;
> +	u32 max_ddr_vref = 0, max_phy_vref = 0;
> +
> +	ast_moutdwm(ast, 0x1E6E0004, 0x00000313);
> +	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
> +	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
> +	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
> +	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
> +	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
> +	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
> +	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
> +
> +	/* DDR PHY Setting */
> +	ast_moutdwm(ast, 0x1E6E0200, 0x42492AAE);
> +	ast_moutdwm(ast, 0x1E6E0204, 0x09002000);
> +	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
> +	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
> +	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
> +	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
> +	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
> +	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
> +	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
> +	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
> +	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
> +	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
> +	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
> +	ast_moutdwm(ast, 0x1E6E02C4, 0x3C183C3C);
> +	ast_moutdwm(ast, 0x1E6E02C8, 0x00631E0E);
> +
> +	/* Controller Setting */
> +	ast_moutdwm(ast, 0x1E6E0034, 0x0001A991);
> +
> +	/* Train PHY Vref first */
> +	pass = 0;
> +
> +	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
> +		max_phy_vref = 0x0;
> +		pass = 0;
> +		ast_moutdwm(ast, 0x1E6E02C0, 0x00001C06);
> +		for (phy_vref = 0x40; phy_vref < 0x80; phy_vref++) {
> +			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> +			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> +			ast_moutdwm(ast, 0x1E6E02CC, phy_vref | (phy_vref << 8));
> +			/* Fire DFI Init */
> +			ddr_phy_init_2500(ast);
> +			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> +			if (cbr_test_2500(ast)) {
> +				pass++;
> +				data = ast_mindwm(ast, 0x1E6E03D0);
> +				data2 = data >> 8;
> +				data  = data & 0xff;
> +				if (data > data2)
> +					data = data2;
> +				if (max_phy_vref < data) {
> +					max_phy_vref = data;
> +					min_phy_vref = phy_vref;
> +				}
> +			} else if (pass > 0) {
> +				break;
> +			}
> +		}
> +	}
> +	ast_moutdwm(ast, 0x1E6E02CC, min_phy_vref | (min_phy_vref << 8));
> +
> +	/* Train DDR Vref next */
> +	pass = 0;
> +
> +	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
> +		min_ddr_vref = 0xFF;
> +		max_ddr_vref = 0x0;
> +		pass = 0;
> +		for (ddr_vref = 0x00; ddr_vref < 0x40; ddr_vref++) {
> +			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> +			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> +			ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
> +			/* Fire DFI Init */
> +			ddr_phy_init_2500(ast);
> +			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> +			if (cbr_test_2500(ast)) {
> +				pass++;
> +				if (min_ddr_vref > ddr_vref)
> +					min_ddr_vref = ddr_vref;
> +				if (max_ddr_vref < ddr_vref)
> +					max_ddr_vref = ddr_vref;
> +			} else if (pass != 0) {
> +				break;
> +			}
> +		}
> +	}
> +
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> +	ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1;
> +	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
> +
> +	/* Wait DDR PHY init done */
> +	ddr_phy_init_2500(ast);
> +
> +	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
> +	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
> +	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
> +
> +	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
> +	enable_cache_2500(ast);
> +	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
> +	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
> +}
> +
> +static bool ast_dram_init_2500(struct ast_device *ast)
> +{
> +	u32 data;
> +	u32 max_tries = 5;
> +
> +	do {
> +		if (max_tries-- == 0)
> +			return false;
> +		set_mpll_2500(ast);
> +		reset_mmc_2500(ast);
> +		ddr_init_common_2500(ast);
> +
> +		data = ast_mindwm(ast, 0x1E6E2070);
> +		if (data & 0x01000000)
> +			ddr4_init_2500(ast, ast2500_ddr4_1600_timing_table);
> +		else
> +			ddr3_init_2500(ast, ast2500_ddr3_1600_timing_table);
> +	} while (!ddr_test_2500(ast));
> +
> +	ast_moutdwm(ast, 0x1E6E2040, ast_mindwm(ast, 0x1E6E2040) | 0x41);
> +
> +	/* Patch code */
> +	data = ast_mindwm(ast, 0x1E6E200C) & 0xF9FFFFFF;
> +	ast_moutdwm(ast, 0x1E6E200C, data | 0x10000000);
> +
> +	return true;
> +}
> +
> +static void ast_post_chip_2500(struct ast_device *ast)
> +{
> +	struct drm_device *dev = &ast->base;
> +	u32 temp;
> +	u8 reg;
> +
> +	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	if ((reg & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
> +		/* Clear bus lock condition */
> +		ast_2500_patch_ahb(ast->regs);
> +
> +		/* Disable watchdog */
> +		ast_moutdwm(ast, 0x1E78502C, 0x00000000);
> +		ast_moutdwm(ast, 0x1E78504C, 0x00000000);
> +
> +		/*
> +		 * Reset USB port to patch USB unknown device issue
> +		 * SCU90 is Multi-function Pin Control #5
> +		 *	[29]:= 1:Enable USB2.0 Host port#1 (that the mutually shared USB2.0 Hub
> +		 *				port).
> +		 * SCU94 is Multi-function Pin Control #6
> +		 *	[14:13]:= 1x:USB2.0 Host2 controller
> +		 * SCU70 is Hardware Strap reg
> +		 *	[23]:= 1:CLKIN is 25MHz and USBCK1 = 24/48 MHz (determined by
> +		 *				[18]: 0(24)/1(48) MHz)
> +		 * SCU7C is Write clear reg to SCU70
> +		 *	[23]:= write 1 and then SCU70[23] will be clear as 0b.
> +		 */
> +		ast_moutdwm(ast, 0x1E6E2090, 0x20000000);
> +		ast_moutdwm(ast, 0x1E6E2094, 0x00004000);
> +		if (ast_mindwm(ast, 0x1E6E2070) & 0x00800000) {
> +			ast_moutdwm(ast, 0x1E6E207C, 0x00800000);
> +			mdelay(100);
> +			ast_moutdwm(ast, 0x1E6E2070, 0x00800000);
> +		}
> +		/* Modify eSPI reset pin */
> +		temp = ast_mindwm(ast, 0x1E6E2070);
> +		if (temp & 0x02000000)
> +			ast_moutdwm(ast, 0x1E6E207C, 0x00004000);
> +
> +		/* Slow down CPU/AHB CLK in VGA only mode */
> +		temp = ast_read32(ast, 0x12008);
> +		temp |= 0x73;
> +		ast_write32(ast, 0x12008, temp);
> +
> +		if (!ast_dram_init_2500(ast))
> +			drm_err(dev, "DRAM init failed !\n");
> +
> +		temp = ast_mindwm(ast, 0x1e6e2040);
> +		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
> +	}
> +
> +	/* wait ready */
> +	do {
> +		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	} while ((reg & 0x40) == 0);
> +}
> +
> +int ast_2500_post(struct ast_device *ast)
> +{
> +	if (ast->config_mode == ast_use_p2a) {
> +		ast_post_chip_2500(ast);
> +	} else {
> +		if (ast->tx_chip == AST_TX_SIL164) {
> +			/* Enable DVO */
> +			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> +		}
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
> index 1e9ac9d6d26c..45bd1afab0d5 100644
> --- a/drivers/gpu/drm/ast/ast_dram_tables.h
> +++ b/drivers/gpu/drm/ast/ast_dram_tables.h
> @@ -142,66 +142,4 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
>   	{ 0xffff, 0xffffffff },
>   };
>   
> -/*
> - * AST2500 DRAM settings modules
> - */
> -#define REGTBL_NUM           17
> -#define REGIDX_010           0
> -#define REGIDX_014           1
> -#define REGIDX_018           2
> -#define REGIDX_020           3
> -#define REGIDX_024           4
> -#define REGIDX_02C           5
> -#define REGIDX_030           6
> -#define REGIDX_214           7
> -#define REGIDX_2E0           8
> -#define REGIDX_2E4           9
> -#define REGIDX_2E8           10
> -#define REGIDX_2EC           11
> -#define REGIDX_2F0           12
> -#define REGIDX_2F4           13
> -#define REGIDX_2F8           14
> -#define REGIDX_RFC           15
> -#define REGIDX_PLL           16
> -
> -static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
> -	0x64604D38,		     /* 0x010 */
> -	0x29690599,		     /* 0x014 */
> -	0x00000300,		     /* 0x018 */
> -	0x00000000,		     /* 0x020 */
> -	0x00000000,		     /* 0x024 */
> -	0x02181E70,		     /* 0x02C */
> -	0x00000040,		     /* 0x030 */
> -	0x00000024,		     /* 0x214 */
> -	0x02001300,		     /* 0x2E0 */
> -	0x0E0000A0,		     /* 0x2E4 */
> -	0x000E001B,		     /* 0x2E8 */
> -	0x35B8C105,		     /* 0x2EC */
> -	0x08090408,		     /* 0x2F0 */
> -	0x9B000800,		     /* 0x2F4 */
> -	0x0E400A00,		     /* 0x2F8 */
> -	0x9971452F,		     /* tRFC  */
> -	0x000071C1		     /* PLL   */
> -};
> -
> -static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
> -	0x63604E37,		     /* 0x010 */
> -	0xE97AFA99,		     /* 0x014 */
> -	0x00019000,		     /* 0x018 */
> -	0x08000000,		     /* 0x020 */
> -	0x00000400,		     /* 0x024 */
> -	0x00000410,		     /* 0x02C */
> -	0x00000101,		     /* 0x030 */
> -	0x00000024,		     /* 0x214 */
> -	0x03002900,		     /* 0x2E0 */
> -	0x0E0000A0,		     /* 0x2E4 */
> -	0x000E001C,		     /* 0x2E8 */
> -	0x35B8C106,		     /* 0x2EC */
> -	0x08080607,		     /* 0x2F0 */
> -	0x9B000900,		     /* 0x2F4 */
> -	0x0E400A00,		     /* 0x2F8 */
> -	0x99714545,		     /* tRFC  */
> -	0x000071C1		     /* PLL   */
> -};
> -
>   #endif
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 054acda41909..356b3b7e52d2 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -171,7 +171,7 @@ static int ast_detect_chip(struct pci_dev *pdev,
>   			/* Patch AST2500/AST2510 */
>   			if ((pdev->revision & 0xf0) == 0x40) {
>   				if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK))
> -					ast_patch_ahb_2500(regs);
> +					ast_2500_patch_ahb(regs);
>   			}
>   
>   			/* Double check that it's actually working */
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 570c2fe98b58..4a92c377e9bd 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -417,6 +417,10 @@ struct ast_crtc_state {
>   
>   int ast_mm_init(struct ast_device *ast);
>   
> +/* ast_2500.c */
> +void ast_2500_patch_ahb(void __iomem *regs);
> +int ast_2500_post(struct ast_device *ast);
> +
>   /* ast_2600.c */
>   int ast_2600_post(struct ast_device *ast);
>   
> @@ -424,7 +428,6 @@ int ast_2600_post(struct ast_device *ast);
>   int ast_post_gpu(struct ast_device *ast);
>   u32 ast_mindwm(struct ast_device *ast, u32 r);
>   void ast_moutdwm(struct ast_device *ast, u32 r, u32 v);
> -void ast_patch_ahb_2500(void __iomem *regs);
>   
>   int ast_vga_output_init(struct ast_device *ast);
>   int ast_sil164_output_init(struct ast_device *ast);
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 03a7367bdc71..0d99270b58c4 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -36,7 +36,6 @@
>   #include "ast_post.h"
>   
>   static void ast_post_chip_2300(struct ast_device *ast);
> -static void ast_post_chip_2500(struct ast_device *ast);
>   
>   static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
>   static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
> @@ -352,14 +351,9 @@ int ast_post_gpu(struct ast_device *ast)
>   		if (ret)
>   			return ret;
>   	} else if (AST_GEN(ast) >= 6) {
> -		if (ast->config_mode == ast_use_p2a) {
> -			ast_post_chip_2500(ast);
> -		} else {
> -			if (ast->tx_chip == AST_TX_SIL164) {
> -				/* Enable DVO */
> -				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> -			}
> -		}
> +		ret = ast_2500_post(ast);
> +		if (ret)
> +			return ret;
>   	} else if (AST_GEN(ast) >= 4) {
>   		if (ast->config_mode == ast_use_p2a) {
>   			ast_post_chip_2300(ast);
> @@ -497,11 +491,6 @@ static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
>   	return mmc_test2(ast, datagen, 0x05);
>   }
>   
> -static bool mmc_test_single_2500(struct ast_device *ast, u32 datagen)
> -{
> -	return mmc_test(ast, datagen, 0x85);
> -}
> -
>   static int cbr_test(struct ast_device *ast)
>   {
>   	u32 data;
> @@ -1666,447 +1655,3 @@ static void ast_post_chip_2300(struct ast_device *ast)
>   		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
>   	} while ((reg & 0x40) == 0);
>   }
> -
> -static bool cbr_test_2500(struct ast_device *ast)
> -{
> -	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
> -	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
> -	if (!mmc_test_burst(ast, 0))
> -		return false;
> -	if (!mmc_test_single_2500(ast, 0))
> -		return false;
> -	return true;
> -}
> -
> -static bool ddr_test_2500(struct ast_device *ast)
> -{
> -	ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
> -	ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
> -	if (!mmc_test_burst(ast, 0))
> -		return false;
> -	if (!mmc_test_burst(ast, 1))
> -		return false;
> -	if (!mmc_test_burst(ast, 2))
> -		return false;
> -	if (!mmc_test_burst(ast, 3))
> -		return false;
> -	if (!mmc_test_single_2500(ast, 0))
> -		return false;
> -	return true;
> -}
> -
> -static void ddr_init_common_2500(struct ast_device *ast)
> -{
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
> -	ast_moutdwm(ast, 0x1E6E0008, 0x2003000F);
> -	ast_moutdwm(ast, 0x1E6E0038, 0x00000FFF);
> -	ast_moutdwm(ast, 0x1E6E0040, 0x88448844);
> -	ast_moutdwm(ast, 0x1E6E0044, 0x24422288);
> -	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
> -	ast_moutdwm(ast, 0x1E6E004C, 0x22222222);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E0208, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0218, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0220, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0228, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0230, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E02A8, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E02B0, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0240, 0x86000000);
> -	ast_moutdwm(ast, 0x1E6E0244, 0x00008600);
> -	ast_moutdwm(ast, 0x1E6E0248, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E024C, 0x80808080);
> -}
> -
> -static void ddr_phy_init_2500(struct ast_device *ast)
> -{
> -	u32 data, pass, timecnt;
> -
> -	pass = 0;
> -	ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
> -	while (!pass) {
> -		for (timecnt = 0; timecnt < TIMEOUT; timecnt++) {
> -			data = ast_mindwm(ast, 0x1E6E0060) & 0x1;
> -			if (!data)
> -				break;
> -		}
> -		if (timecnt != TIMEOUT) {
> -			data = ast_mindwm(ast, 0x1E6E0300) & 0x000A0000;
> -			if (!data)
> -				pass = 1;
> -		}
> -		if (!pass) {
> -			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> -			udelay(10); /* delay 10 us */
> -			ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
> -		}
> -	}
> -
> -	ast_moutdwm(ast, 0x1E6E0060, 0x00000006);
> -}
> -
> -/*
> - * Check DRAM Size
> - * 1Gb : 0x80000000 ~ 0x87FFFFFF
> - * 2Gb : 0x80000000 ~ 0x8FFFFFFF
> - * 4Gb : 0x80000000 ~ 0x9FFFFFFF
> - * 8Gb : 0x80000000 ~ 0xBFFFFFFF
> - */
> -static void check_dram_size_2500(struct ast_device *ast, u32 tRFC)
> -{
> -	u32 reg_04, reg_14;
> -
> -	reg_04 = ast_mindwm(ast, 0x1E6E0004) & 0xfffffffc;
> -	reg_14 = ast_mindwm(ast, 0x1E6E0014) & 0xffffff00;
> -
> -	ast_moutdwm(ast, 0xA0100000, 0x41424344);
> -	ast_moutdwm(ast, 0x90100000, 0x35363738);
> -	ast_moutdwm(ast, 0x88100000, 0x292A2B2C);
> -	ast_moutdwm(ast, 0x80100000, 0x1D1E1F10);
> -
> -	/* Check 8Gbit */
> -	if (ast_mindwm(ast, 0xA0100000) == 0x41424344) {
> -		reg_04 |= 0x03;
> -		reg_14 |= (tRFC >> 24) & 0xFF;
> -		/* Check 4Gbit */
> -	} else if (ast_mindwm(ast, 0x90100000) == 0x35363738) {
> -		reg_04 |= 0x02;
> -		reg_14 |= (tRFC >> 16) & 0xFF;
> -		/* Check 2Gbit */
> -	} else if (ast_mindwm(ast, 0x88100000) == 0x292A2B2C) {
> -		reg_04 |= 0x01;
> -		reg_14 |= (tRFC >> 8) & 0xFF;
> -	} else {
> -		reg_14 |= tRFC & 0xFF;
> -	}
> -	ast_moutdwm(ast, 0x1E6E0004, reg_04);
> -	ast_moutdwm(ast, 0x1E6E0014, reg_14);
> -}
> -
> -static void enable_cache_2500(struct ast_device *ast)
> -{
> -	u32 reg_04, data;
> -
> -	reg_04 = ast_mindwm(ast, 0x1E6E0004);
> -	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x1000);
> -
> -	do
> -		data = ast_mindwm(ast, 0x1E6E0004);
> -	while (!(data & 0x80000));
> -	ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x400);
> -}
> -
> -static void set_mpll_2500(struct ast_device *ast)
> -{
> -	u32 addr, data, param;
> -
> -	/* Reset MMC */
> -	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
> -	for (addr = 0x1e6e0004; addr < 0x1e6e0090;) {
> -		ast_moutdwm(ast, addr, 0x0);
> -		addr += 4;
> -	}
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00020000);
> -
> -	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> -	data = ast_mindwm(ast, 0x1E6E2070) & 0x00800000;
> -	if (data) {
> -		/* CLKIN = 25MHz */
> -		param = 0x930023E0;
> -		ast_moutdwm(ast, 0x1E6E2160, 0x00011320);
> -	} else {
> -		/* CLKIN = 24MHz */
> -		param = 0x93002400;
> -	}
> -	ast_moutdwm(ast, 0x1E6E2020, param);
> -	udelay(100);
> -}
> -
> -static void reset_mmc_2500(struct ast_device *ast)
> -{
> -	ast_moutdwm(ast, 0x1E78505C, 0x00000004);
> -	ast_moutdwm(ast, 0x1E785044, 0x00000001);
> -	ast_moutdwm(ast, 0x1E785048, 0x00004755);
> -	ast_moutdwm(ast, 0x1E78504C, 0x00000013);
> -	mdelay(100);
> -	ast_moutdwm(ast, 0x1E785054, 0x00000077);
> -	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> -}
> -
> -static void ddr3_init_2500(struct ast_device *ast, const u32 *ddr_table)
> -{
> -
> -	ast_moutdwm(ast, 0x1E6E0004, 0x00000303);
> -	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
> -	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
> -	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
> -	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
> -	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
> -	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
> -	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
> -
> -	/* DDR PHY Setting */
> -	ast_moutdwm(ast, 0x1E6E0200, 0x02492AAE);
> -	ast_moutdwm(ast, 0x1E6E0204, 0x00001001);
> -	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
> -	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
> -	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
> -	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
> -	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
> -	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
> -	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
> -	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
> -	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
> -	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
> -	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
> -	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006);
> -
> -	/* Controller Setting */
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00020091);
> -
> -	/* Wait DDR PHY init done */
> -	ddr_phy_init_2500(ast);
> -
> -	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
> -	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
> -	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
> -
> -	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
> -	enable_cache_2500(ast);
> -	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
> -	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
> -}
> -
> -static void ddr4_init_2500(struct ast_device *ast, const u32 *ddr_table)
> -{
> -	u32 data, data2, pass, retrycnt;
> -	u32 ddr_vref, phy_vref;
> -	u32 min_ddr_vref = 0, min_phy_vref = 0;
> -	u32 max_ddr_vref = 0, max_phy_vref = 0;
> -
> -	ast_moutdwm(ast, 0x1E6E0004, 0x00000313);
> -	ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
> -	ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
> -	ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
> -	ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);	     /* MODEREG4/6 */
> -	ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);	     /* MODEREG5 */
> -	ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
> -	ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);	     /* MODEREG1/3 */
> -
> -	/* DDR PHY Setting */
> -	ast_moutdwm(ast, 0x1E6E0200, 0x42492AAE);
> -	ast_moutdwm(ast, 0x1E6E0204, 0x09002000);
> -	ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
> -	ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
> -	ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
> -	ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
> -	ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
> -	ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
> -	ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
> -	ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
> -	ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
> -	ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
> -	ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
> -	ast_moutdwm(ast, 0x1E6E02C4, 0x3C183C3C);
> -	ast_moutdwm(ast, 0x1E6E02C8, 0x00631E0E);
> -
> -	/* Controller Setting */
> -	ast_moutdwm(ast, 0x1E6E0034, 0x0001A991);
> -
> -	/* Train PHY Vref first */
> -	pass = 0;
> -
> -	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
> -		max_phy_vref = 0x0;
> -		pass = 0;
> -		ast_moutdwm(ast, 0x1E6E02C0, 0x00001C06);
> -		for (phy_vref = 0x40; phy_vref < 0x80; phy_vref++) {
> -			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> -			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> -			ast_moutdwm(ast, 0x1E6E02CC, phy_vref | (phy_vref << 8));
> -			/* Fire DFI Init */
> -			ddr_phy_init_2500(ast);
> -			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> -			if (cbr_test_2500(ast)) {
> -				pass++;
> -				data = ast_mindwm(ast, 0x1E6E03D0);
> -				data2 = data >> 8;
> -				data  = data & 0xff;
> -				if (data > data2)
> -					data = data2;
> -				if (max_phy_vref < data) {
> -					max_phy_vref = data;
> -					min_phy_vref = phy_vref;
> -				}
> -			} else if (pass > 0)
> -				break;
> -		}
> -	}
> -	ast_moutdwm(ast, 0x1E6E02CC, min_phy_vref | (min_phy_vref << 8));
> -
> -	/* Train DDR Vref next */
> -	pass = 0;
> -
> -	for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
> -		min_ddr_vref = 0xFF;
> -		max_ddr_vref = 0x0;
> -		pass = 0;
> -		for (ddr_vref = 0x00; ddr_vref < 0x40; ddr_vref++) {
> -			ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> -			ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> -			ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
> -			/* Fire DFI Init */
> -			ddr_phy_init_2500(ast);
> -			ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> -			if (cbr_test_2500(ast)) {
> -				pass++;
> -				if (min_ddr_vref > ddr_vref)
> -					min_ddr_vref = ddr_vref;
> -				if (max_ddr_vref < ddr_vref)
> -					max_ddr_vref = ddr_vref;
> -			} else if (pass != 0)
> -				break;
> -		}
> -	}
> -
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
> -	ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1;
> -	ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
> -
> -	/* Wait DDR PHY init done */
> -	ddr_phy_init_2500(ast);
> -
> -	ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
> -	ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
> -	ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
> -
> -	check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
> -	enable_cache_2500(ast);
> -	ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
> -	ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
> -}
> -
> -static bool ast_dram_init_2500(struct ast_device *ast)
> -{
> -	u32 data;
> -	u32 max_tries = 5;
> -
> -	do {
> -		if (max_tries-- == 0)
> -			return false;
> -		set_mpll_2500(ast);
> -		reset_mmc_2500(ast);
> -		ddr_init_common_2500(ast);
> -
> -		data = ast_mindwm(ast, 0x1E6E2070);
> -		if (data & 0x01000000)
> -			ddr4_init_2500(ast, ast2500_ddr4_1600_timing_table);
> -		else
> -			ddr3_init_2500(ast, ast2500_ddr3_1600_timing_table);
> -	} while (!ddr_test_2500(ast));
> -
> -	ast_moutdwm(ast, 0x1E6E2040, ast_mindwm(ast, 0x1E6E2040) | 0x41);
> -
> -	/* Patch code */
> -	data = ast_mindwm(ast, 0x1E6E200C) & 0xF9FFFFFF;
> -	ast_moutdwm(ast, 0x1E6E200C, data | 0x10000000);
> -
> -	return true;
> -}
> -
> -void ast_patch_ahb_2500(void __iomem *regs)
> -{
> -	u32 data;
> -
> -	/* Clear bus lock condition */
> -	__ast_moutdwm(regs, 0x1e600000, 0xAEED1A03);
> -	__ast_moutdwm(regs, 0x1e600084, 0x00010000);
> -	__ast_moutdwm(regs, 0x1e600088, 0x00000000);
> -	__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
> -
> -	data = __ast_mindwm(regs, 0x1e6e2070);
> -	if (data & 0x08000000) { /* check fast reset */
> -		/*
> -		 * If "Fast restet" is enabled for ARM-ICE debugger,
> -		 * then WDT needs to enable, that
> -		 * WDT04 is WDT#1 Reload reg.
> -		 * WDT08 is WDT#1 counter restart reg to avoid system deadlock
> -		 * WDT0C is WDT#1 control reg
> -		 *	[6:5]:= 01:Full chip
> -		 *	[4]:= 1:1MHz clock source
> -		 *	[1]:= 1:WDT will be cleeared and disabled after timeout occurs
> -		 *	[0]:= 1:WDT enable
> -		 */
> -		__ast_moutdwm(regs, 0x1E785004, 0x00000010);
> -		__ast_moutdwm(regs, 0x1E785008, 0x00004755);
> -		__ast_moutdwm(regs, 0x1E78500c, 0x00000033);
> -		udelay(1000);
> -	}
> -
> -	do {
> -		__ast_moutdwm(regs, 0x1e6e2000, 0x1688A8A8);
> -		data = __ast_mindwm(regs, 0x1e6e2000);
> -	} while (data != 1);
> -
> -	__ast_moutdwm(regs, 0x1e6e207c, 0x08000000); /* clear fast reset */
> -}
> -
> -void ast_post_chip_2500(struct ast_device *ast)
> -{
> -	struct drm_device *dev = &ast->base;
> -	u32 temp;
> -	u8 reg;
> -
> -	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -	if ((reg & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
> -		/* Clear bus lock condition */
> -		ast_patch_ahb_2500(ast->regs);
> -
> -		/* Disable watchdog */
> -		ast_moutdwm(ast, 0x1E78502C, 0x00000000);
> -		ast_moutdwm(ast, 0x1E78504C, 0x00000000);
> -
> -		/*
> -		 * Reset USB port to patch USB unknown device issue
> -		 * SCU90 is Multi-function Pin Control #5
> -		 *	[29]:= 1:Enable USB2.0 Host port#1 (that the mutually shared USB2.0 Hub
> -		 *				port).
> -		 * SCU94 is Multi-function Pin Control #6
> -		 *	[14:13]:= 1x:USB2.0 Host2 controller
> -		 * SCU70 is Hardware Strap reg
> -		 *	[23]:= 1:CLKIN is 25MHz and USBCK1 = 24/48 MHz (determined by
> -		 *				[18]: 0(24)/1(48) MHz)
> -		 * SCU7C is Write clear reg to SCU70
> -		 *	[23]:= write 1 and then SCU70[23] will be clear as 0b.
> -		 */
> -		ast_moutdwm(ast, 0x1E6E2090, 0x20000000);
> -		ast_moutdwm(ast, 0x1E6E2094, 0x00004000);
> -		if (ast_mindwm(ast, 0x1E6E2070) & 0x00800000) {
> -			ast_moutdwm(ast, 0x1E6E207C, 0x00800000);
> -			mdelay(100);
> -			ast_moutdwm(ast, 0x1E6E2070, 0x00800000);
> -		}
> -		/* Modify eSPI reset pin */
> -		temp = ast_mindwm(ast, 0x1E6E2070);
> -		if (temp & 0x02000000)
> -			ast_moutdwm(ast, 0x1E6E207C, 0x00004000);
> -
> -		/* Slow down CPU/AHB CLK in VGA only mode */
> -		temp = ast_read32(ast, 0x12008);
> -		temp |= 0x73;
> -		ast_write32(ast, 0x12008, temp);
> -
> -		if (!ast_dram_init_2500(ast))
> -			drm_err(dev, "DRAM init failed !\n");
> -
> -		temp = ast_mindwm(ast, 0x1e6e2040);
> -		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
> -	}
> -
> -	/* wait ready */
> -	do {
> -		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -	} while ((reg & 0x40) == 0);
> -}

[PATCH 04/10] drm/ast: Move Gen4+ POST code to separate source file

[Thomas Zimmermann]

Move POST code for Gen4+ to separate source file and hide it in
ast_2300_post(). With P2A configuration, it performs a full board
POST and enables the transmitter chip; otherwise it only enables the
transmitter chip.

Also fix coding style in several places. No changes to the overall
logic.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/Makefile   |    1 +
 drivers/gpu/drm/ast/ast_2300.c | 1295 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_drv.h  |    3 +
 drivers/gpu/drm/ast/ast_post.c | 1265 +------------------------------
 4 files changed, 1302 insertions(+), 1262 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_2300.c

diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index 38374720e32e..ccb2ff3e8eac 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -4,6 +4,7 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ast-y := \
+	ast_2300.o \
 	ast_2500.o \
 	ast_2600.o \
 	ast_cursor.o \
diff --git a/drivers/gpu/drm/ast/ast_2300.c b/drivers/gpu/drm/ast/ast_2300.c
new file mode 100644
index 000000000000..7a2c3fde09d2
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_2300.c
@@ -0,0 +1,1295 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+/*
+ * Authors: Dave Airlie <airlied@redhat.com>
+ */
+
+#include <linux/delay.h>
+
+#include "ast_drv.h"
+#include "ast_post.h"
+
+/*
+ *  POST
+ */
+
+/* AST 2300 DRAM settings */
+#define AST_DDR3 0
+#define AST_DDR2 1
+
+struct ast2300_dram_param {
+	u32 dram_type;
+	u32 dram_chipid;
+	u32 dram_freq;
+	u32 vram_size;
+	u32 odt;
+	u32 wodt;
+	u32 rodt;
+	u32 dram_config;
+	u32 reg_PERIOD;
+	u32 reg_MADJ;
+	u32 reg_SADJ;
+	u32 reg_MRS;
+	u32 reg_EMRS;
+	u32 reg_AC1;
+	u32 reg_AC2;
+	u32 reg_DQSIC;
+	u32 reg_DRV;
+	u32 reg_IOZ;
+	u32 reg_DQIDLY;
+	u32 reg_FREQ;
+	u32 madj_max;
+	u32 dll2_finetune_step;
+};
+
+/*
+ * DQSI DLL CBR Setting
+ */
+#define CBR_SIZE0            ((1  << 10) - 1)
+#define CBR_SIZE1            ((4  << 10) - 1)
+#define CBR_SIZE2            ((64 << 10) - 1)
+#define CBR_PASSNUM          5
+#define CBR_PASSNUM2         5
+#define CBR_THRESHOLD        10
+#define CBR_THRESHOLD2       10
+#define TIMEOUT              5000000
+#define CBR_PATNUM           8
+
+static const u32 pattern[8] = {
+	0xFF00FF00,
+	0xCC33CC33,
+	0xAA55AA55,
+	0x88778877,
+	0x92CC4D6E,
+	0x543D3CDE,
+	0xF1E843C7,
+	0x7C61D253
+};
+
+static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
+{
+	u32 data, timeout;
+
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
+	timeout = 0;
+	do {
+		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
+		if (++timeout > TIMEOUT) {
+			ast_moutdwm(ast, 0x1e6e0070, 0x0);
+			return 0xffffffff;
+		}
+	} while (!data);
+	data = ast_mindwm(ast, 0x1e6e0078);
+	data = (data | (data >> 16)) & 0xffff;
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+	return data;
+}
+
+static u32 mmc_test_burst2(struct ast_device *ast, u32 datagen)
+{
+	return mmc_test2(ast, datagen, 0x41);
+}
+
+static bool mmc_test_single(struct ast_device *ast, u32 datagen)
+{
+	return mmc_test(ast, datagen, 0xc5);
+}
+
+static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
+{
+	return mmc_test2(ast, datagen, 0x05);
+}
+
+static int cbr_test(struct ast_device *ast)
+{
+	u32 data;
+	int i;
+
+	data = mmc_test_single2(ast, 0);
+	if ((data & 0xff) && (data & 0xff00))
+		return 0;
+	for (i = 0; i < 8; i++) {
+		data = mmc_test_burst2(ast, i);
+		if ((data & 0xff) && (data & 0xff00))
+			return 0;
+	}
+	if (!data)
+		return 3;
+	else if (data & 0xff)
+		return 2;
+	return 1;
+}
+
+static int cbr_scan(struct ast_device *ast)
+{
+	u32 data, data2, patcnt, loop;
+
+	data2 = 3;
+	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
+		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
+		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
+			data = cbr_test(ast);
+			if (data != 0) {
+				data2 &= data;
+				if (!data2)
+					return 0;
+				break;
+			}
+		}
+		if (loop == CBR_PASSNUM2)
+			return 0;
+	}
+	return data2;
+}
+
+static u32 cbr_test2(struct ast_device *ast)
+{
+	u32 data;
+
+	data = mmc_test_burst2(ast, 0);
+	if (data == 0xffff)
+		return 0;
+	data |= mmc_test_single2(ast, 0);
+	if (data == 0xffff)
+		return 0;
+
+	return ~data & 0xffff;
+}
+
+static u32 cbr_scan2(struct ast_device *ast)
+{
+	u32 data, data2, patcnt, loop;
+
+	data2 = 0xffff;
+	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
+		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
+		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
+			data = cbr_test2(ast);
+			if (data != 0) {
+				data2 &= data;
+				if (!data2)
+					return 0;
+				break;
+			}
+		}
+		if (loop == CBR_PASSNUM2)
+			return 0;
+	}
+	return data2;
+}
+
+static bool cbr_test3(struct ast_device *ast)
+{
+	if (!mmc_test_burst(ast, 0))
+		return false;
+	if (!mmc_test_single(ast, 0))
+		return false;
+	return true;
+}
+
+static bool cbr_scan3(struct ast_device *ast)
+{
+	u32 patcnt, loop;
+
+	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
+		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
+		for (loop = 0; loop < 2; loop++) {
+			if (cbr_test3(ast))
+				break;
+		}
+		if (loop == 2)
+			return false;
+	}
+	return true;
+}
+
+static bool finetuneDQI_L(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 gold_sadj[2], dllmin[16], dllmax[16], dlli, data, cnt, mask, passcnt, retry = 0;
+	bool status = false;
+FINETUNE_START:
+	for (cnt = 0; cnt < 16; cnt++) {
+		dllmin[cnt] = 0xff;
+		dllmax[cnt] = 0x0;
+	}
+	passcnt = 0;
+	for (dlli = 0; dlli < 76; dlli++) {
+		ast_moutdwm(ast, 0x1E6E0068, 0x00001400 | (dlli << 16) | (dlli << 24));
+		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE1);
+		data = cbr_scan2(ast);
+		if (data != 0) {
+			mask = 0x00010001;
+			for (cnt = 0; cnt < 16; cnt++) {
+				if (data & mask) {
+					if (dllmin[cnt] > dlli)
+						dllmin[cnt] = dlli;
+					if (dllmax[cnt] < dlli)
+						dllmax[cnt] = dlli;
+				}
+				mask <<= 1;
+			}
+			passcnt++;
+		} else if (passcnt >= CBR_THRESHOLD2) {
+			break;
+		}
+	}
+	gold_sadj[0] = 0x0;
+	passcnt = 0;
+	for (cnt = 0; cnt < 16; cnt++) {
+		if ((dllmax[cnt] > dllmin[cnt]) &&
+		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
+			gold_sadj[0] += dllmin[cnt];
+			passcnt++;
+		}
+	}
+	if (retry++ > 10)
+		goto FINETUNE_DONE;
+	if (passcnt != 16)
+		goto FINETUNE_START;
+	status = true;
+FINETUNE_DONE:
+	gold_sadj[0] = gold_sadj[0] >> 4;
+	gold_sadj[1] = gold_sadj[0];
+
+	data = 0;
+	for (cnt = 0; cnt < 8; cnt++) {
+		data >>= 3;
+		if ((dllmax[cnt] > dllmin[cnt]) &&
+		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
+			dlli = dllmin[cnt];
+			if (gold_sadj[0] >= dlli) {
+				dlli = ((gold_sadj[0] - dlli) * 19) >> 5;
+				if (dlli > 3)
+					dlli = 3;
+			} else {
+				dlli = ((dlli - gold_sadj[0]) * 19) >> 5;
+				if (dlli > 4)
+					dlli = 4;
+				dlli = (8 - dlli) & 0x7;
+			}
+			data |= dlli << 21;
+		}
+	}
+	ast_moutdwm(ast, 0x1E6E0080, data);
+
+	data = 0;
+	for (cnt = 8; cnt < 16; cnt++) {
+		data >>= 3;
+		if ((dllmax[cnt] > dllmin[cnt]) &&
+		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
+			dlli = dllmin[cnt];
+			if (gold_sadj[1] >= dlli) {
+				dlli = ((gold_sadj[1] - dlli) * 19) >> 5;
+				if (dlli > 3)
+					dlli = 3;
+				else
+					dlli = (dlli - 1) & 0x7;
+			} else {
+				dlli = ((dlli - gold_sadj[1]) * 19) >> 5;
+				dlli += 1;
+				if (dlli > 4)
+					dlli = 4;
+				dlli = (8 - dlli) & 0x7;
+			}
+			data |= dlli << 21;
+		}
+	}
+	ast_moutdwm(ast, 0x1E6E0084, data);
+	return status;
+} /* finetuneDQI_L */
+
+static void finetuneDQSI(struct ast_device *ast)
+{
+	u32 dlli, dqsip, dqidly;
+	u32 reg_mcr18, reg_mcr0c, passcnt[2], diff;
+	u32 g_dqidly, g_dqsip, g_margin, g_side;
+	u16 pass[32][2][2];
+	char tag[2][76];
+
+	/* Disable DQI CBR */
+	reg_mcr0c  = ast_mindwm(ast, 0x1E6E000C);
+	reg_mcr18  = ast_mindwm(ast, 0x1E6E0018);
+	reg_mcr18 &= 0x0000ffff;
+	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
+
+	for (dlli = 0; dlli < 76; dlli++) {
+		tag[0][dlli] = 0x0;
+		tag[1][dlli] = 0x0;
+	}
+	for (dqidly = 0; dqidly < 32; dqidly++) {
+		pass[dqidly][0][0] = 0xff;
+		pass[dqidly][0][1] = 0x0;
+		pass[dqidly][1][0] = 0xff;
+		pass[dqidly][1][1] = 0x0;
+	}
+	for (dqidly = 0; dqidly < 32; dqidly++) {
+		passcnt[0] = 0;
+		passcnt[1] = 0;
+		for (dqsip = 0; dqsip < 2; dqsip++) {
+			ast_moutdwm(ast, 0x1E6E000C, 0);
+			ast_moutdwm(ast, 0x1E6E0018, reg_mcr18 | (dqidly << 16) | (dqsip << 23));
+			ast_moutdwm(ast, 0x1E6E000C, reg_mcr0c);
+			for (dlli = 0; dlli < 76; dlli++) {
+				ast_moutdwm(ast, 0x1E6E0068,
+					    0x00001300 | (dlli << 16) | (dlli << 24));
+				ast_moutdwm(ast, 0x1E6E0070, 0);
+				ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE0);
+				if (cbr_scan3(ast)) {
+					if (dlli == 0)
+						break;
+					passcnt[dqsip]++;
+					tag[dqsip][dlli] = 'P';
+					if (dlli < pass[dqidly][dqsip][0])
+						pass[dqidly][dqsip][0] = (u16)dlli;
+					if (dlli > pass[dqidly][dqsip][1])
+						pass[dqidly][dqsip][1] = (u16)dlli;
+				} else if (passcnt[dqsip] >= 5) {
+					break;
+				} else {
+					pass[dqidly][dqsip][0] = 0xff;
+					pass[dqidly][dqsip][1] = 0x0;
+				}
+			}
+		}
+		if (passcnt[0] == 0 && passcnt[1] == 0)
+			dqidly++;
+	}
+	/* Search margin */
+	g_dqidly = 0;
+	g_dqsip = 0;
+	g_margin = 0;
+	g_side = 0;
+
+	for (dqidly = 0; dqidly < 32; dqidly++) {
+		for (dqsip = 0; dqsip < 2; dqsip++) {
+			if (pass[dqidly][dqsip][0] > pass[dqidly][dqsip][1])
+				continue;
+			diff = pass[dqidly][dqsip][1] - pass[dqidly][dqsip][0];
+			if ((diff + 2) < g_margin)
+				continue;
+			passcnt[0] = 0;
+			passcnt[1] = 0;
+			for (dlli = pass[dqidly][dqsip][0];
+			     dlli > 0 && tag[dqsip][dlli] != 0;
+			     dlli--, passcnt[0]++) {
+			}
+			for (dlli = pass[dqidly][dqsip][1];
+			     dlli < 76 && tag[dqsip][dlli] != 0;
+			     dlli++, passcnt[1]++) {
+			}
+			if (passcnt[0] > passcnt[1])
+				passcnt[0] = passcnt[1];
+			passcnt[1] = 0;
+			if (passcnt[0] > g_side)
+				passcnt[1] = passcnt[0] - g_side;
+			if (diff > (g_margin + 1) && (passcnt[1] > 0 || passcnt[0] > 8)) {
+				g_margin = diff;
+				g_dqidly = dqidly;
+				g_dqsip  = dqsip;
+				g_side   = passcnt[0];
+			} else if (passcnt[1] > 1 && g_side < 8) {
+				if (diff > g_margin)
+					g_margin = diff;
+				g_dqidly = dqidly;
+				g_dqsip  = dqsip;
+				g_side   = passcnt[0];
+			}
+		}
+	}
+	reg_mcr18 = reg_mcr18 | (g_dqidly << 16) | (g_dqsip << 23);
+	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
+}
+
+static bool cbr_dll2(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 dllmin[2], dllmax[2], dlli, data, passcnt, retry = 0;
+	bool status = false;
+
+	finetuneDQSI(ast);
+	if (finetuneDQI_L(ast, param) == false)
+		return status;
+
+CBR_START2:
+	dllmin[0] = 0xff;
+	dllmin[1] = 0xff;
+	dllmax[0] = 0x0;
+	dllmax[1] = 0x0;
+	passcnt = 0;
+	for (dlli = 0; dlli < 76; dlli++) {
+		ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
+		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE2);
+		data = cbr_scan(ast);
+		if (data != 0) {
+			if (data & 0x1) {
+				if (dllmin[0] > dlli)
+					dllmin[0] = dlli;
+				if (dllmax[0] < dlli)
+					dllmax[0] = dlli;
+			}
+			if (data & 0x2) {
+				if (dllmin[1] > dlli)
+					dllmin[1] = dlli;
+				if (dllmax[1] < dlli)
+					dllmax[1] = dlli;
+			}
+			passcnt++;
+		} else if (passcnt >= CBR_THRESHOLD) {
+			break;
+		}
+	}
+	if (retry++ > 10)
+		goto CBR_DONE2;
+	if (dllmax[0] == 0 || (dllmax[0] - dllmin[0]) < CBR_THRESHOLD)
+		goto CBR_START2;
+	if (dllmax[1] == 0 || (dllmax[1] - dllmin[1]) < CBR_THRESHOLD)
+		goto CBR_START2;
+	status = true;
+CBR_DONE2:
+	dlli  = (dllmin[1] + dllmax[1]) >> 1;
+	dlli <<= 8;
+	dlli += (dllmin[0] + dllmax[0]) >> 1;
+	ast_moutdwm(ast, 0x1E6E0068, ast_mindwm(ast, 0x1E720058) | (dlli << 16));
+	return status;
+} /* CBRDLL2 */
+
+static void get_ddr3_info(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 trap, trap_AC2, trap_MRS;
+
+	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
+
+	/* Ger trap info */
+	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
+	trap_AC2  = 0x00020000 + (trap << 16);
+	trap_AC2 |= 0x00300000 + ((trap & 0x2) << 19);
+	trap_MRS  = 0x00000010 + (trap << 4);
+	trap_MRS |= ((trap & 0x2) << 18);
+
+	param->reg_MADJ       = 0x00034C4C;
+	param->reg_SADJ       = 0x00001800;
+	param->reg_DRV        = 0x000000F0;
+	param->reg_PERIOD     = param->dram_freq;
+	param->rodt           = 0;
+
+	switch (param->dram_freq) {
+	case 336:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
+		param->wodt          = 0;
+		param->reg_AC1       = 0x22202725;
+		param->reg_AC2       = 0xAA007613 | trap_AC2;
+		param->reg_DQSIC     = 0x000000BA;
+		param->reg_MRS       = 0x04001400 | trap_MRS;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_IOZ       = 0x00000023;
+		param->reg_DQIDLY    = 0x00000074;
+		param->reg_FREQ      = 0x00004DC0;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 3;
+		switch (param->dram_chipid) {
+		default:
+		case AST_DRAM_512Mx16:
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xAA007613 | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xAA00761C | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xAA007636 | trap_AC2;
+			break;
+		}
+		break;
+	default:
+	case 396:
+		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
+		param->wodt          = 1;
+		param->reg_AC1       = 0x33302825;
+		param->reg_AC2       = 0xCC009617 | trap_AC2;
+		param->reg_DQSIC     = 0x000000E2;
+		param->reg_MRS       = 0x04001600 | trap_MRS;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_DQIDLY    = 0x00000089;
+		param->reg_FREQ      = 0x00005040;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 4;
+
+		switch (param->dram_chipid) {
+		default:
+		case AST_DRAM_512Mx16:
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xCC009617 | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xCC009622 | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xCC00963F | trap_AC2;
+			break;
+		}
+		break;
+
+	case 408:
+		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
+		param->wodt          = 1;
+		param->reg_AC1       = 0x33302825;
+		param->reg_AC2       = 0xCC009617 | trap_AC2;
+		param->reg_DQSIC     = 0x000000E2;
+		param->reg_MRS       = 0x04001600 | trap_MRS;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_IOZ       = 0x00000023;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_DQIDLY    = 0x00000089;
+		param->reg_FREQ      = 0x000050C0;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 4;
+
+		switch (param->dram_chipid) {
+		default:
+		case AST_DRAM_512Mx16:
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xCC009617 | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xCC009622 | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xCC00963F | trap_AC2;
+			break;
+		}
+
+		break;
+	case 456:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
+		param->wodt          = 0;
+		param->reg_AC1       = 0x33302926;
+		param->reg_AC2       = 0xCD44961A;
+		param->reg_DQSIC     = 0x000000FC;
+		param->reg_MRS       = 0x00081830;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_IOZ       = 0x00000045;
+		param->reg_DQIDLY    = 0x00000097;
+		param->reg_FREQ      = 0x000052C0;
+		param->madj_max      = 88;
+		param->dll2_finetune_step = 4;
+		break;
+	case 504:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0270);
+		param->wodt          = 1;
+		param->reg_AC1       = 0x33302926;
+		param->reg_AC2       = 0xDE44A61D;
+		param->reg_DQSIC     = 0x00000117;
+		param->reg_MRS       = 0x00081A30;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_IOZ       = 0x070000BB;
+		param->reg_DQIDLY    = 0x000000A0;
+		param->reg_FREQ      = 0x000054C0;
+		param->madj_max      = 79;
+		param->dll2_finetune_step = 4;
+		break;
+	case 528:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0290);
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x33302926;
+		param->reg_AC2       = 0xEF44B61E;
+		param->reg_DQSIC     = 0x00000125;
+		param->reg_MRS       = 0x00081A30;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x000000F5;
+		param->reg_IOZ       = 0x00000023;
+		param->reg_DQIDLY    = 0x00000088;
+		param->reg_FREQ      = 0x000055C0;
+		param->madj_max      = 76;
+		param->dll2_finetune_step = 3;
+		break;
+	case 576:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
+		param->reg_MADJ      = 0x00136868;
+		param->reg_SADJ      = 0x00004534;
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x33302A37;
+		param->reg_AC2       = 0xEF56B61E;
+		param->reg_DQSIC     = 0x0000013F;
+		param->reg_MRS       = 0x00101A50;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_IOZ       = 0x00000023;
+		param->reg_DQIDLY    = 0x00000078;
+		param->reg_FREQ      = 0x000057C0;
+		param->madj_max      = 136;
+		param->dll2_finetune_step = 3;
+		break;
+	case 600:
+		ast_moutdwm(ast, 0x1E6E2020, 0x02E1);
+		param->reg_MADJ      = 0x00136868;
+		param->reg_SADJ      = 0x00004534;
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x32302A37;
+		param->reg_AC2       = 0xDF56B61F;
+		param->reg_DQSIC     = 0x0000014D;
+		param->reg_MRS       = 0x00101A50;
+		param->reg_EMRS      = 0x00000004;
+		param->reg_DRV       = 0x000000F5;
+		param->reg_IOZ       = 0x00000023;
+		param->reg_DQIDLY    = 0x00000078;
+		param->reg_FREQ      = 0x000058C0;
+		param->madj_max      = 132;
+		param->dll2_finetune_step = 3;
+		break;
+	case 624:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0160);
+		param->reg_MADJ      = 0x00136868;
+		param->reg_SADJ      = 0x00004534;
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x32302A37;
+		param->reg_AC2       = 0xEF56B621;
+		param->reg_DQSIC     = 0x0000015A;
+		param->reg_MRS       = 0x02101A50;
+		param->reg_EMRS      = 0x00000004;
+		param->reg_DRV       = 0x000000F5;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x00000078;
+		param->reg_FREQ      = 0x000059C0;
+		param->madj_max      = 128;
+		param->dll2_finetune_step = 3;
+		break;
+	} /* switch freq */
+
+	switch (param->dram_chipid) {
+	case AST_DRAM_512Mx16:
+		param->dram_config = 0x130;
+		break;
+	default:
+	case AST_DRAM_1Gx16:
+		param->dram_config = 0x131;
+		break;
+	case AST_DRAM_2Gx16:
+		param->dram_config = 0x132;
+		break;
+	case AST_DRAM_4Gx16:
+		param->dram_config = 0x133;
+		break;
+	} /* switch size */
+
+	switch (param->vram_size) {
+	default:
+	case SZ_8M:
+		param->dram_config |= 0x00;
+		break;
+	case SZ_16M:
+		param->dram_config |= 0x04;
+		break;
+	case SZ_32M:
+		param->dram_config |= 0x08;
+		break;
+	case SZ_64M:
+		param->dram_config |= 0x0c;
+		break;
+	}
+}
+
+static void ddr3_init(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 data, data2, retry = 0;
+
+ddr3_init_start:
+	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
+	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0034, 0x00000000);
+	udelay(10);
+	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
+	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
+	udelay(10);
+	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
+	udelay(10);
+
+	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
+	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
+	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
+	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
+	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
+	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
+	ast_moutdwm(ast, 0x1E6E0018, 0x4000A170);
+	ast_moutdwm(ast, 0x1E6E0018, 0x00002370);
+	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0040, 0xFF444444);
+	ast_moutdwm(ast, 0x1E6E0044, 0x22222222);
+	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
+	ast_moutdwm(ast, 0x1E6E004C, 0x00000002);
+	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0054, 0);
+	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
+	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
+	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
+	/* Wait MCLK2X lock to MCLK */
+	do {
+		data = ast_mindwm(ast, 0x1E6E001C);
+	} while (!(data & 0x08000000));
+	data = ast_mindwm(ast, 0x1E6E001C);
+	data = (data >> 8) & 0xff;
+	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
+		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
+		if ((data2 & 0xff) > param->madj_max)
+			break;
+		ast_moutdwm(ast, 0x1E6E0064, data2);
+		if (data2 & 0x00100000)
+			data2 = ((data2 & 0xff) >> 3) + 3;
+		else
+			data2 = ((data2 & 0xff) >> 2) + 5;
+		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
+		data2 += data & 0xff;
+		data = data | (data2 << 8);
+		ast_moutdwm(ast, 0x1E6E0068, data);
+		udelay(10);
+		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
+		udelay(10);
+		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
+		ast_moutdwm(ast, 0x1E6E0018, data);
+		data = data | 0x200;
+		ast_moutdwm(ast, 0x1E6E0018, data);
+		do {
+			data = ast_mindwm(ast, 0x1E6E001C);
+		} while (!(data & 0x08000000));
+
+		data = ast_mindwm(ast, 0x1E6E001C);
+		data = (data >> 8) & 0xff;
+	}
+	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0068) & 0xffff);
+	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
+	ast_moutdwm(ast, 0x1E6E0018, data);
+
+	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
+	ast_moutdwm(ast, 0x1E6E000C, 0x00000040);
+	udelay(50);
+	/* Mode Register Setting */
+	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
+	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
+	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
+	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
+
+	ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
+	data = 0;
+	if (param->wodt)
+		data = 0x300;
+	if (param->rodt)
+		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
+	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
+
+	/* Calibrate the DQSI delay */
+	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
+		goto ddr3_init_start;
+
+	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
+	/* ECC Memory Initialization */
+#ifdef ECC
+	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0070, 0x221);
+	do {
+		data = ast_mindwm(ast, 0x1E6E0070);
+	} while (!(data & 0x00001000));
+	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
+#endif
+}
+
+static void get_ddr2_info(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 trap, trap_AC2, trap_MRS;
+
+	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
+
+	/* Ger trap info */
+	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
+	trap_AC2  = (trap << 20) | (trap << 16);
+	trap_AC2 += 0x00110000;
+	trap_MRS  = 0x00000040 | (trap << 4);
+
+	param->reg_MADJ       = 0x00034C4C;
+	param->reg_SADJ       = 0x00001800;
+	param->reg_DRV        = 0x000000F0;
+	param->reg_PERIOD     = param->dram_freq;
+	param->rodt           = 0;
+
+	switch (param->dram_freq) {
+	case 264:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0130);
+		param->wodt          = 0;
+		param->reg_AC1       = 0x11101513;
+		param->reg_AC2       = 0x78117011;
+		param->reg_DQSIC     = 0x00000092;
+		param->reg_MRS       = 0x00000842;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_DRV       = 0x000000F0;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x0000005A;
+		param->reg_FREQ      = 0x00004AC0;
+		param->madj_max      = 138;
+		param->dll2_finetune_step = 3;
+		break;
+	case 336:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
+		param->wodt          = 1;
+		param->reg_AC1       = 0x22202613;
+		param->reg_AC2       = 0xAA009016 | trap_AC2;
+		param->reg_DQSIC     = 0x000000BA;
+		param->reg_MRS       = 0x00000A02 | trap_MRS;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x00000074;
+		param->reg_FREQ      = 0x00004DC0;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 3;
+		switch (param->dram_chipid) {
+		default:
+		case AST_DRAM_512Mx16:
+			param->reg_AC2   = 0xAA009012 | trap_AC2;
+			break;
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xAA009016 | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xAA009023 | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xAA00903B | trap_AC2;
+			break;
+		}
+		break;
+	default:
+	case 396:
+		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
+		param->wodt          = 1;
+		param->rodt          = 0;
+		param->reg_AC1       = 0x33302714;
+		param->reg_AC2       = 0xCC00B01B | trap_AC2;
+		param->reg_DQSIC     = 0x000000E2;
+		param->reg_MRS       = 0x00000C02 | trap_MRS;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x00000089;
+		param->reg_FREQ      = 0x00005040;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 4;
+
+		switch (param->dram_chipid) {
+		case AST_DRAM_512Mx16:
+			param->reg_AC2   = 0xCC00B016 | trap_AC2;
+			break;
+		default:
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xCC00B01B | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xCC00B02B | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xCC00B03F | trap_AC2;
+			break;
+		}
+
+		break;
+
+	case 408:
+		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
+		param->wodt          = 1;
+		param->rodt          = 0;
+		param->reg_AC1       = 0x33302714;
+		param->reg_AC2       = 0xCC00B01B | trap_AC2;
+		param->reg_DQSIC     = 0x000000E2;
+		param->reg_MRS       = 0x00000C02 | trap_MRS;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x000000FA;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x00000089;
+		param->reg_FREQ      = 0x000050C0;
+		param->madj_max      = 96;
+		param->dll2_finetune_step = 4;
+
+		switch (param->dram_chipid) {
+		case AST_DRAM_512Mx16:
+			param->reg_AC2   = 0xCC00B016 | trap_AC2;
+			break;
+		default:
+		case AST_DRAM_1Gx16:
+			param->reg_AC2   = 0xCC00B01B | trap_AC2;
+			break;
+		case AST_DRAM_2Gx16:
+			param->reg_AC2   = 0xCC00B02B | trap_AC2;
+			break;
+		case AST_DRAM_4Gx16:
+			param->reg_AC2   = 0xCC00B03F | trap_AC2;
+			break;
+		}
+
+		break;
+	case 456:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
+		param->wodt          = 0;
+		param->reg_AC1       = 0x33302815;
+		param->reg_AC2       = 0xCD44B01E;
+		param->reg_DQSIC     = 0x000000FC;
+		param->reg_MRS       = 0x00000E72;
+		param->reg_EMRS      = 0x00000000;
+		param->reg_DRV       = 0x00000000;
+		param->reg_IOZ       = 0x00000034;
+		param->reg_DQIDLY    = 0x00000097;
+		param->reg_FREQ      = 0x000052C0;
+		param->madj_max      = 88;
+		param->dll2_finetune_step = 3;
+		break;
+	case 504:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0261);
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x33302815;
+		param->reg_AC2       = 0xDE44C022;
+		param->reg_DQSIC     = 0x00000117;
+		param->reg_MRS       = 0x00000E72;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x0000000A;
+		param->reg_IOZ       = 0x00000045;
+		param->reg_DQIDLY    = 0x000000A0;
+		param->reg_FREQ      = 0x000054C0;
+		param->madj_max      = 79;
+		param->dll2_finetune_step = 3;
+		break;
+	case 528:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0120);
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x33302815;
+		param->reg_AC2       = 0xEF44D024;
+		param->reg_DQSIC     = 0x00000125;
+		param->reg_MRS       = 0x00000E72;
+		param->reg_EMRS      = 0x00000004;
+		param->reg_DRV       = 0x000000F9;
+		param->reg_IOZ       = 0x00000045;
+		param->reg_DQIDLY    = 0x000000A7;
+		param->reg_FREQ      = 0x000055C0;
+		param->madj_max      = 76;
+		param->dll2_finetune_step = 3;
+		break;
+	case 552:
+		ast_moutdwm(ast, 0x1E6E2020, 0x02A1);
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x43402915;
+		param->reg_AC2       = 0xFF44E025;
+		param->reg_DQSIC     = 0x00000132;
+		param->reg_MRS       = 0x00000E72;
+		param->reg_EMRS      = 0x00000040;
+		param->reg_DRV       = 0x0000000A;
+		param->reg_IOZ       = 0x00000045;
+		param->reg_DQIDLY    = 0x000000AD;
+		param->reg_FREQ      = 0x000056C0;
+		param->madj_max      = 76;
+		param->dll2_finetune_step = 3;
+		break;
+	case 576:
+		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
+		param->wodt          = 1;
+		param->rodt          = 1;
+		param->reg_AC1       = 0x43402915;
+		param->reg_AC2       = 0xFF44E027;
+		param->reg_DQSIC     = 0x0000013F;
+		param->reg_MRS       = 0x00000E72;
+		param->reg_EMRS      = 0x00000004;
+		param->reg_DRV       = 0x000000F5;
+		param->reg_IOZ       = 0x00000045;
+		param->reg_DQIDLY    = 0x000000B3;
+		param->reg_FREQ      = 0x000057C0;
+		param->madj_max      = 76;
+		param->dll2_finetune_step = 3;
+		break;
+	}
+
+	switch (param->dram_chipid) {
+	case AST_DRAM_512Mx16:
+		param->dram_config = 0x100;
+		break;
+	default:
+	case AST_DRAM_1Gx16:
+		param->dram_config = 0x121;
+		break;
+	case AST_DRAM_2Gx16:
+		param->dram_config = 0x122;
+		break;
+	case AST_DRAM_4Gx16:
+		param->dram_config = 0x123;
+		break;
+	} /* switch size */
+
+	switch (param->vram_size) {
+	default:
+	case SZ_8M:
+		param->dram_config |= 0x00;
+		break;
+	case SZ_16M:
+		param->dram_config |= 0x04;
+		break;
+	case SZ_32M:
+		param->dram_config |= 0x08;
+		break;
+	case SZ_64M:
+		param->dram_config |= 0x0c;
+		break;
+	}
+}
+
+static void ddr2_init(struct ast_device *ast, struct ast2300_dram_param *param)
+{
+	u32 data, data2, retry = 0;
+
+ddr2_init_start:
+	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
+	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
+	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
+	udelay(10);
+	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
+	udelay(10);
+
+	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
+	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
+	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
+	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
+	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
+	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
+	ast_moutdwm(ast, 0x1E6E0018, 0x4000A130);
+	ast_moutdwm(ast, 0x1E6E0018, 0x00002330);
+	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0040, 0xFF808000);
+	ast_moutdwm(ast, 0x1E6E0044, 0x88848466);
+	ast_moutdwm(ast, 0x1E6E0048, 0x44440008);
+	ast_moutdwm(ast, 0x1E6E004C, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0054, 0);
+	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
+	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
+	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
+
+	/* Wait MCLK2X lock to MCLK */
+	do {
+		data = ast_mindwm(ast, 0x1E6E001C);
+	} while (!(data & 0x08000000));
+	data = ast_mindwm(ast, 0x1E6E001C);
+	data = (data >> 8) & 0xff;
+	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
+		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
+		if ((data2 & 0xff) > param->madj_max)
+			break;
+		ast_moutdwm(ast, 0x1E6E0064, data2);
+		if (data2 & 0x00100000)
+			data2 = ((data2 & 0xff) >> 3) + 3;
+		else
+			data2 = ((data2 & 0xff) >> 2) + 5;
+		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
+		data2 += data & 0xff;
+		data = data | (data2 << 8);
+		ast_moutdwm(ast, 0x1E6E0068, data);
+		udelay(10);
+		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
+		udelay(10);
+		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
+		ast_moutdwm(ast, 0x1E6E0018, data);
+		data = data | 0x200;
+		ast_moutdwm(ast, 0x1E6E0018, data);
+		do {
+			data = ast_mindwm(ast, 0x1E6E001C);
+		} while (!(data & 0x08000000));
+
+		data = ast_mindwm(ast, 0x1E6E001C);
+		data = (data >> 8) & 0xff;
+	}
+	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0008) & 0xffff);
+	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
+	ast_moutdwm(ast, 0x1E6E0018, data);
+
+	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
+	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+	udelay(50);
+	/* Mode Register Setting */
+	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
+	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
+
+	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
+	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
+	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS | 0x380);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
+	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
+	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
+
+	ast_moutdwm(ast, 0x1E6E000C, 0x7FFF5C01);
+	data = 0;
+	if (param->wodt)
+		data = 0x500;
+	if (param->rodt)
+		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
+	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
+	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
+
+	/* Calibrate the DQSI delay */
+	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
+		goto ddr2_init_start;
+
+	/* ECC Memory Initialization */
+#ifdef ECC
+	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0070, 0x221);
+	do {
+		data = ast_mindwm(ast, 0x1E6E0070);
+	} while (!(data & 0x00001000));
+	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
+#endif
+}
+
+static void ast_post_chip_2300(struct ast_device *ast)
+{
+	struct ast2300_dram_param param;
+	u32 temp;
+	u8 reg;
+
+	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	if ((reg & 0x80) == 0) {/* vga only */
+		ast_write32(ast, 0xf004, 0x1e6e0000);
+		ast_write32(ast, 0xf000, 0x1);
+		ast_write32(ast, 0x12000, 0x1688a8a8);
+		do {
+			;
+		} while (ast_read32(ast, 0x12000) != 0x1);
+
+		ast_write32(ast, 0x10000, 0xfc600309);
+		do {
+			;
+		} while (ast_read32(ast, 0x10000) != 0x1);
+
+		/* Slow down CPU/AHB CLK in VGA only mode */
+		temp = ast_read32(ast, 0x12008);
+		temp |= 0x73;
+		ast_write32(ast, 0x12008, temp);
+
+		param.dram_freq = 396;
+		param.dram_type = AST_DDR3;
+		temp = ast_mindwm(ast, 0x1e6e2070);
+		if (temp & 0x01000000)
+			param.dram_type = AST_DDR2;
+		switch (temp & 0x18000000) {
+		case 0:
+			param.dram_chipid = AST_DRAM_512Mx16;
+			break;
+		default:
+		case 0x08000000:
+			param.dram_chipid = AST_DRAM_1Gx16;
+			break;
+		case 0x10000000:
+			param.dram_chipid = AST_DRAM_2Gx16;
+			break;
+		case 0x18000000:
+			param.dram_chipid = AST_DRAM_4Gx16;
+			break;
+		}
+		switch (temp & 0x0c) {
+		default:
+		case 0x00:
+			param.vram_size = SZ_8M;
+			break;
+		case 0x04:
+			param.vram_size = SZ_16M;
+			break;
+		case 0x08:
+			param.vram_size = SZ_32M;
+			break;
+		case 0x0c:
+			param.vram_size = SZ_64M;
+			break;
+		}
+
+		if (param.dram_type == AST_DDR3) {
+			get_ddr3_info(ast, &param);
+			ddr3_init(ast, &param);
+		} else {
+			get_ddr2_info(ast, &param);
+			ddr2_init(ast, &param);
+		}
+
+		temp = ast_mindwm(ast, 0x1e6e2040);
+		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
+	}
+
+	/* wait ready */
+	do {
+		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	} while ((reg & 0x40) == 0);
+}
+
+int ast_2300_post(struct ast_device *ast)
+{
+	if (ast->config_mode == ast_use_p2a) {
+		ast_post_chip_2300(ast);
+		ast_init_3rdtx(ast);
+	} else {
+		if (ast->tx_chip == AST_TX_SIL164) {
+			/* Enable DVO */
+			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 4a92c377e9bd..653e93b05859 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -417,6 +417,9 @@ struct ast_crtc_state {
 
 int ast_mm_init(struct ast_device *ast);
 
+/* ast_2300.c */
+int ast_2300_post(struct ast_device *ast);
+
 /* ast_2500.c */
 void ast_2500_patch_ahb(void __iomem *regs);
 int ast_2500_post(struct ast_device *ast);
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 0d99270b58c4..a08264210d77 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -35,8 +35,6 @@
 #include "ast_drv.h"
 #include "ast_post.h"
 
-static void ast_post_chip_2300(struct ast_device *ast);
-
 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
 static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
 
@@ -355,15 +353,9 @@ int ast_post_gpu(struct ast_device *ast)
 		if (ret)
 			return ret;
 	} else if (AST_GEN(ast) >= 4) {
-		if (ast->config_mode == ast_use_p2a) {
-			ast_post_chip_2300(ast);
-			ast_init_3rdtx(ast);
-		} else {
-			if (ast->tx_chip == AST_TX_SIL164) {
-				/* Enable DVO */
-				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
-			}
-		}
+		ret = ast_2300_post(ast);
+		if (ret)
+			return ret;
 	} else  {
 		if (ast->config_mode == ast_use_p2a) {
 			ast_init_dram_reg(ast);
@@ -378,58 +370,7 @@ int ast_post_gpu(struct ast_device *ast)
 	return 0;
 }
 
-/* AST 2300 DRAM settings */
-#define AST_DDR3 0
-#define AST_DDR2 1
-
-struct ast2300_dram_param {
-	u32 dram_type;
-	u32 dram_chipid;
-	u32 dram_freq;
-	u32 vram_size;
-	u32 odt;
-	u32 wodt;
-	u32 rodt;
-	u32 dram_config;
-	u32 reg_PERIOD;
-	u32 reg_MADJ;
-	u32 reg_SADJ;
-	u32 reg_MRS;
-	u32 reg_EMRS;
-	u32 reg_AC1;
-	u32 reg_AC2;
-	u32 reg_DQSIC;
-	u32 reg_DRV;
-	u32 reg_IOZ;
-	u32 reg_DQIDLY;
-	u32 reg_FREQ;
-	u32 madj_max;
-	u32 dll2_finetune_step;
-};
-
-/*
- * DQSI DLL CBR Setting
- */
-#define CBR_SIZE0            ((1  << 10) - 1)
-#define CBR_SIZE1            ((4  << 10) - 1)
-#define CBR_SIZE2            ((64 << 10) - 1)
-#define CBR_PASSNUM          5
-#define CBR_PASSNUM2         5
-#define CBR_THRESHOLD        10
-#define CBR_THRESHOLD2       10
 #define TIMEOUT              5000000
-#define CBR_PATNUM           8
-
-static const u32 pattern[8] = {
-	0xFF00FF00,
-	0xCC33CC33,
-	0xAA55AA55,
-	0x88778877,
-	0x92CC4D6E,
-	0x543D3CDE,
-	0xF1E843C7,
-	0x7C61D253
-};
 
 bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
 {
@@ -451,1207 +392,7 @@ bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
 	return true;
 }
 
-static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
-{
-	u32 data, timeout;
-
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
-		if (++timeout > TIMEOUT) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x0);
-			return 0xffffffff;
-		}
-	} while (!data);
-	data = ast_mindwm(ast, 0x1e6e0078);
-	data = (data | (data >> 16)) & 0xffff;
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	return data;
-}
-
 bool mmc_test_burst(struct ast_device *ast, u32 datagen)
 {
 	return mmc_test(ast, datagen, 0xc1);
 }
-
-static u32 mmc_test_burst2(struct ast_device *ast, u32 datagen)
-{
-	return mmc_test2(ast, datagen, 0x41);
-}
-
-static bool mmc_test_single(struct ast_device *ast, u32 datagen)
-{
-	return mmc_test(ast, datagen, 0xc5);
-}
-
-static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
-{
-	return mmc_test2(ast, datagen, 0x05);
-}
-
-static int cbr_test(struct ast_device *ast)
-{
-	u32 data;
-	int i;
-	data = mmc_test_single2(ast, 0);
-	if ((data & 0xff) && (data & 0xff00))
-		return 0;
-	for (i = 0; i < 8; i++) {
-		data = mmc_test_burst2(ast, i);
-		if ((data & 0xff) && (data & 0xff00))
-			return 0;
-	}
-	if (!data)
-		return 3;
-	else if (data & 0xff)
-		return 2;
-	return 1;
-}
-
-static int cbr_scan(struct ast_device *ast)
-{
-	u32 data, data2, patcnt, loop;
-
-	data2 = 3;
-	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
-		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
-		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
-			if ((data = cbr_test(ast)) != 0) {
-				data2 &= data;
-				if (!data2)
-					return 0;
-				break;
-			}
-		}
-		if (loop == CBR_PASSNUM2)
-			return 0;
-	}
-	return data2;
-}
-
-static u32 cbr_test2(struct ast_device *ast)
-{
-	u32 data;
-
-	data = mmc_test_burst2(ast, 0);
-	if (data == 0xffff)
-		return 0;
-	data |= mmc_test_single2(ast, 0);
-	if (data == 0xffff)
-		return 0;
-
-	return ~data & 0xffff;
-}
-
-static u32 cbr_scan2(struct ast_device *ast)
-{
-	u32 data, data2, patcnt, loop;
-
-	data2 = 0xffff;
-	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
-		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
-		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
-			if ((data = cbr_test2(ast)) != 0) {
-				data2 &= data;
-				if (!data2)
-					return 0;
-				break;
-			}
-		}
-		if (loop == CBR_PASSNUM2)
-			return 0;
-	}
-	return data2;
-}
-
-static bool cbr_test3(struct ast_device *ast)
-{
-	if (!mmc_test_burst(ast, 0))
-		return false;
-	if (!mmc_test_single(ast, 0))
-		return false;
-	return true;
-}
-
-static bool cbr_scan3(struct ast_device *ast)
-{
-	u32 patcnt, loop;
-
-	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
-		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
-		for (loop = 0; loop < 2; loop++) {
-			if (cbr_test3(ast))
-				break;
-		}
-		if (loop == 2)
-			return false;
-	}
-	return true;
-}
-
-static bool finetuneDQI_L(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 gold_sadj[2], dllmin[16], dllmax[16], dlli, data, cnt, mask, passcnt, retry = 0;
-	bool status = false;
-FINETUNE_START:
-	for (cnt = 0; cnt < 16; cnt++) {
-		dllmin[cnt] = 0xff;
-		dllmax[cnt] = 0x0;
-	}
-	passcnt = 0;
-	for (dlli = 0; dlli < 76; dlli++) {
-		ast_moutdwm(ast, 0x1E6E0068, 0x00001400 | (dlli << 16) | (dlli << 24));
-		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE1);
-		data = cbr_scan2(ast);
-		if (data != 0) {
-			mask = 0x00010001;
-			for (cnt = 0; cnt < 16; cnt++) {
-				if (data & mask) {
-					if (dllmin[cnt] > dlli) {
-						dllmin[cnt] = dlli;
-					}
-					if (dllmax[cnt] < dlli) {
-						dllmax[cnt] = dlli;
-					}
-				}
-				mask <<= 1;
-			}
-			passcnt++;
-		} else if (passcnt >= CBR_THRESHOLD2) {
-			break;
-		}
-	}
-	gold_sadj[0] = 0x0;
-	passcnt = 0;
-	for (cnt = 0; cnt < 16; cnt++) {
-		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
-			gold_sadj[0] += dllmin[cnt];
-			passcnt++;
-		}
-	}
-	if (retry++ > 10)
-		goto FINETUNE_DONE;
-	if (passcnt != 16) {
-		goto FINETUNE_START;
-	}
-	status = true;
-FINETUNE_DONE:
-	gold_sadj[0] = gold_sadj[0] >> 4;
-	gold_sadj[1] = gold_sadj[0];
-
-	data = 0;
-	for (cnt = 0; cnt < 8; cnt++) {
-		data >>= 3;
-		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
-			dlli = dllmin[cnt];
-			if (gold_sadj[0] >= dlli) {
-				dlli = ((gold_sadj[0] - dlli) * 19) >> 5;
-				if (dlli > 3) {
-					dlli = 3;
-				}
-			} else {
-				dlli = ((dlli - gold_sadj[0]) * 19) >> 5;
-				if (dlli > 4) {
-					dlli = 4;
-				}
-				dlli = (8 - dlli) & 0x7;
-			}
-			data |= dlli << 21;
-		}
-	}
-	ast_moutdwm(ast, 0x1E6E0080, data);
-
-	data = 0;
-	for (cnt = 8; cnt < 16; cnt++) {
-		data >>= 3;
-		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
-			dlli = dllmin[cnt];
-			if (gold_sadj[1] >= dlli) {
-				dlli = ((gold_sadj[1] - dlli) * 19) >> 5;
-				if (dlli > 3) {
-					dlli = 3;
-				} else {
-					dlli = (dlli - 1) & 0x7;
-				}
-			} else {
-				dlli = ((dlli - gold_sadj[1]) * 19) >> 5;
-				dlli += 1;
-				if (dlli > 4) {
-					dlli = 4;
-				}
-				dlli = (8 - dlli) & 0x7;
-			}
-			data |= dlli << 21;
-		}
-	}
-	ast_moutdwm(ast, 0x1E6E0084, data);
-	return status;
-} /* finetuneDQI_L */
-
-static void finetuneDQSI(struct ast_device *ast)
-{
-	u32 dlli, dqsip, dqidly;
-	u32 reg_mcr18, reg_mcr0c, passcnt[2], diff;
-	u32 g_dqidly, g_dqsip, g_margin, g_side;
-	u16 pass[32][2][2];
-	char tag[2][76];
-
-	/* Disable DQI CBR */
-	reg_mcr0c  = ast_mindwm(ast, 0x1E6E000C);
-	reg_mcr18  = ast_mindwm(ast, 0x1E6E0018);
-	reg_mcr18 &= 0x0000ffff;
-	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
-
-	for (dlli = 0; dlli < 76; dlli++) {
-		tag[0][dlli] = 0x0;
-		tag[1][dlli] = 0x0;
-	}
-	for (dqidly = 0; dqidly < 32; dqidly++) {
-		pass[dqidly][0][0] = 0xff;
-		pass[dqidly][0][1] = 0x0;
-		pass[dqidly][1][0] = 0xff;
-		pass[dqidly][1][1] = 0x0;
-	}
-	for (dqidly = 0; dqidly < 32; dqidly++) {
-		passcnt[0] = passcnt[1] = 0;
-		for (dqsip = 0; dqsip < 2; dqsip++) {
-			ast_moutdwm(ast, 0x1E6E000C, 0);
-			ast_moutdwm(ast, 0x1E6E0018, reg_mcr18 | (dqidly << 16) | (dqsip << 23));
-			ast_moutdwm(ast, 0x1E6E000C, reg_mcr0c);
-			for (dlli = 0; dlli < 76; dlli++) {
-				ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
-				ast_moutdwm(ast, 0x1E6E0070, 0);
-				ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE0);
-				if (cbr_scan3(ast)) {
-					if (dlli == 0)
-						break;
-					passcnt[dqsip]++;
-					tag[dqsip][dlli] = 'P';
-					if (dlli < pass[dqidly][dqsip][0])
-						pass[dqidly][dqsip][0] = (u16) dlli;
-					if (dlli > pass[dqidly][dqsip][1])
-						pass[dqidly][dqsip][1] = (u16) dlli;
-				} else if (passcnt[dqsip] >= 5)
-					break;
-				else {
-					pass[dqidly][dqsip][0] = 0xff;
-					pass[dqidly][dqsip][1] = 0x0;
-				}
-			}
-		}
-		if (passcnt[0] == 0 && passcnt[1] == 0)
-			dqidly++;
-	}
-	/* Search margin */
-	g_dqidly = g_dqsip = g_margin = g_side = 0;
-
-	for (dqidly = 0; dqidly < 32; dqidly++) {
-		for (dqsip = 0; dqsip < 2; dqsip++) {
-			if (pass[dqidly][dqsip][0] > pass[dqidly][dqsip][1])
-				continue;
-			diff = pass[dqidly][dqsip][1] - pass[dqidly][dqsip][0];
-			if ((diff+2) < g_margin)
-				continue;
-			passcnt[0] = passcnt[1] = 0;
-			for (dlli = pass[dqidly][dqsip][0]; dlli > 0  && tag[dqsip][dlli] != 0; dlli--, passcnt[0]++);
-			for (dlli = pass[dqidly][dqsip][1]; dlli < 76 && tag[dqsip][dlli] != 0; dlli++, passcnt[1]++);
-			if (passcnt[0] > passcnt[1])
-				passcnt[0] = passcnt[1];
-			passcnt[1] = 0;
-			if (passcnt[0] > g_side)
-				passcnt[1] = passcnt[0] - g_side;
-			if (diff > (g_margin+1) && (passcnt[1] > 0 || passcnt[0] > 8)) {
-				g_margin = diff;
-				g_dqidly = dqidly;
-				g_dqsip  = dqsip;
-				g_side   = passcnt[0];
-			} else if (passcnt[1] > 1 && g_side < 8) {
-				if (diff > g_margin)
-					g_margin = diff;
-				g_dqidly = dqidly;
-				g_dqsip  = dqsip;
-				g_side   = passcnt[0];
-			}
-		}
-	}
-	reg_mcr18 = reg_mcr18 | (g_dqidly << 16) | (g_dqsip << 23);
-	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
-
-}
-static bool cbr_dll2(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 dllmin[2], dllmax[2], dlli, data, passcnt, retry = 0;
-	bool status = false;
-
-	finetuneDQSI(ast);
-	if (finetuneDQI_L(ast, param) == false)
-		return status;
-
-CBR_START2:
-	dllmin[0] = dllmin[1] = 0xff;
-	dllmax[0] = dllmax[1] = 0x0;
-	passcnt = 0;
-	for (dlli = 0; dlli < 76; dlli++) {
-		ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
-		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE2);
-		data = cbr_scan(ast);
-		if (data != 0) {
-			if (data & 0x1) {
-				if (dllmin[0] > dlli) {
-					dllmin[0] = dlli;
-				}
-				if (dllmax[0] < dlli) {
-					dllmax[0] = dlli;
-				}
-			}
-			if (data & 0x2) {
-				if (dllmin[1] > dlli) {
-					dllmin[1] = dlli;
-				}
-				if (dllmax[1] < dlli) {
-					dllmax[1] = dlli;
-				}
-			}
-			passcnt++;
-		} else if (passcnt >= CBR_THRESHOLD) {
-			break;
-		}
-	}
-	if (retry++ > 10)
-		goto CBR_DONE2;
-	if (dllmax[0] == 0 || (dllmax[0]-dllmin[0]) < CBR_THRESHOLD) {
-		goto CBR_START2;
-	}
-	if (dllmax[1] == 0 || (dllmax[1]-dllmin[1]) < CBR_THRESHOLD) {
-		goto CBR_START2;
-	}
-	status = true;
-CBR_DONE2:
-	dlli  = (dllmin[1] + dllmax[1]) >> 1;
-	dlli <<= 8;
-	dlli += (dllmin[0] + dllmax[0]) >> 1;
-	ast_moutdwm(ast, 0x1E6E0068, ast_mindwm(ast, 0x1E720058) | (dlli << 16));
-	return status;
-} /* CBRDLL2 */
-
-static void get_ddr3_info(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 trap, trap_AC2, trap_MRS;
-
-	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
-
-	/* Ger trap info */
-	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
-	trap_AC2  = 0x00020000 + (trap << 16);
-	trap_AC2 |= 0x00300000 + ((trap & 0x2) << 19);
-	trap_MRS  = 0x00000010 + (trap << 4);
-	trap_MRS |= ((trap & 0x2) << 18);
-
-	param->reg_MADJ       = 0x00034C4C;
-	param->reg_SADJ       = 0x00001800;
-	param->reg_DRV        = 0x000000F0;
-	param->reg_PERIOD     = param->dram_freq;
-	param->rodt           = 0;
-
-	switch (param->dram_freq) {
-	case 336:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
-		param->wodt          = 0;
-		param->reg_AC1       = 0x22202725;
-		param->reg_AC2       = 0xAA007613 | trap_AC2;
-		param->reg_DQSIC     = 0x000000BA;
-		param->reg_MRS       = 0x04001400 | trap_MRS;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_IOZ       = 0x00000023;
-		param->reg_DQIDLY    = 0x00000074;
-		param->reg_FREQ      = 0x00004DC0;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 3;
-		switch (param->dram_chipid) {
-		default:
-		case AST_DRAM_512Mx16:
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xAA007613 | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xAA00761C | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xAA007636 | trap_AC2;
-			break;
-		}
-		break;
-	default:
-	case 396:
-		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
-		param->wodt          = 1;
-		param->reg_AC1       = 0x33302825;
-		param->reg_AC2       = 0xCC009617 | trap_AC2;
-		param->reg_DQSIC     = 0x000000E2;
-		param->reg_MRS       = 0x04001600 | trap_MRS;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_DQIDLY    = 0x00000089;
-		param->reg_FREQ      = 0x00005040;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 4;
-
-		switch (param->dram_chipid) {
-		default:
-		case AST_DRAM_512Mx16:
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xCC009617 | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xCC009622 | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xCC00963F | trap_AC2;
-			break;
-		}
-		break;
-
-	case 408:
-		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
-		param->wodt          = 1;
-		param->reg_AC1       = 0x33302825;
-		param->reg_AC2       = 0xCC009617 | trap_AC2;
-		param->reg_DQSIC     = 0x000000E2;
-		param->reg_MRS       = 0x04001600 | trap_MRS;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_IOZ       = 0x00000023;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_DQIDLY    = 0x00000089;
-		param->reg_FREQ      = 0x000050C0;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 4;
-
-		switch (param->dram_chipid) {
-		default:
-		case AST_DRAM_512Mx16:
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xCC009617 | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xCC009622 | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xCC00963F | trap_AC2;
-			break;
-		}
-
-		break;
-	case 456:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
-		param->wodt          = 0;
-		param->reg_AC1       = 0x33302926;
-		param->reg_AC2       = 0xCD44961A;
-		param->reg_DQSIC     = 0x000000FC;
-		param->reg_MRS       = 0x00081830;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_IOZ       = 0x00000045;
-		param->reg_DQIDLY    = 0x00000097;
-		param->reg_FREQ      = 0x000052C0;
-		param->madj_max      = 88;
-		param->dll2_finetune_step = 4;
-		break;
-	case 504:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0270);
-		param->wodt          = 1;
-		param->reg_AC1       = 0x33302926;
-		param->reg_AC2       = 0xDE44A61D;
-		param->reg_DQSIC     = 0x00000117;
-		param->reg_MRS       = 0x00081A30;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_IOZ       = 0x070000BB;
-		param->reg_DQIDLY    = 0x000000A0;
-		param->reg_FREQ      = 0x000054C0;
-		param->madj_max      = 79;
-		param->dll2_finetune_step = 4;
-		break;
-	case 528:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0290);
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x33302926;
-		param->reg_AC2       = 0xEF44B61E;
-		param->reg_DQSIC     = 0x00000125;
-		param->reg_MRS       = 0x00081A30;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x000000F5;
-		param->reg_IOZ       = 0x00000023;
-		param->reg_DQIDLY    = 0x00000088;
-		param->reg_FREQ      = 0x000055C0;
-		param->madj_max      = 76;
-		param->dll2_finetune_step = 3;
-		break;
-	case 576:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
-		param->reg_MADJ      = 0x00136868;
-		param->reg_SADJ      = 0x00004534;
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x33302A37;
-		param->reg_AC2       = 0xEF56B61E;
-		param->reg_DQSIC     = 0x0000013F;
-		param->reg_MRS       = 0x00101A50;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_IOZ       = 0x00000023;
-		param->reg_DQIDLY    = 0x00000078;
-		param->reg_FREQ      = 0x000057C0;
-		param->madj_max      = 136;
-		param->dll2_finetune_step = 3;
-		break;
-	case 600:
-		ast_moutdwm(ast, 0x1E6E2020, 0x02E1);
-		param->reg_MADJ      = 0x00136868;
-		param->reg_SADJ      = 0x00004534;
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x32302A37;
-		param->reg_AC2       = 0xDF56B61F;
-		param->reg_DQSIC     = 0x0000014D;
-		param->reg_MRS       = 0x00101A50;
-		param->reg_EMRS      = 0x00000004;
-		param->reg_DRV       = 0x000000F5;
-		param->reg_IOZ       = 0x00000023;
-		param->reg_DQIDLY    = 0x00000078;
-		param->reg_FREQ      = 0x000058C0;
-		param->madj_max      = 132;
-		param->dll2_finetune_step = 3;
-		break;
-	case 624:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0160);
-		param->reg_MADJ      = 0x00136868;
-		param->reg_SADJ      = 0x00004534;
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x32302A37;
-		param->reg_AC2       = 0xEF56B621;
-		param->reg_DQSIC     = 0x0000015A;
-		param->reg_MRS       = 0x02101A50;
-		param->reg_EMRS      = 0x00000004;
-		param->reg_DRV       = 0x000000F5;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x00000078;
-		param->reg_FREQ      = 0x000059C0;
-		param->madj_max      = 128;
-		param->dll2_finetune_step = 3;
-		break;
-	} /* switch freq */
-
-	switch (param->dram_chipid) {
-	case AST_DRAM_512Mx16:
-		param->dram_config = 0x130;
-		break;
-	default:
-	case AST_DRAM_1Gx16:
-		param->dram_config = 0x131;
-		break;
-	case AST_DRAM_2Gx16:
-		param->dram_config = 0x132;
-		break;
-	case AST_DRAM_4Gx16:
-		param->dram_config = 0x133;
-		break;
-	} /* switch size */
-
-	switch (param->vram_size) {
-	default:
-	case SZ_8M:
-		param->dram_config |= 0x00;
-		break;
-	case SZ_16M:
-		param->dram_config |= 0x04;
-		break;
-	case SZ_32M:
-		param->dram_config |= 0x08;
-		break;
-	case SZ_64M:
-		param->dram_config |= 0x0c;
-		break;
-	}
-
-}
-
-static void ddr3_init(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 data, data2, retry = 0;
-
-ddr3_init_start:
-	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
-	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
-	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0034, 0x00000000);
-	udelay(10);
-	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
-	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
-	udelay(10);
-	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
-	udelay(10);
-
-	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
-	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
-	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
-	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
-	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
-	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
-	ast_moutdwm(ast, 0x1E6E0018, 0x4000A170);
-	ast_moutdwm(ast, 0x1E6E0018, 0x00002370);
-	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0040, 0xFF444444);
-	ast_moutdwm(ast, 0x1E6E0044, 0x22222222);
-	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
-	ast_moutdwm(ast, 0x1E6E004C, 0x00000002);
-	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0054, 0);
-	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
-	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
-	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
-	/* Wait MCLK2X lock to MCLK */
-	do {
-		data = ast_mindwm(ast, 0x1E6E001C);
-	} while (!(data & 0x08000000));
-	data = ast_mindwm(ast, 0x1E6E001C);
-	data = (data >> 8) & 0xff;
-	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
-		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
-		if ((data2 & 0xff) > param->madj_max) {
-			break;
-		}
-		ast_moutdwm(ast, 0x1E6E0064, data2);
-		if (data2 & 0x00100000) {
-			data2 = ((data2 & 0xff) >> 3) + 3;
-		} else {
-			data2 = ((data2 & 0xff) >> 2) + 5;
-		}
-		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
-		data2 += data & 0xff;
-		data = data | (data2 << 8);
-		ast_moutdwm(ast, 0x1E6E0068, data);
-		udelay(10);
-		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
-		udelay(10);
-		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
-		ast_moutdwm(ast, 0x1E6E0018, data);
-		data = data | 0x200;
-		ast_moutdwm(ast, 0x1E6E0018, data);
-		do {
-			data = ast_mindwm(ast, 0x1E6E001C);
-		} while (!(data & 0x08000000));
-
-		data = ast_mindwm(ast, 0x1E6E001C);
-		data = (data >> 8) & 0xff;
-	}
-	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0068) & 0xffff);
-	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
-	ast_moutdwm(ast, 0x1E6E0018, data);
-
-	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
-	ast_moutdwm(ast, 0x1E6E000C, 0x00000040);
-	udelay(50);
-	/* Mode Register Setting */
-	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
-	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
-	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
-	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
-
-	ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
-	data = 0;
-	if (param->wodt) {
-		data = 0x300;
-	}
-	if (param->rodt) {
-		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
-	}
-	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
-
-	/* Calibrate the DQSI delay */
-	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
-		goto ddr3_init_start;
-
-	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
-	/* ECC Memory Initialization */
-#ifdef ECC
-	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0070, 0x221);
-	do {
-		data = ast_mindwm(ast, 0x1E6E0070);
-	} while (!(data & 0x00001000));
-	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
-#endif
-
-
-}
-
-static void get_ddr2_info(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 trap, trap_AC2, trap_MRS;
-
-	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
-
-	/* Ger trap info */
-	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
-	trap_AC2  = (trap << 20) | (trap << 16);
-	trap_AC2 += 0x00110000;
-	trap_MRS  = 0x00000040 | (trap << 4);
-
-
-	param->reg_MADJ       = 0x00034C4C;
-	param->reg_SADJ       = 0x00001800;
-	param->reg_DRV        = 0x000000F0;
-	param->reg_PERIOD     = param->dram_freq;
-	param->rodt           = 0;
-
-	switch (param->dram_freq) {
-	case 264:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0130);
-		param->wodt          = 0;
-		param->reg_AC1       = 0x11101513;
-		param->reg_AC2       = 0x78117011;
-		param->reg_DQSIC     = 0x00000092;
-		param->reg_MRS       = 0x00000842;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_DRV       = 0x000000F0;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x0000005A;
-		param->reg_FREQ      = 0x00004AC0;
-		param->madj_max      = 138;
-		param->dll2_finetune_step = 3;
-		break;
-	case 336:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
-		param->wodt          = 1;
-		param->reg_AC1       = 0x22202613;
-		param->reg_AC2       = 0xAA009016 | trap_AC2;
-		param->reg_DQSIC     = 0x000000BA;
-		param->reg_MRS       = 0x00000A02 | trap_MRS;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x00000074;
-		param->reg_FREQ      = 0x00004DC0;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 3;
-		switch (param->dram_chipid) {
-		default:
-		case AST_DRAM_512Mx16:
-			param->reg_AC2   = 0xAA009012 | trap_AC2;
-			break;
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xAA009016 | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xAA009023 | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xAA00903B | trap_AC2;
-			break;
-		}
-		break;
-	default:
-	case 396:
-		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
-		param->wodt          = 1;
-		param->rodt          = 0;
-		param->reg_AC1       = 0x33302714;
-		param->reg_AC2       = 0xCC00B01B | trap_AC2;
-		param->reg_DQSIC     = 0x000000E2;
-		param->reg_MRS       = 0x00000C02 | trap_MRS;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x00000089;
-		param->reg_FREQ      = 0x00005040;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 4;
-
-		switch (param->dram_chipid) {
-		case AST_DRAM_512Mx16:
-			param->reg_AC2   = 0xCC00B016 | trap_AC2;
-			break;
-		default:
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xCC00B01B | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xCC00B02B | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xCC00B03F | trap_AC2;
-			break;
-		}
-
-		break;
-
-	case 408:
-		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
-		param->wodt          = 1;
-		param->rodt          = 0;
-		param->reg_AC1       = 0x33302714;
-		param->reg_AC2       = 0xCC00B01B | trap_AC2;
-		param->reg_DQSIC     = 0x000000E2;
-		param->reg_MRS       = 0x00000C02 | trap_MRS;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x000000FA;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x00000089;
-		param->reg_FREQ      = 0x000050C0;
-		param->madj_max      = 96;
-		param->dll2_finetune_step = 4;
-
-		switch (param->dram_chipid) {
-		case AST_DRAM_512Mx16:
-			param->reg_AC2   = 0xCC00B016 | trap_AC2;
-			break;
-		default:
-		case AST_DRAM_1Gx16:
-			param->reg_AC2   = 0xCC00B01B | trap_AC2;
-			break;
-		case AST_DRAM_2Gx16:
-			param->reg_AC2   = 0xCC00B02B | trap_AC2;
-			break;
-		case AST_DRAM_4Gx16:
-			param->reg_AC2   = 0xCC00B03F | trap_AC2;
-			break;
-		}
-
-		break;
-	case 456:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
-		param->wodt          = 0;
-		param->reg_AC1       = 0x33302815;
-		param->reg_AC2       = 0xCD44B01E;
-		param->reg_DQSIC     = 0x000000FC;
-		param->reg_MRS       = 0x00000E72;
-		param->reg_EMRS      = 0x00000000;
-		param->reg_DRV       = 0x00000000;
-		param->reg_IOZ       = 0x00000034;
-		param->reg_DQIDLY    = 0x00000097;
-		param->reg_FREQ      = 0x000052C0;
-		param->madj_max      = 88;
-		param->dll2_finetune_step = 3;
-		break;
-	case 504:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0261);
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x33302815;
-		param->reg_AC2       = 0xDE44C022;
-		param->reg_DQSIC     = 0x00000117;
-		param->reg_MRS       = 0x00000E72;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x0000000A;
-		param->reg_IOZ       = 0x00000045;
-		param->reg_DQIDLY    = 0x000000A0;
-		param->reg_FREQ      = 0x000054C0;
-		param->madj_max      = 79;
-		param->dll2_finetune_step = 3;
-		break;
-	case 528:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0120);
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x33302815;
-		param->reg_AC2       = 0xEF44D024;
-		param->reg_DQSIC     = 0x00000125;
-		param->reg_MRS       = 0x00000E72;
-		param->reg_EMRS      = 0x00000004;
-		param->reg_DRV       = 0x000000F9;
-		param->reg_IOZ       = 0x00000045;
-		param->reg_DQIDLY    = 0x000000A7;
-		param->reg_FREQ      = 0x000055C0;
-		param->madj_max      = 76;
-		param->dll2_finetune_step = 3;
-		break;
-	case 552:
-		ast_moutdwm(ast, 0x1E6E2020, 0x02A1);
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x43402915;
-		param->reg_AC2       = 0xFF44E025;
-		param->reg_DQSIC     = 0x00000132;
-		param->reg_MRS       = 0x00000E72;
-		param->reg_EMRS      = 0x00000040;
-		param->reg_DRV       = 0x0000000A;
-		param->reg_IOZ       = 0x00000045;
-		param->reg_DQIDLY    = 0x000000AD;
-		param->reg_FREQ      = 0x000056C0;
-		param->madj_max      = 76;
-		param->dll2_finetune_step = 3;
-		break;
-	case 576:
-		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
-		param->wodt          = 1;
-		param->rodt          = 1;
-		param->reg_AC1       = 0x43402915;
-		param->reg_AC2       = 0xFF44E027;
-		param->reg_DQSIC     = 0x0000013F;
-		param->reg_MRS       = 0x00000E72;
-		param->reg_EMRS      = 0x00000004;
-		param->reg_DRV       = 0x000000F5;
-		param->reg_IOZ       = 0x00000045;
-		param->reg_DQIDLY    = 0x000000B3;
-		param->reg_FREQ      = 0x000057C0;
-		param->madj_max      = 76;
-		param->dll2_finetune_step = 3;
-		break;
-	}
-
-	switch (param->dram_chipid) {
-	case AST_DRAM_512Mx16:
-		param->dram_config = 0x100;
-		break;
-	default:
-	case AST_DRAM_1Gx16:
-		param->dram_config = 0x121;
-		break;
-	case AST_DRAM_2Gx16:
-		param->dram_config = 0x122;
-		break;
-	case AST_DRAM_4Gx16:
-		param->dram_config = 0x123;
-		break;
-	} /* switch size */
-
-	switch (param->vram_size) {
-	default:
-	case SZ_8M:
-		param->dram_config |= 0x00;
-		break;
-	case SZ_16M:
-		param->dram_config |= 0x04;
-		break;
-	case SZ_32M:
-		param->dram_config |= 0x08;
-		break;
-	case SZ_64M:
-		param->dram_config |= 0x0c;
-		break;
-	}
-}
-
-static void ddr2_init(struct ast_device *ast, struct ast2300_dram_param *param)
-{
-	u32 data, data2, retry = 0;
-
-ddr2_init_start:
-	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
-	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
-	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
-	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
-	udelay(10);
-	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
-	udelay(10);
-
-	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
-	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
-	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
-	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
-	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
-	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
-	ast_moutdwm(ast, 0x1E6E0018, 0x4000A130);
-	ast_moutdwm(ast, 0x1E6E0018, 0x00002330);
-	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0040, 0xFF808000);
-	ast_moutdwm(ast, 0x1E6E0044, 0x88848466);
-	ast_moutdwm(ast, 0x1E6E0048, 0x44440008);
-	ast_moutdwm(ast, 0x1E6E004C, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0054, 0);
-	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
-	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
-	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
-
-	/* Wait MCLK2X lock to MCLK */
-	do {
-		data = ast_mindwm(ast, 0x1E6E001C);
-	} while (!(data & 0x08000000));
-	data = ast_mindwm(ast, 0x1E6E001C);
-	data = (data >> 8) & 0xff;
-	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
-		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
-		if ((data2 & 0xff) > param->madj_max) {
-			break;
-		}
-		ast_moutdwm(ast, 0x1E6E0064, data2);
-		if (data2 & 0x00100000) {
-			data2 = ((data2 & 0xff) >> 3) + 3;
-		} else {
-			data2 = ((data2 & 0xff) >> 2) + 5;
-		}
-		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
-		data2 += data & 0xff;
-		data = data | (data2 << 8);
-		ast_moutdwm(ast, 0x1E6E0068, data);
-		udelay(10);
-		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
-		udelay(10);
-		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
-		ast_moutdwm(ast, 0x1E6E0018, data);
-		data = data | 0x200;
-		ast_moutdwm(ast, 0x1E6E0018, data);
-		do {
-			data = ast_mindwm(ast, 0x1E6E001C);
-		} while (!(data & 0x08000000));
-
-		data = ast_mindwm(ast, 0x1E6E001C);
-		data = (data >> 8) & 0xff;
-	}
-	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0008) & 0xffff);
-	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
-	ast_moutdwm(ast, 0x1E6E0018, data);
-
-	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
-	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
-	udelay(50);
-	/* Mode Register Setting */
-	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
-	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
-
-	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
-	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
-	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS | 0x380);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
-	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
-	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
-
-	ast_moutdwm(ast, 0x1E6E000C, 0x7FFF5C01);
-	data = 0;
-	if (param->wodt) {
-		data = 0x500;
-	}
-	if (param->rodt) {
-		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
-	}
-	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
-	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
-
-	/* Calibrate the DQSI delay */
-	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
-		goto ddr2_init_start;
-
-	/* ECC Memory Initialization */
-#ifdef ECC
-	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0070, 0x221);
-	do {
-		data = ast_mindwm(ast, 0x1E6E0070);
-	} while (!(data & 0x00001000));
-	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
-	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
-#endif
-
-}
-
-static void ast_post_chip_2300(struct ast_device *ast)
-{
-	struct ast2300_dram_param param;
-	u32 temp;
-	u8 reg;
-
-	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-	if ((reg & 0x80) == 0) {/* vga only */
-		ast_write32(ast, 0xf004, 0x1e6e0000);
-		ast_write32(ast, 0xf000, 0x1);
-		ast_write32(ast, 0x12000, 0x1688a8a8);
-		do {
-			;
-		} while (ast_read32(ast, 0x12000) != 0x1);
-
-		ast_write32(ast, 0x10000, 0xfc600309);
-		do {
-			;
-		} while (ast_read32(ast, 0x10000) != 0x1);
-
-		/* Slow down CPU/AHB CLK in VGA only mode */
-		temp = ast_read32(ast, 0x12008);
-		temp |= 0x73;
-		ast_write32(ast, 0x12008, temp);
-
-		param.dram_freq = 396;
-		param.dram_type = AST_DDR3;
-		temp = ast_mindwm(ast, 0x1e6e2070);
-		if (temp & 0x01000000)
-			param.dram_type = AST_DDR2;
-                switch (temp & 0x18000000) {
-		case 0:
-			param.dram_chipid = AST_DRAM_512Mx16;
-			break;
-		default:
-		case 0x08000000:
-			param.dram_chipid = AST_DRAM_1Gx16;
-			break;
-		case 0x10000000:
-			param.dram_chipid = AST_DRAM_2Gx16;
-			break;
-		case 0x18000000:
-			param.dram_chipid = AST_DRAM_4Gx16;
-			break;
-		}
-                switch (temp & 0x0c) {
-                default:
-		case 0x00:
-			param.vram_size = SZ_8M;
-			break;
-
-		case 0x04:
-			param.vram_size = SZ_16M;
-			break;
-
-		case 0x08:
-			param.vram_size = SZ_32M;
-			break;
-
-		case 0x0c:
-			param.vram_size = SZ_64M;
-			break;
-		}
-
-		if (param.dram_type == AST_DDR3) {
-			get_ddr3_info(ast, &param);
-			ddr3_init(ast, &param);
-		} else {
-			get_ddr2_info(ast, &param);
-			ddr2_init(ast, &param);
-		}
-
-		temp = ast_mindwm(ast, 0x1e6e2040);
-		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
-	}
-
-	/* wait ready */
-	do {
-		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-	} while ((reg & 0x40) == 0);
-}
-- 
2.50.0

Re: [PATCH 04/10] drm/ast: Move Gen4+ POST code to separate source file

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Move POST code for Gen4+ to separate source file and hide it in
> ast_2300_post(). With P2A configuration, it performs a full board
> POST and enables the transmitter chip; otherwise it only enables the
> transmitter chip.
> 
Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> Also fix coding style in several places. No changes to the overall
> logic.
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/Makefile   |    1 +
>   drivers/gpu/drm/ast/ast_2300.c | 1295 ++++++++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_drv.h  |    3 +
>   drivers/gpu/drm/ast/ast_post.c | 1265 +------------------------------
>   4 files changed, 1302 insertions(+), 1262 deletions(-)
>   create mode 100644 drivers/gpu/drm/ast/ast_2300.c
> 
> diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
> index 38374720e32e..ccb2ff3e8eac 100644
> --- a/drivers/gpu/drm/ast/Makefile
> +++ b/drivers/gpu/drm/ast/Makefile
> @@ -4,6 +4,7 @@
>   # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>   
>   ast-y := \
> +	ast_2300.o \
>   	ast_2500.o \
>   	ast_2600.o \
>   	ast_cursor.o \
> diff --git a/drivers/gpu/drm/ast/ast_2300.c b/drivers/gpu/drm/ast/ast_2300.c
> new file mode 100644
> index 000000000000..7a2c3fde09d2
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_2300.c
> @@ -0,0 +1,1295 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2012 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors: Dave Airlie <airlied@redhat.com>
> + */
> +
> +#include <linux/delay.h>
> +
> +#include "ast_drv.h"
> +#include "ast_post.h"
> +
> +/*
> + *  POST
> + */
> +
> +/* AST 2300 DRAM settings */
> +#define AST_DDR3 0
> +#define AST_DDR2 1
> +
> +struct ast2300_dram_param {
> +	u32 dram_type;
> +	u32 dram_chipid;
> +	u32 dram_freq;
> +	u32 vram_size;
> +	u32 odt;
> +	u32 wodt;
> +	u32 rodt;
> +	u32 dram_config;
> +	u32 reg_PERIOD;
> +	u32 reg_MADJ;
> +	u32 reg_SADJ;
> +	u32 reg_MRS;
> +	u32 reg_EMRS;
> +	u32 reg_AC1;
> +	u32 reg_AC2;
> +	u32 reg_DQSIC;
> +	u32 reg_DRV;
> +	u32 reg_IOZ;
> +	u32 reg_DQIDLY;
> +	u32 reg_FREQ;
> +	u32 madj_max;
> +	u32 dll2_finetune_step;
> +};
> +
> +/*
> + * DQSI DLL CBR Setting
> + */
> +#define CBR_SIZE0            ((1  << 10) - 1)
> +#define CBR_SIZE1            ((4  << 10) - 1)
> +#define CBR_SIZE2            ((64 << 10) - 1)
> +#define CBR_PASSNUM          5
> +#define CBR_PASSNUM2         5
> +#define CBR_THRESHOLD        10
> +#define CBR_THRESHOLD2       10
> +#define TIMEOUT              5000000
> +#define CBR_PATNUM           8
> +
> +static const u32 pattern[8] = {
> +	0xFF00FF00,
> +	0xCC33CC33,
> +	0xAA55AA55,
> +	0x88778877,
> +	0x92CC4D6E,
> +	0x543D3CDE,
> +	0xF1E843C7,
> +	0x7C61D253
> +};
> +
> +static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
> +{
> +	u32 data, timeout;
> +
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
> +	timeout = 0;
> +	do {
> +		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
> +		if (++timeout > TIMEOUT) {
> +			ast_moutdwm(ast, 0x1e6e0070, 0x0);
> +			return 0xffffffff;
> +		}
> +	} while (!data);
> +	data = ast_mindwm(ast, 0x1e6e0078);
> +	data = (data | (data >> 16)) & 0xffff;
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +	return data;
> +}
> +
> +static u32 mmc_test_burst2(struct ast_device *ast, u32 datagen)
> +{
> +	return mmc_test2(ast, datagen, 0x41);
> +}
> +
> +static bool mmc_test_single(struct ast_device *ast, u32 datagen)
> +{
> +	return mmc_test(ast, datagen, 0xc5);
> +}
> +
> +static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
> +{
> +	return mmc_test2(ast, datagen, 0x05);
> +}
> +
> +static int cbr_test(struct ast_device *ast)
> +{
> +	u32 data;
> +	int i;
> +
> +	data = mmc_test_single2(ast, 0);
> +	if ((data & 0xff) && (data & 0xff00))
> +		return 0;
> +	for (i = 0; i < 8; i++) {
> +		data = mmc_test_burst2(ast, i);
> +		if ((data & 0xff) && (data & 0xff00))
> +			return 0;
> +	}
> +	if (!data)
> +		return 3;
> +	else if (data & 0xff)
> +		return 2;
> +	return 1;
> +}
> +
> +static int cbr_scan(struct ast_device *ast)
> +{
> +	u32 data, data2, patcnt, loop;
> +
> +	data2 = 3;
> +	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> +		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> +		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
> +			data = cbr_test(ast);
> +			if (data != 0) {
> +				data2 &= data;
> +				if (!data2)
> +					return 0;
> +				break;
> +			}
> +		}
> +		if (loop == CBR_PASSNUM2)
> +			return 0;
> +	}
> +	return data2;
> +}
> +
> +static u32 cbr_test2(struct ast_device *ast)
> +{
> +	u32 data;
> +
> +	data = mmc_test_burst2(ast, 0);
> +	if (data == 0xffff)
> +		return 0;
> +	data |= mmc_test_single2(ast, 0);
> +	if (data == 0xffff)
> +		return 0;
> +
> +	return ~data & 0xffff;
> +}
> +
> +static u32 cbr_scan2(struct ast_device *ast)
> +{
> +	u32 data, data2, patcnt, loop;
> +
> +	data2 = 0xffff;
> +	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> +		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> +		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
> +			data = cbr_test2(ast);
> +			if (data != 0) {
> +				data2 &= data;
> +				if (!data2)
> +					return 0;
> +				break;
> +			}
> +		}
> +		if (loop == CBR_PASSNUM2)
> +			return 0;
> +	}
> +	return data2;
> +}
> +
> +static bool cbr_test3(struct ast_device *ast)
> +{
> +	if (!mmc_test_burst(ast, 0))
> +		return false;
> +	if (!mmc_test_single(ast, 0))
> +		return false;
> +	return true;
> +}
> +
> +static bool cbr_scan3(struct ast_device *ast)
> +{
> +	u32 patcnt, loop;
> +
> +	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> +		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> +		for (loop = 0; loop < 2; loop++) {
> +			if (cbr_test3(ast))
> +				break;
> +		}
> +		if (loop == 2)
> +			return false;
> +	}
> +	return true;
> +}
> +
> +static bool finetuneDQI_L(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 gold_sadj[2], dllmin[16], dllmax[16], dlli, data, cnt, mask, passcnt, retry = 0;
> +	bool status = false;
> +FINETUNE_START:
> +	for (cnt = 0; cnt < 16; cnt++) {
> +		dllmin[cnt] = 0xff;
> +		dllmax[cnt] = 0x0;
> +	}
> +	passcnt = 0;
> +	for (dlli = 0; dlli < 76; dlli++) {
> +		ast_moutdwm(ast, 0x1E6E0068, 0x00001400 | (dlli << 16) | (dlli << 24));
> +		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE1);
> +		data = cbr_scan2(ast);
> +		if (data != 0) {
> +			mask = 0x00010001;
> +			for (cnt = 0; cnt < 16; cnt++) {
> +				if (data & mask) {
> +					if (dllmin[cnt] > dlli)
> +						dllmin[cnt] = dlli;
> +					if (dllmax[cnt] < dlli)
> +						dllmax[cnt] = dlli;
> +				}
> +				mask <<= 1;
> +			}
> +			passcnt++;
> +		} else if (passcnt >= CBR_THRESHOLD2) {
> +			break;
> +		}
> +	}
> +	gold_sadj[0] = 0x0;
> +	passcnt = 0;
> +	for (cnt = 0; cnt < 16; cnt++) {
> +		if ((dllmax[cnt] > dllmin[cnt]) &&
> +		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> +			gold_sadj[0] += dllmin[cnt];
> +			passcnt++;
> +		}
> +	}
> +	if (retry++ > 10)
> +		goto FINETUNE_DONE;
> +	if (passcnt != 16)
> +		goto FINETUNE_START;
> +	status = true;
> +FINETUNE_DONE:
> +	gold_sadj[0] = gold_sadj[0] >> 4;
> +	gold_sadj[1] = gold_sadj[0];
> +
> +	data = 0;
> +	for (cnt = 0; cnt < 8; cnt++) {
> +		data >>= 3;
> +		if ((dllmax[cnt] > dllmin[cnt]) &&
> +		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> +			dlli = dllmin[cnt];
> +			if (gold_sadj[0] >= dlli) {
> +				dlli = ((gold_sadj[0] - dlli) * 19) >> 5;
> +				if (dlli > 3)
> +					dlli = 3;
> +			} else {
> +				dlli = ((dlli - gold_sadj[0]) * 19) >> 5;
> +				if (dlli > 4)
> +					dlli = 4;
> +				dlli = (8 - dlli) & 0x7;
> +			}
> +			data |= dlli << 21;
> +		}
> +	}
> +	ast_moutdwm(ast, 0x1E6E0080, data);
> +
> +	data = 0;
> +	for (cnt = 8; cnt < 16; cnt++) {
> +		data >>= 3;
> +		if ((dllmax[cnt] > dllmin[cnt]) &&
> +		    ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> +			dlli = dllmin[cnt];
> +			if (gold_sadj[1] >= dlli) {
> +				dlli = ((gold_sadj[1] - dlli) * 19) >> 5;
> +				if (dlli > 3)
> +					dlli = 3;
> +				else
> +					dlli = (dlli - 1) & 0x7;
> +			} else {
> +				dlli = ((dlli - gold_sadj[1]) * 19) >> 5;
> +				dlli += 1;
> +				if (dlli > 4)
> +					dlli = 4;
> +				dlli = (8 - dlli) & 0x7;
> +			}
> +			data |= dlli << 21;
> +		}
> +	}
> +	ast_moutdwm(ast, 0x1E6E0084, data);
> +	return status;
> +} /* finetuneDQI_L */
> +
> +static void finetuneDQSI(struct ast_device *ast)
> +{
> +	u32 dlli, dqsip, dqidly;
> +	u32 reg_mcr18, reg_mcr0c, passcnt[2], diff;
> +	u32 g_dqidly, g_dqsip, g_margin, g_side;
> +	u16 pass[32][2][2];
> +	char tag[2][76];
> +
> +	/* Disable DQI CBR */
> +	reg_mcr0c  = ast_mindwm(ast, 0x1E6E000C);
> +	reg_mcr18  = ast_mindwm(ast, 0x1E6E0018);
> +	reg_mcr18 &= 0x0000ffff;
> +	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
> +
> +	for (dlli = 0; dlli < 76; dlli++) {
> +		tag[0][dlli] = 0x0;
> +		tag[1][dlli] = 0x0;
> +	}
> +	for (dqidly = 0; dqidly < 32; dqidly++) {
> +		pass[dqidly][0][0] = 0xff;
> +		pass[dqidly][0][1] = 0x0;
> +		pass[dqidly][1][0] = 0xff;
> +		pass[dqidly][1][1] = 0x0;
> +	}
> +	for (dqidly = 0; dqidly < 32; dqidly++) {
> +		passcnt[0] = 0;
> +		passcnt[1] = 0;
> +		for (dqsip = 0; dqsip < 2; dqsip++) {
> +			ast_moutdwm(ast, 0x1E6E000C, 0);
> +			ast_moutdwm(ast, 0x1E6E0018, reg_mcr18 | (dqidly << 16) | (dqsip << 23));
> +			ast_moutdwm(ast, 0x1E6E000C, reg_mcr0c);
> +			for (dlli = 0; dlli < 76; dlli++) {
> +				ast_moutdwm(ast, 0x1E6E0068,
> +					    0x00001300 | (dlli << 16) | (dlli << 24));
> +				ast_moutdwm(ast, 0x1E6E0070, 0);
> +				ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE0);
> +				if (cbr_scan3(ast)) {
> +					if (dlli == 0)
> +						break;
> +					passcnt[dqsip]++;
> +					tag[dqsip][dlli] = 'P';
> +					if (dlli < pass[dqidly][dqsip][0])
> +						pass[dqidly][dqsip][0] = (u16)dlli;
> +					if (dlli > pass[dqidly][dqsip][1])
> +						pass[dqidly][dqsip][1] = (u16)dlli;
> +				} else if (passcnt[dqsip] >= 5) {
> +					break;
> +				} else {
> +					pass[dqidly][dqsip][0] = 0xff;
> +					pass[dqidly][dqsip][1] = 0x0;
> +				}
> +			}
> +		}
> +		if (passcnt[0] == 0 && passcnt[1] == 0)
> +			dqidly++;
> +	}
> +	/* Search margin */
> +	g_dqidly = 0;
> +	g_dqsip = 0;
> +	g_margin = 0;
> +	g_side = 0;
> +
> +	for (dqidly = 0; dqidly < 32; dqidly++) {
> +		for (dqsip = 0; dqsip < 2; dqsip++) {
> +			if (pass[dqidly][dqsip][0] > pass[dqidly][dqsip][1])
> +				continue;
> +			diff = pass[dqidly][dqsip][1] - pass[dqidly][dqsip][0];
> +			if ((diff + 2) < g_margin)
> +				continue;
> +			passcnt[0] = 0;
> +			passcnt[1] = 0;
> +			for (dlli = pass[dqidly][dqsip][0];
> +			     dlli > 0 && tag[dqsip][dlli] != 0;
> +			     dlli--, passcnt[0]++) {
> +			}
> +			for (dlli = pass[dqidly][dqsip][1];
> +			     dlli < 76 && tag[dqsip][dlli] != 0;
> +			     dlli++, passcnt[1]++) {
> +			}
> +			if (passcnt[0] > passcnt[1])
> +				passcnt[0] = passcnt[1];
> +			passcnt[1] = 0;
> +			if (passcnt[0] > g_side)
> +				passcnt[1] = passcnt[0] - g_side;
> +			if (diff > (g_margin + 1) && (passcnt[1] > 0 || passcnt[0] > 8)) {
> +				g_margin = diff;
> +				g_dqidly = dqidly;
> +				g_dqsip  = dqsip;
> +				g_side   = passcnt[0];
> +			} else if (passcnt[1] > 1 && g_side < 8) {
> +				if (diff > g_margin)
> +					g_margin = diff;
> +				g_dqidly = dqidly;
> +				g_dqsip  = dqsip;
> +				g_side   = passcnt[0];
> +			}
> +		}
> +	}
> +	reg_mcr18 = reg_mcr18 | (g_dqidly << 16) | (g_dqsip << 23);
> +	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
> +}
> +
> +static bool cbr_dll2(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 dllmin[2], dllmax[2], dlli, data, passcnt, retry = 0;
> +	bool status = false;
> +
> +	finetuneDQSI(ast);
> +	if (finetuneDQI_L(ast, param) == false)
> +		return status;
> +
> +CBR_START2:
> +	dllmin[0] = 0xff;
> +	dllmin[1] = 0xff;
> +	dllmax[0] = 0x0;
> +	dllmax[1] = 0x0;
> +	passcnt = 0;
> +	for (dlli = 0; dlli < 76; dlli++) {
> +		ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
> +		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE2);
> +		data = cbr_scan(ast);
> +		if (data != 0) {
> +			if (data & 0x1) {
> +				if (dllmin[0] > dlli)
> +					dllmin[0] = dlli;
> +				if (dllmax[0] < dlli)
> +					dllmax[0] = dlli;
> +			}
> +			if (data & 0x2) {
> +				if (dllmin[1] > dlli)
> +					dllmin[1] = dlli;
> +				if (dllmax[1] < dlli)
> +					dllmax[1] = dlli;
> +			}
> +			passcnt++;
> +		} else if (passcnt >= CBR_THRESHOLD) {
> +			break;
> +		}
> +	}
> +	if (retry++ > 10)
> +		goto CBR_DONE2;
> +	if (dllmax[0] == 0 || (dllmax[0] - dllmin[0]) < CBR_THRESHOLD)
> +		goto CBR_START2;
> +	if (dllmax[1] == 0 || (dllmax[1] - dllmin[1]) < CBR_THRESHOLD)
> +		goto CBR_START2;
> +	status = true;
> +CBR_DONE2:
> +	dlli  = (dllmin[1] + dllmax[1]) >> 1;
> +	dlli <<= 8;
> +	dlli += (dllmin[0] + dllmax[0]) >> 1;
> +	ast_moutdwm(ast, 0x1E6E0068, ast_mindwm(ast, 0x1E720058) | (dlli << 16));
> +	return status;
> +} /* CBRDLL2 */
> +
> +static void get_ddr3_info(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 trap, trap_AC2, trap_MRS;
> +
> +	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> +
> +	/* Ger trap info */
> +	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
> +	trap_AC2  = 0x00020000 + (trap << 16);
> +	trap_AC2 |= 0x00300000 + ((trap & 0x2) << 19);
> +	trap_MRS  = 0x00000010 + (trap << 4);
> +	trap_MRS |= ((trap & 0x2) << 18);
> +
> +	param->reg_MADJ       = 0x00034C4C;
> +	param->reg_SADJ       = 0x00001800;
> +	param->reg_DRV        = 0x000000F0;
> +	param->reg_PERIOD     = param->dram_freq;
> +	param->rodt           = 0;
> +
> +	switch (param->dram_freq) {
> +	case 336:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
> +		param->wodt          = 0;
> +		param->reg_AC1       = 0x22202725;
> +		param->reg_AC2       = 0xAA007613 | trap_AC2;
> +		param->reg_DQSIC     = 0x000000BA;
> +		param->reg_MRS       = 0x04001400 | trap_MRS;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_IOZ       = 0x00000023;
> +		param->reg_DQIDLY    = 0x00000074;
> +		param->reg_FREQ      = 0x00004DC0;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 3;
> +		switch (param->dram_chipid) {
> +		default:
> +		case AST_DRAM_512Mx16:
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xAA007613 | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xAA00761C | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xAA007636 | trap_AC2;
> +			break;
> +		}
> +		break;
> +	default:
> +	case 396:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
> +		param->wodt          = 1;
> +		param->reg_AC1       = 0x33302825;
> +		param->reg_AC2       = 0xCC009617 | trap_AC2;
> +		param->reg_DQSIC     = 0x000000E2;
> +		param->reg_MRS       = 0x04001600 | trap_MRS;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_DQIDLY    = 0x00000089;
> +		param->reg_FREQ      = 0x00005040;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 4;
> +
> +		switch (param->dram_chipid) {
> +		default:
> +		case AST_DRAM_512Mx16:
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xCC009617 | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xCC009622 | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xCC00963F | trap_AC2;
> +			break;
> +		}
> +		break;
> +
> +	case 408:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
> +		param->wodt          = 1;
> +		param->reg_AC1       = 0x33302825;
> +		param->reg_AC2       = 0xCC009617 | trap_AC2;
> +		param->reg_DQSIC     = 0x000000E2;
> +		param->reg_MRS       = 0x04001600 | trap_MRS;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_IOZ       = 0x00000023;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_DQIDLY    = 0x00000089;
> +		param->reg_FREQ      = 0x000050C0;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 4;
> +
> +		switch (param->dram_chipid) {
> +		default:
> +		case AST_DRAM_512Mx16:
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xCC009617 | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xCC009622 | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xCC00963F | trap_AC2;
> +			break;
> +		}
> +
> +		break;
> +	case 456:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
> +		param->wodt          = 0;
> +		param->reg_AC1       = 0x33302926;
> +		param->reg_AC2       = 0xCD44961A;
> +		param->reg_DQSIC     = 0x000000FC;
> +		param->reg_MRS       = 0x00081830;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_IOZ       = 0x00000045;
> +		param->reg_DQIDLY    = 0x00000097;
> +		param->reg_FREQ      = 0x000052C0;
> +		param->madj_max      = 88;
> +		param->dll2_finetune_step = 4;
> +		break;
> +	case 504:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0270);
> +		param->wodt          = 1;
> +		param->reg_AC1       = 0x33302926;
> +		param->reg_AC2       = 0xDE44A61D;
> +		param->reg_DQSIC     = 0x00000117;
> +		param->reg_MRS       = 0x00081A30;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_IOZ       = 0x070000BB;
> +		param->reg_DQIDLY    = 0x000000A0;
> +		param->reg_FREQ      = 0x000054C0;
> +		param->madj_max      = 79;
> +		param->dll2_finetune_step = 4;
> +		break;
> +	case 528:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0290);
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x33302926;
> +		param->reg_AC2       = 0xEF44B61E;
> +		param->reg_DQSIC     = 0x00000125;
> +		param->reg_MRS       = 0x00081A30;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x000000F5;
> +		param->reg_IOZ       = 0x00000023;
> +		param->reg_DQIDLY    = 0x00000088;
> +		param->reg_FREQ      = 0x000055C0;
> +		param->madj_max      = 76;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 576:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
> +		param->reg_MADJ      = 0x00136868;
> +		param->reg_SADJ      = 0x00004534;
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x33302A37;
> +		param->reg_AC2       = 0xEF56B61E;
> +		param->reg_DQSIC     = 0x0000013F;
> +		param->reg_MRS       = 0x00101A50;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_IOZ       = 0x00000023;
> +		param->reg_DQIDLY    = 0x00000078;
> +		param->reg_FREQ      = 0x000057C0;
> +		param->madj_max      = 136;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 600:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x02E1);
> +		param->reg_MADJ      = 0x00136868;
> +		param->reg_SADJ      = 0x00004534;
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x32302A37;
> +		param->reg_AC2       = 0xDF56B61F;
> +		param->reg_DQSIC     = 0x0000014D;
> +		param->reg_MRS       = 0x00101A50;
> +		param->reg_EMRS      = 0x00000004;
> +		param->reg_DRV       = 0x000000F5;
> +		param->reg_IOZ       = 0x00000023;
> +		param->reg_DQIDLY    = 0x00000078;
> +		param->reg_FREQ      = 0x000058C0;
> +		param->madj_max      = 132;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 624:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0160);
> +		param->reg_MADJ      = 0x00136868;
> +		param->reg_SADJ      = 0x00004534;
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x32302A37;
> +		param->reg_AC2       = 0xEF56B621;
> +		param->reg_DQSIC     = 0x0000015A;
> +		param->reg_MRS       = 0x02101A50;
> +		param->reg_EMRS      = 0x00000004;
> +		param->reg_DRV       = 0x000000F5;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x00000078;
> +		param->reg_FREQ      = 0x000059C0;
> +		param->madj_max      = 128;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	} /* switch freq */
> +
> +	switch (param->dram_chipid) {
> +	case AST_DRAM_512Mx16:
> +		param->dram_config = 0x130;
> +		break;
> +	default:
> +	case AST_DRAM_1Gx16:
> +		param->dram_config = 0x131;
> +		break;
> +	case AST_DRAM_2Gx16:
> +		param->dram_config = 0x132;
> +		break;
> +	case AST_DRAM_4Gx16:
> +		param->dram_config = 0x133;
> +		break;
> +	} /* switch size */
> +
> +	switch (param->vram_size) {
> +	default:
> +	case SZ_8M:
> +		param->dram_config |= 0x00;
> +		break;
> +	case SZ_16M:
> +		param->dram_config |= 0x04;
> +		break;
> +	case SZ_32M:
> +		param->dram_config |= 0x08;
> +		break;
> +	case SZ_64M:
> +		param->dram_config |= 0x0c;
> +		break;
> +	}
> +}
> +
> +static void ddr3_init(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 data, data2, retry = 0;
> +
> +ddr3_init_start:
> +	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
> +	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00000000);
> +	udelay(10);
> +	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
> +	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
> +	udelay(10);
> +	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
> +	udelay(10);
> +
> +	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
> +	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
> +	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
> +	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
> +	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
> +	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x4000A170);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x00002370);
> +	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0040, 0xFF444444);
> +	ast_moutdwm(ast, 0x1E6E0044, 0x22222222);
> +	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
> +	ast_moutdwm(ast, 0x1E6E004C, 0x00000002);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0054, 0);
> +	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
> +	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
> +	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> +	/* Wait MCLK2X lock to MCLK */
> +	do {
> +		data = ast_mindwm(ast, 0x1E6E001C);
> +	} while (!(data & 0x08000000));
> +	data = ast_mindwm(ast, 0x1E6E001C);
> +	data = (data >> 8) & 0xff;
> +	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
> +		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
> +		if ((data2 & 0xff) > param->madj_max)
> +			break;
> +		ast_moutdwm(ast, 0x1E6E0064, data2);
> +		if (data2 & 0x00100000)
> +			data2 = ((data2 & 0xff) >> 3) + 3;
> +		else
> +			data2 = ((data2 & 0xff) >> 2) + 5;
> +		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
> +		data2 += data & 0xff;
> +		data = data | (data2 << 8);
> +		ast_moutdwm(ast, 0x1E6E0068, data);
> +		udelay(10);
> +		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
> +		udelay(10);
> +		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
> +		ast_moutdwm(ast, 0x1E6E0018, data);
> +		data = data | 0x200;
> +		ast_moutdwm(ast, 0x1E6E0018, data);
> +		do {
> +			data = ast_mindwm(ast, 0x1E6E001C);
> +		} while (!(data & 0x08000000));
> +
> +		data = ast_mindwm(ast, 0x1E6E001C);
> +		data = (data >> 8) & 0xff;
> +	}
> +	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0068) & 0xffff);
> +	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
> +	ast_moutdwm(ast, 0x1E6E0018, data);
> +
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00000040);
> +	udelay(50);
> +	/* Mode Register Setting */
> +	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
> +	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> +	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> +
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> +	data = 0;
> +	if (param->wodt)
> +		data = 0x300;
> +	if (param->rodt)
> +		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
> +	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
> +
> +	/* Calibrate the DQSI delay */
> +	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
> +		goto ddr3_init_start;
> +
> +	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
> +	/* ECC Memory Initialization */
> +#ifdef ECC
> +	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0070, 0x221);
> +	do {
> +		data = ast_mindwm(ast, 0x1E6E0070);
> +	} while (!(data & 0x00001000));
> +	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> +#endif
> +}
> +
> +static void get_ddr2_info(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 trap, trap_AC2, trap_MRS;
> +
> +	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> +
> +	/* Ger trap info */
> +	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
> +	trap_AC2  = (trap << 20) | (trap << 16);
> +	trap_AC2 += 0x00110000;
> +	trap_MRS  = 0x00000040 | (trap << 4);
> +
> +	param->reg_MADJ       = 0x00034C4C;
> +	param->reg_SADJ       = 0x00001800;
> +	param->reg_DRV        = 0x000000F0;
> +	param->reg_PERIOD     = param->dram_freq;
> +	param->rodt           = 0;
> +
> +	switch (param->dram_freq) {
> +	case 264:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0130);
> +		param->wodt          = 0;
> +		param->reg_AC1       = 0x11101513;
> +		param->reg_AC2       = 0x78117011;
> +		param->reg_DQSIC     = 0x00000092;
> +		param->reg_MRS       = 0x00000842;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_DRV       = 0x000000F0;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x0000005A;
> +		param->reg_FREQ      = 0x00004AC0;
> +		param->madj_max      = 138;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 336:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
> +		param->wodt          = 1;
> +		param->reg_AC1       = 0x22202613;
> +		param->reg_AC2       = 0xAA009016 | trap_AC2;
> +		param->reg_DQSIC     = 0x000000BA;
> +		param->reg_MRS       = 0x00000A02 | trap_MRS;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x00000074;
> +		param->reg_FREQ      = 0x00004DC0;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 3;
> +		switch (param->dram_chipid) {
> +		default:
> +		case AST_DRAM_512Mx16:
> +			param->reg_AC2   = 0xAA009012 | trap_AC2;
> +			break;
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xAA009016 | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xAA009023 | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xAA00903B | trap_AC2;
> +			break;
> +		}
> +		break;
> +	default:
> +	case 396:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
> +		param->wodt          = 1;
> +		param->rodt          = 0;
> +		param->reg_AC1       = 0x33302714;
> +		param->reg_AC2       = 0xCC00B01B | trap_AC2;
> +		param->reg_DQSIC     = 0x000000E2;
> +		param->reg_MRS       = 0x00000C02 | trap_MRS;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x00000089;
> +		param->reg_FREQ      = 0x00005040;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 4;
> +
> +		switch (param->dram_chipid) {
> +		case AST_DRAM_512Mx16:
> +			param->reg_AC2   = 0xCC00B016 | trap_AC2;
> +			break;
> +		default:
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xCC00B01B | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xCC00B02B | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xCC00B03F | trap_AC2;
> +			break;
> +		}
> +
> +		break;
> +
> +	case 408:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
> +		param->wodt          = 1;
> +		param->rodt          = 0;
> +		param->reg_AC1       = 0x33302714;
> +		param->reg_AC2       = 0xCC00B01B | trap_AC2;
> +		param->reg_DQSIC     = 0x000000E2;
> +		param->reg_MRS       = 0x00000C02 | trap_MRS;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x000000FA;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x00000089;
> +		param->reg_FREQ      = 0x000050C0;
> +		param->madj_max      = 96;
> +		param->dll2_finetune_step = 4;
> +
> +		switch (param->dram_chipid) {
> +		case AST_DRAM_512Mx16:
> +			param->reg_AC2   = 0xCC00B016 | trap_AC2;
> +			break;
> +		default:
> +		case AST_DRAM_1Gx16:
> +			param->reg_AC2   = 0xCC00B01B | trap_AC2;
> +			break;
> +		case AST_DRAM_2Gx16:
> +			param->reg_AC2   = 0xCC00B02B | trap_AC2;
> +			break;
> +		case AST_DRAM_4Gx16:
> +			param->reg_AC2   = 0xCC00B03F | trap_AC2;
> +			break;
> +		}
> +
> +		break;
> +	case 456:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
> +		param->wodt          = 0;
> +		param->reg_AC1       = 0x33302815;
> +		param->reg_AC2       = 0xCD44B01E;
> +		param->reg_DQSIC     = 0x000000FC;
> +		param->reg_MRS       = 0x00000E72;
> +		param->reg_EMRS      = 0x00000000;
> +		param->reg_DRV       = 0x00000000;
> +		param->reg_IOZ       = 0x00000034;
> +		param->reg_DQIDLY    = 0x00000097;
> +		param->reg_FREQ      = 0x000052C0;
> +		param->madj_max      = 88;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 504:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0261);
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x33302815;
> +		param->reg_AC2       = 0xDE44C022;
> +		param->reg_DQSIC     = 0x00000117;
> +		param->reg_MRS       = 0x00000E72;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x0000000A;
> +		param->reg_IOZ       = 0x00000045;
> +		param->reg_DQIDLY    = 0x000000A0;
> +		param->reg_FREQ      = 0x000054C0;
> +		param->madj_max      = 79;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 528:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0120);
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x33302815;
> +		param->reg_AC2       = 0xEF44D024;
> +		param->reg_DQSIC     = 0x00000125;
> +		param->reg_MRS       = 0x00000E72;
> +		param->reg_EMRS      = 0x00000004;
> +		param->reg_DRV       = 0x000000F9;
> +		param->reg_IOZ       = 0x00000045;
> +		param->reg_DQIDLY    = 0x000000A7;
> +		param->reg_FREQ      = 0x000055C0;
> +		param->madj_max      = 76;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 552:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x02A1);
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x43402915;
> +		param->reg_AC2       = 0xFF44E025;
> +		param->reg_DQSIC     = 0x00000132;
> +		param->reg_MRS       = 0x00000E72;
> +		param->reg_EMRS      = 0x00000040;
> +		param->reg_DRV       = 0x0000000A;
> +		param->reg_IOZ       = 0x00000045;
> +		param->reg_DQIDLY    = 0x000000AD;
> +		param->reg_FREQ      = 0x000056C0;
> +		param->madj_max      = 76;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	case 576:
> +		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
> +		param->wodt          = 1;
> +		param->rodt          = 1;
> +		param->reg_AC1       = 0x43402915;
> +		param->reg_AC2       = 0xFF44E027;
> +		param->reg_DQSIC     = 0x0000013F;
> +		param->reg_MRS       = 0x00000E72;
> +		param->reg_EMRS      = 0x00000004;
> +		param->reg_DRV       = 0x000000F5;
> +		param->reg_IOZ       = 0x00000045;
> +		param->reg_DQIDLY    = 0x000000B3;
> +		param->reg_FREQ      = 0x000057C0;
> +		param->madj_max      = 76;
> +		param->dll2_finetune_step = 3;
> +		break;
> +	}
> +
> +	switch (param->dram_chipid) {
> +	case AST_DRAM_512Mx16:
> +		param->dram_config = 0x100;
> +		break;
> +	default:
> +	case AST_DRAM_1Gx16:
> +		param->dram_config = 0x121;
> +		break;
> +	case AST_DRAM_2Gx16:
> +		param->dram_config = 0x122;
> +		break;
> +	case AST_DRAM_4Gx16:
> +		param->dram_config = 0x123;
> +		break;
> +	} /* switch size */
> +
> +	switch (param->vram_size) {
> +	default:
> +	case SZ_8M:
> +		param->dram_config |= 0x00;
> +		break;
> +	case SZ_16M:
> +		param->dram_config |= 0x04;
> +		break;
> +	case SZ_32M:
> +		param->dram_config |= 0x08;
> +		break;
> +	case SZ_64M:
> +		param->dram_config |= 0x0c;
> +		break;
> +	}
> +}
> +
> +static void ddr2_init(struct ast_device *ast, struct ast2300_dram_param *param)
> +{
> +	u32 data, data2, retry = 0;
> +
> +ddr2_init_start:
> +	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
> +	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
> +	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
> +	udelay(10);
> +	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
> +	udelay(10);
> +
> +	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
> +	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
> +	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
> +	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
> +	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
> +	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x4000A130);
> +	ast_moutdwm(ast, 0x1E6E0018, 0x00002330);
> +	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0040, 0xFF808000);
> +	ast_moutdwm(ast, 0x1E6E0044, 0x88848466);
> +	ast_moutdwm(ast, 0x1E6E0048, 0x44440008);
> +	ast_moutdwm(ast, 0x1E6E004C, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0054, 0);
> +	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
> +	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
> +	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> +
> +	/* Wait MCLK2X lock to MCLK */
> +	do {
> +		data = ast_mindwm(ast, 0x1E6E001C);
> +	} while (!(data & 0x08000000));
> +	data = ast_mindwm(ast, 0x1E6E001C);
> +	data = (data >> 8) & 0xff;
> +	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
> +		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
> +		if ((data2 & 0xff) > param->madj_max)
> +			break;
> +		ast_moutdwm(ast, 0x1E6E0064, data2);
> +		if (data2 & 0x00100000)
> +			data2 = ((data2 & 0xff) >> 3) + 3;
> +		else
> +			data2 = ((data2 & 0xff) >> 2) + 5;
> +		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
> +		data2 += data & 0xff;
> +		data = data | (data2 << 8);
> +		ast_moutdwm(ast, 0x1E6E0068, data);
> +		udelay(10);
> +		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
> +		udelay(10);
> +		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
> +		ast_moutdwm(ast, 0x1E6E0018, data);
> +		data = data | 0x200;
> +		ast_moutdwm(ast, 0x1E6E0018, data);
> +		do {
> +			data = ast_mindwm(ast, 0x1E6E001C);
> +		} while (!(data & 0x08000000));
> +
> +		data = ast_mindwm(ast, 0x1E6E001C);
> +		data = (data >> 8) & 0xff;
> +	}
> +	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0008) & 0xffff);
> +	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
> +	ast_moutdwm(ast, 0x1E6E0018, data);
> +
> +	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> +	udelay(50);
> +	/* Mode Register Setting */
> +	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
> +	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> +
> +	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
> +	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> +	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS | 0x380);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> +	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> +	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> +
> +	ast_moutdwm(ast, 0x1E6E000C, 0x7FFF5C01);
> +	data = 0;
> +	if (param->wodt)
> +		data = 0x500;
> +	if (param->rodt)
> +		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
> +	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
> +	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
> +
> +	/* Calibrate the DQSI delay */
> +	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
> +		goto ddr2_init_start;
> +
> +	/* ECC Memory Initialization */
> +#ifdef ECC
> +	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0070, 0x221);
> +	do {
> +		data = ast_mindwm(ast, 0x1E6E0070);
> +	} while (!(data & 0x00001000));
> +	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> +	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> +#endif
> +}
> +
> +static void ast_post_chip_2300(struct ast_device *ast)
> +{
> +	struct ast2300_dram_param param;
> +	u32 temp;
> +	u8 reg;
> +
> +	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	if ((reg & 0x80) == 0) {/* vga only */
> +		ast_write32(ast, 0xf004, 0x1e6e0000);
> +		ast_write32(ast, 0xf000, 0x1);
> +		ast_write32(ast, 0x12000, 0x1688a8a8);
> +		do {
> +			;
> +		} while (ast_read32(ast, 0x12000) != 0x1);
> +
> +		ast_write32(ast, 0x10000, 0xfc600309);
> +		do {
> +			;
> +		} while (ast_read32(ast, 0x10000) != 0x1);
> +
> +		/* Slow down CPU/AHB CLK in VGA only mode */
> +		temp = ast_read32(ast, 0x12008);
> +		temp |= 0x73;
> +		ast_write32(ast, 0x12008, temp);
> +
> +		param.dram_freq = 396;
> +		param.dram_type = AST_DDR3;
> +		temp = ast_mindwm(ast, 0x1e6e2070);
> +		if (temp & 0x01000000)
> +			param.dram_type = AST_DDR2;
> +		switch (temp & 0x18000000) {
> +		case 0:
> +			param.dram_chipid = AST_DRAM_512Mx16;
> +			break;
> +		default:
> +		case 0x08000000:
> +			param.dram_chipid = AST_DRAM_1Gx16;
> +			break;
> +		case 0x10000000:
> +			param.dram_chipid = AST_DRAM_2Gx16;
> +			break;
> +		case 0x18000000:
> +			param.dram_chipid = AST_DRAM_4Gx16;
> +			break;
> +		}
> +		switch (temp & 0x0c) {
> +		default:
> +		case 0x00:
> +			param.vram_size = SZ_8M;
> +			break;
> +		case 0x04:
> +			param.vram_size = SZ_16M;
> +			break;
> +		case 0x08:
> +			param.vram_size = SZ_32M;
> +			break;
> +		case 0x0c:
> +			param.vram_size = SZ_64M;
> +			break;
> +		}
> +
> +		if (param.dram_type == AST_DDR3) {
> +			get_ddr3_info(ast, &param);
> +			ddr3_init(ast, &param);
> +		} else {
> +			get_ddr2_info(ast, &param);
> +			ddr2_init(ast, &param);
> +		}
> +
> +		temp = ast_mindwm(ast, 0x1e6e2040);
> +		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
> +	}
> +
> +	/* wait ready */
> +	do {
> +		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	} while ((reg & 0x40) == 0);
> +}
> +
> +int ast_2300_post(struct ast_device *ast)
> +{
> +	if (ast->config_mode == ast_use_p2a) {
> +		ast_post_chip_2300(ast);
> +		ast_init_3rdtx(ast);
> +	} else {
> +		if (ast->tx_chip == AST_TX_SIL164) {
> +			/* Enable DVO */
> +			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> +		}
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 4a92c377e9bd..653e93b05859 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -417,6 +417,9 @@ struct ast_crtc_state {
>   
>   int ast_mm_init(struct ast_device *ast);
>   
> +/* ast_2300.c */
> +int ast_2300_post(struct ast_device *ast);
> +
>   /* ast_2500.c */
>   void ast_2500_patch_ahb(void __iomem *regs);
>   int ast_2500_post(struct ast_device *ast);
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 0d99270b58c4..a08264210d77 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -35,8 +35,6 @@
>   #include "ast_drv.h"
>   #include "ast_post.h"
>   
> -static void ast_post_chip_2300(struct ast_device *ast);
> -
>   static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
>   static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
>   
> @@ -355,15 +353,9 @@ int ast_post_gpu(struct ast_device *ast)
>   		if (ret)
>   			return ret;
>   	} else if (AST_GEN(ast) >= 4) {
> -		if (ast->config_mode == ast_use_p2a) {
> -			ast_post_chip_2300(ast);
> -			ast_init_3rdtx(ast);
> -		} else {
> -			if (ast->tx_chip == AST_TX_SIL164) {
> -				/* Enable DVO */
> -				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> -			}
> -		}
> +		ret = ast_2300_post(ast);
> +		if (ret)
> +			return ret;
>   	} else  {
>   		if (ast->config_mode == ast_use_p2a) {
>   			ast_init_dram_reg(ast);
> @@ -378,58 +370,7 @@ int ast_post_gpu(struct ast_device *ast)
>   	return 0;
>   }
>   
> -/* AST 2300 DRAM settings */
> -#define AST_DDR3 0
> -#define AST_DDR2 1
> -
> -struct ast2300_dram_param {
> -	u32 dram_type;
> -	u32 dram_chipid;
> -	u32 dram_freq;
> -	u32 vram_size;
> -	u32 odt;
> -	u32 wodt;
> -	u32 rodt;
> -	u32 dram_config;
> -	u32 reg_PERIOD;
> -	u32 reg_MADJ;
> -	u32 reg_SADJ;
> -	u32 reg_MRS;
> -	u32 reg_EMRS;
> -	u32 reg_AC1;
> -	u32 reg_AC2;
> -	u32 reg_DQSIC;
> -	u32 reg_DRV;
> -	u32 reg_IOZ;
> -	u32 reg_DQIDLY;
> -	u32 reg_FREQ;
> -	u32 madj_max;
> -	u32 dll2_finetune_step;
> -};
> -
> -/*
> - * DQSI DLL CBR Setting
> - */
> -#define CBR_SIZE0            ((1  << 10) - 1)
> -#define CBR_SIZE1            ((4  << 10) - 1)
> -#define CBR_SIZE2            ((64 << 10) - 1)
> -#define CBR_PASSNUM          5
> -#define CBR_PASSNUM2         5
> -#define CBR_THRESHOLD        10
> -#define CBR_THRESHOLD2       10
>   #define TIMEOUT              5000000
> -#define CBR_PATNUM           8
> -
> -static const u32 pattern[8] = {
> -	0xFF00FF00,
> -	0xCC33CC33,
> -	0xAA55AA55,
> -	0x88778877,
> -	0x92CC4D6E,
> -	0x543D3CDE,
> -	0xF1E843C7,
> -	0x7C61D253
> -};
>   
>   bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
>   {
> @@ -451,1207 +392,7 @@ bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl)
>   	return true;
>   }
>   
> -static u32 mmc_test2(struct ast_device *ast, u32 datagen, u8 test_ctl)
> -{
> -	u32 data, timeout;
> -
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
> -	timeout = 0;
> -	do {
> -		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
> -		if (++timeout > TIMEOUT) {
> -			ast_moutdwm(ast, 0x1e6e0070, 0x0);
> -			return 0xffffffff;
> -		}
> -	} while (!data);
> -	data = ast_mindwm(ast, 0x1e6e0078);
> -	data = (data | (data >> 16)) & 0xffff;
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	return data;
> -}
> -
>   bool mmc_test_burst(struct ast_device *ast, u32 datagen)
>   {
>   	return mmc_test(ast, datagen, 0xc1);
>   }
> -
> -static u32 mmc_test_burst2(struct ast_device *ast, u32 datagen)
> -{
> -	return mmc_test2(ast, datagen, 0x41);
> -}
> -
> -static bool mmc_test_single(struct ast_device *ast, u32 datagen)
> -{
> -	return mmc_test(ast, datagen, 0xc5);
> -}
> -
> -static u32 mmc_test_single2(struct ast_device *ast, u32 datagen)
> -{
> -	return mmc_test2(ast, datagen, 0x05);
> -}
> -
> -static int cbr_test(struct ast_device *ast)
> -{
> -	u32 data;
> -	int i;
> -	data = mmc_test_single2(ast, 0);
> -	if ((data & 0xff) && (data & 0xff00))
> -		return 0;
> -	for (i = 0; i < 8; i++) {
> -		data = mmc_test_burst2(ast, i);
> -		if ((data & 0xff) && (data & 0xff00))
> -			return 0;
> -	}
> -	if (!data)
> -		return 3;
> -	else if (data & 0xff)
> -		return 2;
> -	return 1;
> -}
> -
> -static int cbr_scan(struct ast_device *ast)
> -{
> -	u32 data, data2, patcnt, loop;
> -
> -	data2 = 3;
> -	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> -		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> -		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
> -			if ((data = cbr_test(ast)) != 0) {
> -				data2 &= data;
> -				if (!data2)
> -					return 0;
> -				break;
> -			}
> -		}
> -		if (loop == CBR_PASSNUM2)
> -			return 0;
> -	}
> -	return data2;
> -}
> -
> -static u32 cbr_test2(struct ast_device *ast)
> -{
> -	u32 data;
> -
> -	data = mmc_test_burst2(ast, 0);
> -	if (data == 0xffff)
> -		return 0;
> -	data |= mmc_test_single2(ast, 0);
> -	if (data == 0xffff)
> -		return 0;
> -
> -	return ~data & 0xffff;
> -}
> -
> -static u32 cbr_scan2(struct ast_device *ast)
> -{
> -	u32 data, data2, patcnt, loop;
> -
> -	data2 = 0xffff;
> -	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> -		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> -		for (loop = 0; loop < CBR_PASSNUM2; loop++) {
> -			if ((data = cbr_test2(ast)) != 0) {
> -				data2 &= data;
> -				if (!data2)
> -					return 0;
> -				break;
> -			}
> -		}
> -		if (loop == CBR_PASSNUM2)
> -			return 0;
> -	}
> -	return data2;
> -}
> -
> -static bool cbr_test3(struct ast_device *ast)
> -{
> -	if (!mmc_test_burst(ast, 0))
> -		return false;
> -	if (!mmc_test_single(ast, 0))
> -		return false;
> -	return true;
> -}
> -
> -static bool cbr_scan3(struct ast_device *ast)
> -{
> -	u32 patcnt, loop;
> -
> -	for (patcnt = 0; patcnt < CBR_PATNUM; patcnt++) {
> -		ast_moutdwm(ast, 0x1e6e007c, pattern[patcnt]);
> -		for (loop = 0; loop < 2; loop++) {
> -			if (cbr_test3(ast))
> -				break;
> -		}
> -		if (loop == 2)
> -			return false;
> -	}
> -	return true;
> -}
> -
> -static bool finetuneDQI_L(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 gold_sadj[2], dllmin[16], dllmax[16], dlli, data, cnt, mask, passcnt, retry = 0;
> -	bool status = false;
> -FINETUNE_START:
> -	for (cnt = 0; cnt < 16; cnt++) {
> -		dllmin[cnt] = 0xff;
> -		dllmax[cnt] = 0x0;
> -	}
> -	passcnt = 0;
> -	for (dlli = 0; dlli < 76; dlli++) {
> -		ast_moutdwm(ast, 0x1E6E0068, 0x00001400 | (dlli << 16) | (dlli << 24));
> -		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE1);
> -		data = cbr_scan2(ast);
> -		if (data != 0) {
> -			mask = 0x00010001;
> -			for (cnt = 0; cnt < 16; cnt++) {
> -				if (data & mask) {
> -					if (dllmin[cnt] > dlli) {
> -						dllmin[cnt] = dlli;
> -					}
> -					if (dllmax[cnt] < dlli) {
> -						dllmax[cnt] = dlli;
> -					}
> -				}
> -				mask <<= 1;
> -			}
> -			passcnt++;
> -		} else if (passcnt >= CBR_THRESHOLD2) {
> -			break;
> -		}
> -	}
> -	gold_sadj[0] = 0x0;
> -	passcnt = 0;
> -	for (cnt = 0; cnt < 16; cnt++) {
> -		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> -			gold_sadj[0] += dllmin[cnt];
> -			passcnt++;
> -		}
> -	}
> -	if (retry++ > 10)
> -		goto FINETUNE_DONE;
> -	if (passcnt != 16) {
> -		goto FINETUNE_START;
> -	}
> -	status = true;
> -FINETUNE_DONE:
> -	gold_sadj[0] = gold_sadj[0] >> 4;
> -	gold_sadj[1] = gold_sadj[0];
> -
> -	data = 0;
> -	for (cnt = 0; cnt < 8; cnt++) {
> -		data >>= 3;
> -		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> -			dlli = dllmin[cnt];
> -			if (gold_sadj[0] >= dlli) {
> -				dlli = ((gold_sadj[0] - dlli) * 19) >> 5;
> -				if (dlli > 3) {
> -					dlli = 3;
> -				}
> -			} else {
> -				dlli = ((dlli - gold_sadj[0]) * 19) >> 5;
> -				if (dlli > 4) {
> -					dlli = 4;
> -				}
> -				dlli = (8 - dlli) & 0x7;
> -			}
> -			data |= dlli << 21;
> -		}
> -	}
> -	ast_moutdwm(ast, 0x1E6E0080, data);
> -
> -	data = 0;
> -	for (cnt = 8; cnt < 16; cnt++) {
> -		data >>= 3;
> -		if ((dllmax[cnt] > dllmin[cnt]) && ((dllmax[cnt] - dllmin[cnt]) >= CBR_THRESHOLD2)) {
> -			dlli = dllmin[cnt];
> -			if (gold_sadj[1] >= dlli) {
> -				dlli = ((gold_sadj[1] - dlli) * 19) >> 5;
> -				if (dlli > 3) {
> -					dlli = 3;
> -				} else {
> -					dlli = (dlli - 1) & 0x7;
> -				}
> -			} else {
> -				dlli = ((dlli - gold_sadj[1]) * 19) >> 5;
> -				dlli += 1;
> -				if (dlli > 4) {
> -					dlli = 4;
> -				}
> -				dlli = (8 - dlli) & 0x7;
> -			}
> -			data |= dlli << 21;
> -		}
> -	}
> -	ast_moutdwm(ast, 0x1E6E0084, data);
> -	return status;
> -} /* finetuneDQI_L */
> -
> -static void finetuneDQSI(struct ast_device *ast)
> -{
> -	u32 dlli, dqsip, dqidly;
> -	u32 reg_mcr18, reg_mcr0c, passcnt[2], diff;
> -	u32 g_dqidly, g_dqsip, g_margin, g_side;
> -	u16 pass[32][2][2];
> -	char tag[2][76];
> -
> -	/* Disable DQI CBR */
> -	reg_mcr0c  = ast_mindwm(ast, 0x1E6E000C);
> -	reg_mcr18  = ast_mindwm(ast, 0x1E6E0018);
> -	reg_mcr18 &= 0x0000ffff;
> -	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
> -
> -	for (dlli = 0; dlli < 76; dlli++) {
> -		tag[0][dlli] = 0x0;
> -		tag[1][dlli] = 0x0;
> -	}
> -	for (dqidly = 0; dqidly < 32; dqidly++) {
> -		pass[dqidly][0][0] = 0xff;
> -		pass[dqidly][0][1] = 0x0;
> -		pass[dqidly][1][0] = 0xff;
> -		pass[dqidly][1][1] = 0x0;
> -	}
> -	for (dqidly = 0; dqidly < 32; dqidly++) {
> -		passcnt[0] = passcnt[1] = 0;
> -		for (dqsip = 0; dqsip < 2; dqsip++) {
> -			ast_moutdwm(ast, 0x1E6E000C, 0);
> -			ast_moutdwm(ast, 0x1E6E0018, reg_mcr18 | (dqidly << 16) | (dqsip << 23));
> -			ast_moutdwm(ast, 0x1E6E000C, reg_mcr0c);
> -			for (dlli = 0; dlli < 76; dlli++) {
> -				ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
> -				ast_moutdwm(ast, 0x1E6E0070, 0);
> -				ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE0);
> -				if (cbr_scan3(ast)) {
> -					if (dlli == 0)
> -						break;
> -					passcnt[dqsip]++;
> -					tag[dqsip][dlli] = 'P';
> -					if (dlli < pass[dqidly][dqsip][0])
> -						pass[dqidly][dqsip][0] = (u16) dlli;
> -					if (dlli > pass[dqidly][dqsip][1])
> -						pass[dqidly][dqsip][1] = (u16) dlli;
> -				} else if (passcnt[dqsip] >= 5)
> -					break;
> -				else {
> -					pass[dqidly][dqsip][0] = 0xff;
> -					pass[dqidly][dqsip][1] = 0x0;
> -				}
> -			}
> -		}
> -		if (passcnt[0] == 0 && passcnt[1] == 0)
> -			dqidly++;
> -	}
> -	/* Search margin */
> -	g_dqidly = g_dqsip = g_margin = g_side = 0;
> -
> -	for (dqidly = 0; dqidly < 32; dqidly++) {
> -		for (dqsip = 0; dqsip < 2; dqsip++) {
> -			if (pass[dqidly][dqsip][0] > pass[dqidly][dqsip][1])
> -				continue;
> -			diff = pass[dqidly][dqsip][1] - pass[dqidly][dqsip][0];
> -			if ((diff+2) < g_margin)
> -				continue;
> -			passcnt[0] = passcnt[1] = 0;
> -			for (dlli = pass[dqidly][dqsip][0]; dlli > 0  && tag[dqsip][dlli] != 0; dlli--, passcnt[0]++);
> -			for (dlli = pass[dqidly][dqsip][1]; dlli < 76 && tag[dqsip][dlli] != 0; dlli++, passcnt[1]++);
> -			if (passcnt[0] > passcnt[1])
> -				passcnt[0] = passcnt[1];
> -			passcnt[1] = 0;
> -			if (passcnt[0] > g_side)
> -				passcnt[1] = passcnt[0] - g_side;
> -			if (diff > (g_margin+1) && (passcnt[1] > 0 || passcnt[0] > 8)) {
> -				g_margin = diff;
> -				g_dqidly = dqidly;
> -				g_dqsip  = dqsip;
> -				g_side   = passcnt[0];
> -			} else if (passcnt[1] > 1 && g_side < 8) {
> -				if (diff > g_margin)
> -					g_margin = diff;
> -				g_dqidly = dqidly;
> -				g_dqsip  = dqsip;
> -				g_side   = passcnt[0];
> -			}
> -		}
> -	}
> -	reg_mcr18 = reg_mcr18 | (g_dqidly << 16) | (g_dqsip << 23);
> -	ast_moutdwm(ast, 0x1E6E0018, reg_mcr18);
> -
> -}
> -static bool cbr_dll2(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 dllmin[2], dllmax[2], dlli, data, passcnt, retry = 0;
> -	bool status = false;
> -
> -	finetuneDQSI(ast);
> -	if (finetuneDQI_L(ast, param) == false)
> -		return status;
> -
> -CBR_START2:
> -	dllmin[0] = dllmin[1] = 0xff;
> -	dllmax[0] = dllmax[1] = 0x0;
> -	passcnt = 0;
> -	for (dlli = 0; dlli < 76; dlli++) {
> -		ast_moutdwm(ast, 0x1E6E0068, 0x00001300 | (dlli << 16) | (dlli << 24));
> -		ast_moutdwm(ast, 0x1E6E0074, CBR_SIZE2);
> -		data = cbr_scan(ast);
> -		if (data != 0) {
> -			if (data & 0x1) {
> -				if (dllmin[0] > dlli) {
> -					dllmin[0] = dlli;
> -				}
> -				if (dllmax[0] < dlli) {
> -					dllmax[0] = dlli;
> -				}
> -			}
> -			if (data & 0x2) {
> -				if (dllmin[1] > dlli) {
> -					dllmin[1] = dlli;
> -				}
> -				if (dllmax[1] < dlli) {
> -					dllmax[1] = dlli;
> -				}
> -			}
> -			passcnt++;
> -		} else if (passcnt >= CBR_THRESHOLD) {
> -			break;
> -		}
> -	}
> -	if (retry++ > 10)
> -		goto CBR_DONE2;
> -	if (dllmax[0] == 0 || (dllmax[0]-dllmin[0]) < CBR_THRESHOLD) {
> -		goto CBR_START2;
> -	}
> -	if (dllmax[1] == 0 || (dllmax[1]-dllmin[1]) < CBR_THRESHOLD) {
> -		goto CBR_START2;
> -	}
> -	status = true;
> -CBR_DONE2:
> -	dlli  = (dllmin[1] + dllmax[1]) >> 1;
> -	dlli <<= 8;
> -	dlli += (dllmin[0] + dllmax[0]) >> 1;
> -	ast_moutdwm(ast, 0x1E6E0068, ast_mindwm(ast, 0x1E720058) | (dlli << 16));
> -	return status;
> -} /* CBRDLL2 */
> -
> -static void get_ddr3_info(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 trap, trap_AC2, trap_MRS;
> -
> -	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> -
> -	/* Ger trap info */
> -	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
> -	trap_AC2  = 0x00020000 + (trap << 16);
> -	trap_AC2 |= 0x00300000 + ((trap & 0x2) << 19);
> -	trap_MRS  = 0x00000010 + (trap << 4);
> -	trap_MRS |= ((trap & 0x2) << 18);
> -
> -	param->reg_MADJ       = 0x00034C4C;
> -	param->reg_SADJ       = 0x00001800;
> -	param->reg_DRV        = 0x000000F0;
> -	param->reg_PERIOD     = param->dram_freq;
> -	param->rodt           = 0;
> -
> -	switch (param->dram_freq) {
> -	case 336:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
> -		param->wodt          = 0;
> -		param->reg_AC1       = 0x22202725;
> -		param->reg_AC2       = 0xAA007613 | trap_AC2;
> -		param->reg_DQSIC     = 0x000000BA;
> -		param->reg_MRS       = 0x04001400 | trap_MRS;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_IOZ       = 0x00000023;
> -		param->reg_DQIDLY    = 0x00000074;
> -		param->reg_FREQ      = 0x00004DC0;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 3;
> -		switch (param->dram_chipid) {
> -		default:
> -		case AST_DRAM_512Mx16:
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xAA007613 | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xAA00761C | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xAA007636 | trap_AC2;
> -			break;
> -		}
> -		break;
> -	default:
> -	case 396:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
> -		param->wodt          = 1;
> -		param->reg_AC1       = 0x33302825;
> -		param->reg_AC2       = 0xCC009617 | trap_AC2;
> -		param->reg_DQSIC     = 0x000000E2;
> -		param->reg_MRS       = 0x04001600 | trap_MRS;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_DQIDLY    = 0x00000089;
> -		param->reg_FREQ      = 0x00005040;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 4;
> -
> -		switch (param->dram_chipid) {
> -		default:
> -		case AST_DRAM_512Mx16:
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xCC009617 | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xCC009622 | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xCC00963F | trap_AC2;
> -			break;
> -		}
> -		break;
> -
> -	case 408:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
> -		param->wodt          = 1;
> -		param->reg_AC1       = 0x33302825;
> -		param->reg_AC2       = 0xCC009617 | trap_AC2;
> -		param->reg_DQSIC     = 0x000000E2;
> -		param->reg_MRS       = 0x04001600 | trap_MRS;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_IOZ       = 0x00000023;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_DQIDLY    = 0x00000089;
> -		param->reg_FREQ      = 0x000050C0;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 4;
> -
> -		switch (param->dram_chipid) {
> -		default:
> -		case AST_DRAM_512Mx16:
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xCC009617 | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xCC009622 | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xCC00963F | trap_AC2;
> -			break;
> -		}
> -
> -		break;
> -	case 456:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
> -		param->wodt          = 0;
> -		param->reg_AC1       = 0x33302926;
> -		param->reg_AC2       = 0xCD44961A;
> -		param->reg_DQSIC     = 0x000000FC;
> -		param->reg_MRS       = 0x00081830;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_IOZ       = 0x00000045;
> -		param->reg_DQIDLY    = 0x00000097;
> -		param->reg_FREQ      = 0x000052C0;
> -		param->madj_max      = 88;
> -		param->dll2_finetune_step = 4;
> -		break;
> -	case 504:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0270);
> -		param->wodt          = 1;
> -		param->reg_AC1       = 0x33302926;
> -		param->reg_AC2       = 0xDE44A61D;
> -		param->reg_DQSIC     = 0x00000117;
> -		param->reg_MRS       = 0x00081A30;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_IOZ       = 0x070000BB;
> -		param->reg_DQIDLY    = 0x000000A0;
> -		param->reg_FREQ      = 0x000054C0;
> -		param->madj_max      = 79;
> -		param->dll2_finetune_step = 4;
> -		break;
> -	case 528:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0290);
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x33302926;
> -		param->reg_AC2       = 0xEF44B61E;
> -		param->reg_DQSIC     = 0x00000125;
> -		param->reg_MRS       = 0x00081A30;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x000000F5;
> -		param->reg_IOZ       = 0x00000023;
> -		param->reg_DQIDLY    = 0x00000088;
> -		param->reg_FREQ      = 0x000055C0;
> -		param->madj_max      = 76;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 576:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
> -		param->reg_MADJ      = 0x00136868;
> -		param->reg_SADJ      = 0x00004534;
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x33302A37;
> -		param->reg_AC2       = 0xEF56B61E;
> -		param->reg_DQSIC     = 0x0000013F;
> -		param->reg_MRS       = 0x00101A50;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_IOZ       = 0x00000023;
> -		param->reg_DQIDLY    = 0x00000078;
> -		param->reg_FREQ      = 0x000057C0;
> -		param->madj_max      = 136;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 600:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x02E1);
> -		param->reg_MADJ      = 0x00136868;
> -		param->reg_SADJ      = 0x00004534;
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x32302A37;
> -		param->reg_AC2       = 0xDF56B61F;
> -		param->reg_DQSIC     = 0x0000014D;
> -		param->reg_MRS       = 0x00101A50;
> -		param->reg_EMRS      = 0x00000004;
> -		param->reg_DRV       = 0x000000F5;
> -		param->reg_IOZ       = 0x00000023;
> -		param->reg_DQIDLY    = 0x00000078;
> -		param->reg_FREQ      = 0x000058C0;
> -		param->madj_max      = 132;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 624:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0160);
> -		param->reg_MADJ      = 0x00136868;
> -		param->reg_SADJ      = 0x00004534;
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x32302A37;
> -		param->reg_AC2       = 0xEF56B621;
> -		param->reg_DQSIC     = 0x0000015A;
> -		param->reg_MRS       = 0x02101A50;
> -		param->reg_EMRS      = 0x00000004;
> -		param->reg_DRV       = 0x000000F5;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x00000078;
> -		param->reg_FREQ      = 0x000059C0;
> -		param->madj_max      = 128;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	} /* switch freq */
> -
> -	switch (param->dram_chipid) {
> -	case AST_DRAM_512Mx16:
> -		param->dram_config = 0x130;
> -		break;
> -	default:
> -	case AST_DRAM_1Gx16:
> -		param->dram_config = 0x131;
> -		break;
> -	case AST_DRAM_2Gx16:
> -		param->dram_config = 0x132;
> -		break;
> -	case AST_DRAM_4Gx16:
> -		param->dram_config = 0x133;
> -		break;
> -	} /* switch size */
> -
> -	switch (param->vram_size) {
> -	default:
> -	case SZ_8M:
> -		param->dram_config |= 0x00;
> -		break;
> -	case SZ_16M:
> -		param->dram_config |= 0x04;
> -		break;
> -	case SZ_32M:
> -		param->dram_config |= 0x08;
> -		break;
> -	case SZ_64M:
> -		param->dram_config |= 0x0c;
> -		break;
> -	}
> -
> -}
> -
> -static void ddr3_init(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 data, data2, retry = 0;
> -
> -ddr3_init_start:
> -	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
> -	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00000000);
> -	udelay(10);
> -	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
> -	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
> -	udelay(10);
> -	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
> -	udelay(10);
> -
> -	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
> -	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
> -	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
> -	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
> -	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
> -	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x4000A170);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x00002370);
> -	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0040, 0xFF444444);
> -	ast_moutdwm(ast, 0x1E6E0044, 0x22222222);
> -	ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
> -	ast_moutdwm(ast, 0x1E6E004C, 0x00000002);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0054, 0);
> -	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
> -	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
> -	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> -	/* Wait MCLK2X lock to MCLK */
> -	do {
> -		data = ast_mindwm(ast, 0x1E6E001C);
> -	} while (!(data & 0x08000000));
> -	data = ast_mindwm(ast, 0x1E6E001C);
> -	data = (data >> 8) & 0xff;
> -	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
> -		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
> -		if ((data2 & 0xff) > param->madj_max) {
> -			break;
> -		}
> -		ast_moutdwm(ast, 0x1E6E0064, data2);
> -		if (data2 & 0x00100000) {
> -			data2 = ((data2 & 0xff) >> 3) + 3;
> -		} else {
> -			data2 = ((data2 & 0xff) >> 2) + 5;
> -		}
> -		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
> -		data2 += data & 0xff;
> -		data = data | (data2 << 8);
> -		ast_moutdwm(ast, 0x1E6E0068, data);
> -		udelay(10);
> -		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
> -		udelay(10);
> -		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
> -		ast_moutdwm(ast, 0x1E6E0018, data);
> -		data = data | 0x200;
> -		ast_moutdwm(ast, 0x1E6E0018, data);
> -		do {
> -			data = ast_mindwm(ast, 0x1E6E001C);
> -		} while (!(data & 0x08000000));
> -
> -		data = ast_mindwm(ast, 0x1E6E001C);
> -		data = (data >> 8) & 0xff;
> -	}
> -	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0068) & 0xffff);
> -	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
> -	ast_moutdwm(ast, 0x1E6E0018, data);
> -
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00000040);
> -	udelay(50);
> -	/* Mode Register Setting */
> -	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
> -	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> -	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> -
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
> -	data = 0;
> -	if (param->wodt) {
> -		data = 0x300;
> -	}
> -	if (param->rodt) {
> -		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
> -	}
> -	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
> -
> -	/* Calibrate the DQSI delay */
> -	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
> -		goto ddr3_init_start;
> -
> -	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
> -	/* ECC Memory Initialization */
> -#ifdef ECC
> -	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0070, 0x221);
> -	do {
> -		data = ast_mindwm(ast, 0x1E6E0070);
> -	} while (!(data & 0x00001000));
> -	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> -#endif
> -
> -
> -}
> -
> -static void get_ddr2_info(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 trap, trap_AC2, trap_MRS;
> -
> -	ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
> -
> -	/* Ger trap info */
> -	trap = (ast_mindwm(ast, 0x1E6E2070) >> 25) & 0x3;
> -	trap_AC2  = (trap << 20) | (trap << 16);
> -	trap_AC2 += 0x00110000;
> -	trap_MRS  = 0x00000040 | (trap << 4);
> -
> -
> -	param->reg_MADJ       = 0x00034C4C;
> -	param->reg_SADJ       = 0x00001800;
> -	param->reg_DRV        = 0x000000F0;
> -	param->reg_PERIOD     = param->dram_freq;
> -	param->rodt           = 0;
> -
> -	switch (param->dram_freq) {
> -	case 264:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0130);
> -		param->wodt          = 0;
> -		param->reg_AC1       = 0x11101513;
> -		param->reg_AC2       = 0x78117011;
> -		param->reg_DQSIC     = 0x00000092;
> -		param->reg_MRS       = 0x00000842;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_DRV       = 0x000000F0;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x0000005A;
> -		param->reg_FREQ      = 0x00004AC0;
> -		param->madj_max      = 138;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 336:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0190);
> -		param->wodt          = 1;
> -		param->reg_AC1       = 0x22202613;
> -		param->reg_AC2       = 0xAA009016 | trap_AC2;
> -		param->reg_DQSIC     = 0x000000BA;
> -		param->reg_MRS       = 0x00000A02 | trap_MRS;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x00000074;
> -		param->reg_FREQ      = 0x00004DC0;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 3;
> -		switch (param->dram_chipid) {
> -		default:
> -		case AST_DRAM_512Mx16:
> -			param->reg_AC2   = 0xAA009012 | trap_AC2;
> -			break;
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xAA009016 | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xAA009023 | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xAA00903B | trap_AC2;
> -			break;
> -		}
> -		break;
> -	default:
> -	case 396:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x03F1);
> -		param->wodt          = 1;
> -		param->rodt          = 0;
> -		param->reg_AC1       = 0x33302714;
> -		param->reg_AC2       = 0xCC00B01B | trap_AC2;
> -		param->reg_DQSIC     = 0x000000E2;
> -		param->reg_MRS       = 0x00000C02 | trap_MRS;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x00000089;
> -		param->reg_FREQ      = 0x00005040;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 4;
> -
> -		switch (param->dram_chipid) {
> -		case AST_DRAM_512Mx16:
> -			param->reg_AC2   = 0xCC00B016 | trap_AC2;
> -			break;
> -		default:
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xCC00B01B | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xCC00B02B | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xCC00B03F | trap_AC2;
> -			break;
> -		}
> -
> -		break;
> -
> -	case 408:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x01F0);
> -		param->wodt          = 1;
> -		param->rodt          = 0;
> -		param->reg_AC1       = 0x33302714;
> -		param->reg_AC2       = 0xCC00B01B | trap_AC2;
> -		param->reg_DQSIC     = 0x000000E2;
> -		param->reg_MRS       = 0x00000C02 | trap_MRS;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x000000FA;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x00000089;
> -		param->reg_FREQ      = 0x000050C0;
> -		param->madj_max      = 96;
> -		param->dll2_finetune_step = 4;
> -
> -		switch (param->dram_chipid) {
> -		case AST_DRAM_512Mx16:
> -			param->reg_AC2   = 0xCC00B016 | trap_AC2;
> -			break;
> -		default:
> -		case AST_DRAM_1Gx16:
> -			param->reg_AC2   = 0xCC00B01B | trap_AC2;
> -			break;
> -		case AST_DRAM_2Gx16:
> -			param->reg_AC2   = 0xCC00B02B | trap_AC2;
> -			break;
> -		case AST_DRAM_4Gx16:
> -			param->reg_AC2   = 0xCC00B03F | trap_AC2;
> -			break;
> -		}
> -
> -		break;
> -	case 456:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0230);
> -		param->wodt          = 0;
> -		param->reg_AC1       = 0x33302815;
> -		param->reg_AC2       = 0xCD44B01E;
> -		param->reg_DQSIC     = 0x000000FC;
> -		param->reg_MRS       = 0x00000E72;
> -		param->reg_EMRS      = 0x00000000;
> -		param->reg_DRV       = 0x00000000;
> -		param->reg_IOZ       = 0x00000034;
> -		param->reg_DQIDLY    = 0x00000097;
> -		param->reg_FREQ      = 0x000052C0;
> -		param->madj_max      = 88;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 504:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0261);
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x33302815;
> -		param->reg_AC2       = 0xDE44C022;
> -		param->reg_DQSIC     = 0x00000117;
> -		param->reg_MRS       = 0x00000E72;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x0000000A;
> -		param->reg_IOZ       = 0x00000045;
> -		param->reg_DQIDLY    = 0x000000A0;
> -		param->reg_FREQ      = 0x000054C0;
> -		param->madj_max      = 79;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 528:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0120);
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x33302815;
> -		param->reg_AC2       = 0xEF44D024;
> -		param->reg_DQSIC     = 0x00000125;
> -		param->reg_MRS       = 0x00000E72;
> -		param->reg_EMRS      = 0x00000004;
> -		param->reg_DRV       = 0x000000F9;
> -		param->reg_IOZ       = 0x00000045;
> -		param->reg_DQIDLY    = 0x000000A7;
> -		param->reg_FREQ      = 0x000055C0;
> -		param->madj_max      = 76;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 552:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x02A1);
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x43402915;
> -		param->reg_AC2       = 0xFF44E025;
> -		param->reg_DQSIC     = 0x00000132;
> -		param->reg_MRS       = 0x00000E72;
> -		param->reg_EMRS      = 0x00000040;
> -		param->reg_DRV       = 0x0000000A;
> -		param->reg_IOZ       = 0x00000045;
> -		param->reg_DQIDLY    = 0x000000AD;
> -		param->reg_FREQ      = 0x000056C0;
> -		param->madj_max      = 76;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	case 576:
> -		ast_moutdwm(ast, 0x1E6E2020, 0x0140);
> -		param->wodt          = 1;
> -		param->rodt          = 1;
> -		param->reg_AC1       = 0x43402915;
> -		param->reg_AC2       = 0xFF44E027;
> -		param->reg_DQSIC     = 0x0000013F;
> -		param->reg_MRS       = 0x00000E72;
> -		param->reg_EMRS      = 0x00000004;
> -		param->reg_DRV       = 0x000000F5;
> -		param->reg_IOZ       = 0x00000045;
> -		param->reg_DQIDLY    = 0x000000B3;
> -		param->reg_FREQ      = 0x000057C0;
> -		param->madj_max      = 76;
> -		param->dll2_finetune_step = 3;
> -		break;
> -	}
> -
> -	switch (param->dram_chipid) {
> -	case AST_DRAM_512Mx16:
> -		param->dram_config = 0x100;
> -		break;
> -	default:
> -	case AST_DRAM_1Gx16:
> -		param->dram_config = 0x121;
> -		break;
> -	case AST_DRAM_2Gx16:
> -		param->dram_config = 0x122;
> -		break;
> -	case AST_DRAM_4Gx16:
> -		param->dram_config = 0x123;
> -		break;
> -	} /* switch size */
> -
> -	switch (param->vram_size) {
> -	default:
> -	case SZ_8M:
> -		param->dram_config |= 0x00;
> -		break;
> -	case SZ_16M:
> -		param->dram_config |= 0x04;
> -		break;
> -	case SZ_32M:
> -		param->dram_config |= 0x08;
> -		break;
> -	case SZ_64M:
> -		param->dram_config |= 0x0c;
> -		break;
> -	}
> -}
> -
> -static void ddr2_init(struct ast_device *ast, struct ast2300_dram_param *param)
> -{
> -	u32 data, data2, retry = 0;
> -
> -ddr2_init_start:
> -	ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x00000100);
> -	ast_moutdwm(ast, 0x1E6E0024, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ);
> -	ast_moutdwm(ast, 0x1E6E0068, param->reg_SADJ);
> -	udelay(10);
> -	ast_moutdwm(ast, 0x1E6E0064, param->reg_MADJ | 0xC0000);
> -	udelay(10);
> -
> -	ast_moutdwm(ast, 0x1E6E0004, param->dram_config);
> -	ast_moutdwm(ast, 0x1E6E0008, 0x90040f);
> -	ast_moutdwm(ast, 0x1E6E0010, param->reg_AC1);
> -	ast_moutdwm(ast, 0x1E6E0014, param->reg_AC2);
> -	ast_moutdwm(ast, 0x1E6E0020, param->reg_DQSIC);
> -	ast_moutdwm(ast, 0x1E6E0080, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0084, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0088, param->reg_DQIDLY);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x4000A130);
> -	ast_moutdwm(ast, 0x1E6E0018, 0x00002330);
> -	ast_moutdwm(ast, 0x1E6E0038, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0040, 0xFF808000);
> -	ast_moutdwm(ast, 0x1E6E0044, 0x88848466);
> -	ast_moutdwm(ast, 0x1E6E0048, 0x44440008);
> -	ast_moutdwm(ast, 0x1E6E004C, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0054, 0);
> -	ast_moutdwm(ast, 0x1E6E0060, param->reg_DRV);
> -	ast_moutdwm(ast, 0x1E6E006C, param->reg_IOZ);
> -	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0074, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0078, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> -
> -	/* Wait MCLK2X lock to MCLK */
> -	do {
> -		data = ast_mindwm(ast, 0x1E6E001C);
> -	} while (!(data & 0x08000000));
> -	data = ast_mindwm(ast, 0x1E6E001C);
> -	data = (data >> 8) & 0xff;
> -	while ((data & 0x08) || ((data & 0x7) < 2) || (data < 4)) {
> -		data2 = (ast_mindwm(ast, 0x1E6E0064) & 0xfff3ffff) + 4;
> -		if ((data2 & 0xff) > param->madj_max) {
> -			break;
> -		}
> -		ast_moutdwm(ast, 0x1E6E0064, data2);
> -		if (data2 & 0x00100000) {
> -			data2 = ((data2 & 0xff) >> 3) + 3;
> -		} else {
> -			data2 = ((data2 & 0xff) >> 2) + 5;
> -		}
> -		data = ast_mindwm(ast, 0x1E6E0068) & 0xffff00ff;
> -		data2 += data & 0xff;
> -		data = data | (data2 << 8);
> -		ast_moutdwm(ast, 0x1E6E0068, data);
> -		udelay(10);
> -		ast_moutdwm(ast, 0x1E6E0064, ast_mindwm(ast, 0x1E6E0064) | 0xC0000);
> -		udelay(10);
> -		data = ast_mindwm(ast, 0x1E6E0018) & 0xfffff1ff;
> -		ast_moutdwm(ast, 0x1E6E0018, data);
> -		data = data | 0x200;
> -		ast_moutdwm(ast, 0x1E6E0018, data);
> -		do {
> -			data = ast_mindwm(ast, 0x1E6E001C);
> -		} while (!(data & 0x08000000));
> -
> -		data = ast_mindwm(ast, 0x1E6E001C);
> -		data = (data >> 8) & 0xff;
> -	}
> -	ast_moutdwm(ast, 0x1E720058, ast_mindwm(ast, 0x1E6E0008) & 0xffff);
> -	data = ast_mindwm(ast, 0x1E6E0018) | 0xC00;
> -	ast_moutdwm(ast, 0x1E6E0018, data);
> -
> -	ast_moutdwm(ast, 0x1E6E0034, 0x00000001);
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
> -	udelay(50);
> -	/* Mode Register Setting */
> -	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS | 0x100);
> -	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000005);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000007);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> -
> -	ast_moutdwm(ast, 0x1E6E000C, 0x00005C08);
> -	ast_moutdwm(ast, 0x1E6E002C, param->reg_MRS);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000001);
> -	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS | 0x380);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> -	ast_moutdwm(ast, 0x1E6E0030, param->reg_EMRS);
> -	ast_moutdwm(ast, 0x1E6E0028, 0x00000003);
> -
> -	ast_moutdwm(ast, 0x1E6E000C, 0x7FFF5C01);
> -	data = 0;
> -	if (param->wodt) {
> -		data = 0x500;
> -	}
> -	if (param->rodt) {
> -		data = data | 0x3000 | ((param->reg_AC2 & 0x60000) >> 3);
> -	}
> -	ast_moutdwm(ast, 0x1E6E0034, data | 0x3);
> -	ast_moutdwm(ast, 0x1E6E0120, param->reg_FREQ);
> -
> -	/* Calibrate the DQSI delay */
> -	if ((cbr_dll2(ast, param) == false) && (retry++ < 10))
> -		goto ddr2_init_start;
> -
> -	/* ECC Memory Initialization */
> -#ifdef ECC
> -	ast_moutdwm(ast, 0x1E6E007C, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0070, 0x221);
> -	do {
> -		data = ast_mindwm(ast, 0x1E6E0070);
> -	} while (!(data & 0x00001000));
> -	ast_moutdwm(ast, 0x1E6E0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
> -	ast_moutdwm(ast, 0x1E6E0050, 0x00000000);
> -#endif
> -
> -}
> -
> -static void ast_post_chip_2300(struct ast_device *ast)
> -{
> -	struct ast2300_dram_param param;
> -	u32 temp;
> -	u8 reg;
> -
> -	reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -	if ((reg & 0x80) == 0) {/* vga only */
> -		ast_write32(ast, 0xf004, 0x1e6e0000);
> -		ast_write32(ast, 0xf000, 0x1);
> -		ast_write32(ast, 0x12000, 0x1688a8a8);
> -		do {
> -			;
> -		} while (ast_read32(ast, 0x12000) != 0x1);
> -
> -		ast_write32(ast, 0x10000, 0xfc600309);
> -		do {
> -			;
> -		} while (ast_read32(ast, 0x10000) != 0x1);
> -
> -		/* Slow down CPU/AHB CLK in VGA only mode */
> -		temp = ast_read32(ast, 0x12008);
> -		temp |= 0x73;
> -		ast_write32(ast, 0x12008, temp);
> -
> -		param.dram_freq = 396;
> -		param.dram_type = AST_DDR3;
> -		temp = ast_mindwm(ast, 0x1e6e2070);
> -		if (temp & 0x01000000)
> -			param.dram_type = AST_DDR2;
> -                switch (temp & 0x18000000) {
> -		case 0:
> -			param.dram_chipid = AST_DRAM_512Mx16;
> -			break;
> -		default:
> -		case 0x08000000:
> -			param.dram_chipid = AST_DRAM_1Gx16;
> -			break;
> -		case 0x10000000:
> -			param.dram_chipid = AST_DRAM_2Gx16;
> -			break;
> -		case 0x18000000:
> -			param.dram_chipid = AST_DRAM_4Gx16;
> -			break;
> -		}
> -                switch (temp & 0x0c) {
> -                default:
> -		case 0x00:
> -			param.vram_size = SZ_8M;
> -			break;
> -
> -		case 0x04:
> -			param.vram_size = SZ_16M;
> -			break;
> -
> -		case 0x08:
> -			param.vram_size = SZ_32M;
> -			break;
> -
> -		case 0x0c:
> -			param.vram_size = SZ_64M;
> -			break;
> -		}
> -
> -		if (param.dram_type == AST_DDR3) {
> -			get_ddr3_info(ast, &param);
> -			ddr3_init(ast, &param);
> -		} else {
> -			get_ddr2_info(ast, &param);
> -			ddr2_init(ast, &param);
> -		}
> -
> -		temp = ast_mindwm(ast, 0x1e6e2040);
> -		ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
> -	}
> -
> -	/* wait ready */
> -	do {
> -		reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -	} while ((reg & 0x40) == 0);
> -}

[PATCH 05/10] drm/ast: Move Gen2+ and Gen1 POST code to separate source files

[Thomas Zimmermann]

Move POST code for Gen2+ and Gen1 to separate source files and
hide it in ast_2100_post() ans ast_2000_post(). With P2A
configuration, the POST logic for these chip generations has
been mingled in ast_init_dram_reg(). Hence, handle all generations
in a single change. The split simplifies both cases. Also move
the DRAM init tables for each Gen into the respective source
file. No changes to the overall logic.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/Makefile          |   2 +
 drivers/gpu/drm/ast/ast_2000.c        | 117 +++++++++
 drivers/gpu/drm/ast/ast_2100.c        | 346 ++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_dram_tables.h | 134 ----------
 drivers/gpu/drm/ast/ast_drv.h         |   6 +
 drivers/gpu/drm/ast/ast_post.c        | 243 +-----------------
 6 files changed, 478 insertions(+), 370 deletions(-)
 create mode 100644 drivers/gpu/drm/ast/ast_2000.c
 create mode 100644 drivers/gpu/drm/ast/ast_2100.c

diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index ccb2ff3e8eac..2547613155da 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -4,6 +4,8 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ast-y := \
+	ast_2000.o \
+	ast_2100.o \
 	ast_2300.o \
 	ast_2500.o \
 	ast_2600.o \
diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
new file mode 100644
index 000000000000..099c90e1402f
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_2000.c
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+/*
+ * Authors: Dave Airlie <airlied@redhat.com>
+ */
+
+#include <linux/delay.h>
+
+#include "ast_dram_tables.h"
+#include "ast_drv.h"
+
+/*
+ * POST
+ */
+
+static const struct ast_dramstruct ast2000_dram_table_data[] = {
+	{ 0x0108, 0x00000000 },
+	{ 0x0120, 0x00004a21 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0000, 0xFFFFFFFF },
+	{ 0x0004, 0x00000089 },
+	{ 0x0008, 0x22331353 },
+	{ 0x000C, 0x0d07000b },
+	{ 0x0010, 0x11113333 },
+	{ 0x0020, 0x00110350 },
+	{ 0x0028, 0x1e0828f0 },
+	{ 0x0024, 0x00000001 },
+	{ 0x001C, 0x00000000 },
+	{ 0x0014, 0x00000003 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0018, 0x00000131 },
+	{ 0x0014, 0x00000001 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0018, 0x00000031 },
+	{ 0x0014, 0x00000001 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0028, 0x1e0828f1 },
+	{ 0x0024, 0x00000003 },
+	{ 0x002C, 0x1f0f28fb },
+	{ 0x0030, 0xFFFFFE01 },
+	{ 0xFFFF, 0xFFFFFFFF }
+};
+
+static void ast_post_chip_2000(struct ast_device *ast)
+{
+	u8 j;
+	u32 temp, i;
+	const struct ast_dramstruct *dram_reg_info;
+
+	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+
+	if ((j & 0x80) == 0) { /* VGA only */
+		dram_reg_info = ast2000_dram_table_data;
+		ast_write32(ast, 0xf004, 0x1e6e0000);
+		ast_write32(ast, 0xf000, 0x1);
+		ast_write32(ast, 0x10100, 0xa8);
+
+		do {
+			;
+		} while (ast_read32(ast, 0x10100) != 0xa8);
+
+		while (dram_reg_info->index != 0xffff) {
+			if (dram_reg_info->index == 0xff00) {/* delay fn */
+				for (i = 0; i < 15; i++)
+					udelay(dram_reg_info->data);
+			} else {
+				ast_write32(ast, 0x10000 + dram_reg_info->index,
+					    dram_reg_info->data);
+			}
+			dram_reg_info++;
+		}
+
+		temp = ast_read32(ast, 0x10140);
+		ast_write32(ast, 0x10140, temp | 0x40);
+	}
+
+	/* wait ready */
+	do {
+		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	} while ((j & 0x40) == 0);
+}
+
+int ast_2000_post(struct ast_device *ast)
+{
+	if (ast->config_mode == ast_use_p2a) {
+		ast_post_chip_2000(ast);
+	} else {
+		if (ast->tx_chip == AST_TX_SIL164) {
+			/* Enable DVO */
+			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
new file mode 100644
index 000000000000..f41c778e02da
--- /dev/null
+++ b/drivers/gpu/drm/ast/ast_2100.c
@@ -0,0 +1,346 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+/*
+ * Authors: Dave Airlie <airlied@redhat.com>
+ */
+
+#include <linux/delay.h>
+
+#include "ast_dram_tables.h"
+#include "ast_drv.h"
+
+/*
+ * POST
+ */
+
+static const struct ast_dramstruct ast1100_dram_table_data[] = {
+	{ 0x2000, 0x1688a8a8 },
+	{ 0x2020, 0x000041f0 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0000, 0xfc600309 },
+	{ 0x006C, 0x00909090 },
+	{ 0x0064, 0x00050000 },
+	{ 0x0004, 0x00000585 },
+	{ 0x0008, 0x0011030f },
+	{ 0x0010, 0x22201724 },
+	{ 0x0018, 0x1e29011a },
+	{ 0x0020, 0x00c82222 },
+	{ 0x0014, 0x01001523 },
+	{ 0x001C, 0x1024010d },
+	{ 0x0024, 0x00cb2522 },
+	{ 0x0038, 0xffffff82 },
+	{ 0x003C, 0x00000000 },
+	{ 0x0040, 0x00000000 },
+	{ 0x0044, 0x00000000 },
+	{ 0x0048, 0x00000000 },
+	{ 0x004C, 0x00000000 },
+	{ 0x0050, 0x00000000 },
+	{ 0x0054, 0x00000000 },
+	{ 0x0058, 0x00000000 },
+	{ 0x005C, 0x00000000 },
+	{ 0x0060, 0x032aa02a },
+	{ 0x0064, 0x002d3000 },
+	{ 0x0068, 0x00000000 },
+	{ 0x0070, 0x00000000 },
+	{ 0x0074, 0x00000000 },
+	{ 0x0078, 0x00000000 },
+	{ 0x007C, 0x00000000 },
+	{ 0x0034, 0x00000001 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x002C, 0x00000732 },
+	{ 0x0030, 0x00000040 },
+	{ 0x0028, 0x00000005 },
+	{ 0x0028, 0x00000007 },
+	{ 0x0028, 0x00000003 },
+	{ 0x0028, 0x00000001 },
+	{ 0x000C, 0x00005a08 },
+	{ 0x002C, 0x00000632 },
+	{ 0x0028, 0x00000001 },
+	{ 0x0030, 0x000003c0 },
+	{ 0x0028, 0x00000003 },
+	{ 0x0030, 0x00000040 },
+	{ 0x0028, 0x00000003 },
+	{ 0x000C, 0x00005a21 },
+	{ 0x0034, 0x00007c03 },
+	{ 0x0120, 0x00004c41 },
+	{ 0xffff, 0xffffffff },
+};
+
+static const struct ast_dramstruct ast2100_dram_table_data[] = {
+	{ 0x2000, 0x1688a8a8 },
+	{ 0x2020, 0x00004120 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x0000, 0xfc600309 },
+	{ 0x006C, 0x00909090 },
+	{ 0x0064, 0x00070000 },
+	{ 0x0004, 0x00000489 },
+	{ 0x0008, 0x0011030f },
+	{ 0x0010, 0x32302926 },
+	{ 0x0018, 0x274c0122 },
+	{ 0x0020, 0x00ce2222 },
+	{ 0x0014, 0x01001523 },
+	{ 0x001C, 0x1024010d },
+	{ 0x0024, 0x00cb2522 },
+	{ 0x0038, 0xffffff82 },
+	{ 0x003C, 0x00000000 },
+	{ 0x0040, 0x00000000 },
+	{ 0x0044, 0x00000000 },
+	{ 0x0048, 0x00000000 },
+	{ 0x004C, 0x00000000 },
+	{ 0x0050, 0x00000000 },
+	{ 0x0054, 0x00000000 },
+	{ 0x0058, 0x00000000 },
+	{ 0x005C, 0x00000000 },
+	{ 0x0060, 0x0f2aa02a },
+	{ 0x0064, 0x003f3005 },
+	{ 0x0068, 0x02020202 },
+	{ 0x0070, 0x00000000 },
+	{ 0x0074, 0x00000000 },
+	{ 0x0078, 0x00000000 },
+	{ 0x007C, 0x00000000 },
+	{ 0x0034, 0x00000001 },
+	{ 0xFF00, 0x00000043 },
+	{ 0x002C, 0x00000942 },
+	{ 0x0030, 0x00000040 },
+	{ 0x0028, 0x00000005 },
+	{ 0x0028, 0x00000007 },
+	{ 0x0028, 0x00000003 },
+	{ 0x0028, 0x00000001 },
+	{ 0x000C, 0x00005a08 },
+	{ 0x002C, 0x00000842 },
+	{ 0x0028, 0x00000001 },
+	{ 0x0030, 0x000003c0 },
+	{ 0x0028, 0x00000003 },
+	{ 0x0030, 0x00000040 },
+	{ 0x0028, 0x00000003 },
+	{ 0x000C, 0x00005a21 },
+	{ 0x0034, 0x00007c03 },
+	{ 0x0120, 0x00005061 },
+	{ 0xffff, 0xffffffff },
+};
+
+/*
+ * AST2100/2150 DLL CBR Setting
+ */
+#define CBR_SIZE_AST2150	     ((16 << 10) - 1)
+#define CBR_PASSNUM_AST2150          5
+#define CBR_THRESHOLD_AST2150        10
+#define CBR_THRESHOLD2_AST2150       10
+#define TIMEOUT_AST2150              5000000
+
+#define CBR_PATNUM_AST2150           8
+
+static const u32 pattern_AST2150[14] = {
+	0xFF00FF00,
+	0xCC33CC33,
+	0xAA55AA55,
+	0xFFFE0001,
+	0x683501FE,
+	0x0F1929B0,
+	0x2D0B4346,
+	0x60767F02,
+	0x6FBE36A6,
+	0x3A253035,
+	0x3019686D,
+	0x41C6167E,
+	0x620152BF,
+	0x20F050E0
+};
+
+static u32 mmctestburst2_ast2150(struct ast_device *ast, u32 datagen)
+{
+	u32 data, timeout;
+
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000001 | (datagen << 3));
+	timeout = 0;
+	do {
+		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
+		if (++timeout > TIMEOUT_AST2150) {
+			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+			return 0xffffffff;
+		}
+	} while (!data);
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000003 | (datagen << 3));
+	timeout = 0;
+	do {
+		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
+		if (++timeout > TIMEOUT_AST2150) {
+			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+			return 0xffffffff;
+		}
+	} while (!data);
+	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
+	return data;
+}
+
+static int cbrtest_ast2150(struct ast_device *ast)
+{
+	int i;
+
+	for (i = 0; i < 8; i++)
+		if (mmctestburst2_ast2150(ast, i))
+			return 0;
+	return 1;
+}
+
+static int cbrscan_ast2150(struct ast_device *ast, int busw)
+{
+	u32 patcnt, loop;
+
+	for (patcnt = 0; patcnt < CBR_PATNUM_AST2150; patcnt++) {
+		ast_moutdwm(ast, 0x1e6e007c, pattern_AST2150[patcnt]);
+		for (loop = 0; loop < CBR_PASSNUM_AST2150; loop++) {
+			if (cbrtest_ast2150(ast))
+				break;
+		}
+		if (loop == CBR_PASSNUM_AST2150)
+			return 0;
+	}
+	return 1;
+}
+
+static void cbrdlli_ast2150(struct ast_device *ast, int busw)
+{
+	u32 dll_min[4], dll_max[4], dlli, data, passcnt;
+
+cbr_start:
+	dll_min[0] = 0xff;
+	dll_min[1] = 0xff;
+	dll_min[2] = 0xff;
+	dll_min[3] = 0xff;
+	dll_max[0] = 0x00;
+	dll_max[1] = 0x00;
+	dll_max[2] = 0x00;
+	dll_max[3] = 0x00;
+	passcnt = 0;
+
+	for (dlli = 0; dlli < 100; dlli++) {
+		ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
+		data = cbrscan_ast2150(ast, busw);
+		if (data != 0) {
+			if (data & 0x1) {
+				if (dll_min[0] > dlli)
+					dll_min[0] = dlli;
+				if (dll_max[0] < dlli)
+					dll_max[0] = dlli;
+			}
+			passcnt++;
+		} else if (passcnt >= CBR_THRESHOLD_AST2150) {
+			goto cbr_start;
+		}
+	}
+	if (dll_max[0] == 0 || (dll_max[0] - dll_min[0]) < CBR_THRESHOLD_AST2150)
+		goto cbr_start;
+
+	dlli = dll_min[0] + (((dll_max[0] - dll_min[0]) * 7) >> 4);
+	ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
+}
+
+static void ast_post_chip_2100(struct ast_device *ast)
+{
+	u8 j;
+	u32 data, temp, i;
+	const struct ast_dramstruct *dram_reg_info;
+
+	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+
+	if ((j & 0x80) == 0) { /* VGA only */
+		if (ast->chip == AST2100 || ast->chip == AST2200)
+			dram_reg_info = ast2100_dram_table_data;
+		else
+			dram_reg_info = ast1100_dram_table_data;
+
+		ast_write32(ast, 0xf004, 0x1e6e0000);
+		ast_write32(ast, 0xf000, 0x1);
+		ast_write32(ast, 0x12000, 0x1688A8A8);
+		do {
+			;
+		} while (ast_read32(ast, 0x12000) != 0x01);
+
+		ast_write32(ast, 0x10000, 0xfc600309);
+		do {
+			;
+		} while (ast_read32(ast, 0x10000) != 0x01);
+
+		while (dram_reg_info->index != 0xffff) {
+			if (dram_reg_info->index == 0xff00) {/* delay fn */
+				for (i = 0; i < 15; i++)
+					udelay(dram_reg_info->data);
+			} else if (dram_reg_info->index == 0x4) {
+				data = dram_reg_info->data;
+				if (ast->dram_type == AST_DRAM_1Gx16)
+					data = 0x00000d89;
+				else if (ast->dram_type == AST_DRAM_1Gx32)
+					data = 0x00000c8d;
+
+				temp = ast_read32(ast, 0x12070);
+				temp &= 0xc;
+				temp <<= 2;
+				ast_write32(ast, 0x10000 + dram_reg_info->index, data | temp);
+			} else {
+				ast_write32(ast, 0x10000 + dram_reg_info->index,
+					    dram_reg_info->data);
+			}
+			dram_reg_info++;
+		}
+
+		/* AST 2100/2150 DRAM calibration */
+		data = ast_read32(ast, 0x10120);
+		if (data == 0x5061) { /* 266Mhz */
+			data = ast_read32(ast, 0x10004);
+			if (data & 0x40)
+				cbrdlli_ast2150(ast, 16); /* 16 bits */
+			else
+				cbrdlli_ast2150(ast, 32); /* 32 bits */
+		}
+
+		temp = ast_read32(ast, 0x1200c);
+		ast_write32(ast, 0x1200c, temp & 0xfffffffd);
+		temp = ast_read32(ast, 0x12040);
+		ast_write32(ast, 0x12040, temp | 0x40);
+	}
+
+	/* wait ready */
+	do {
+		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
+	} while ((j & 0x40) == 0);
+}
+
+int ast_2100_post(struct ast_device *ast)
+{
+	if (ast->config_mode == ast_use_p2a) {
+		ast_post_chip_2100(ast);
+	} else {
+		if (ast->tx_chip == AST_TX_SIL164) {
+			/* Enable DVO */
+			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
index 45bd1afab0d5..6c191e2c4e6c 100644
--- a/drivers/gpu/drm/ast/ast_dram_tables.h
+++ b/drivers/gpu/drm/ast/ast_dram_tables.h
@@ -8,138 +8,4 @@ struct ast_dramstruct {
 	u32 data;
 };
 
-static const struct ast_dramstruct ast2000_dram_table_data[] = {
-	{ 0x0108, 0x00000000 },
-	{ 0x0120, 0x00004a21 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0000, 0xFFFFFFFF },
-	{ 0x0004, 0x00000089 },
-	{ 0x0008, 0x22331353 },
-	{ 0x000C, 0x0d07000b },
-	{ 0x0010, 0x11113333 },
-	{ 0x0020, 0x00110350 },
-	{ 0x0028, 0x1e0828f0 },
-	{ 0x0024, 0x00000001 },
-	{ 0x001C, 0x00000000 },
-	{ 0x0014, 0x00000003 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0018, 0x00000131 },
-	{ 0x0014, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0018, 0x00000031 },
-	{ 0x0014, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0028, 0x1e0828f1 },
-	{ 0x0024, 0x00000003 },
-	{ 0x002C, 0x1f0f28fb },
-	{ 0x0030, 0xFFFFFE01 },
-	{ 0xFFFF, 0xFFFFFFFF }
-};
-
-static const struct ast_dramstruct ast1100_dram_table_data[] = {
-	{ 0x2000, 0x1688a8a8 },
-	{ 0x2020, 0x000041f0 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0000, 0xfc600309 },
-	{ 0x006C, 0x00909090 },
-	{ 0x0064, 0x00050000 },
-	{ 0x0004, 0x00000585 },
-	{ 0x0008, 0x0011030f },
-	{ 0x0010, 0x22201724 },
-	{ 0x0018, 0x1e29011a },
-	{ 0x0020, 0x00c82222 },
-	{ 0x0014, 0x01001523 },
-	{ 0x001C, 0x1024010d },
-	{ 0x0024, 0x00cb2522 },
-	{ 0x0038, 0xffffff82 },
-	{ 0x003C, 0x00000000 },
-	{ 0x0040, 0x00000000 },
-	{ 0x0044, 0x00000000 },
-	{ 0x0048, 0x00000000 },
-	{ 0x004C, 0x00000000 },
-	{ 0x0050, 0x00000000 },
-	{ 0x0054, 0x00000000 },
-	{ 0x0058, 0x00000000 },
-	{ 0x005C, 0x00000000 },
-	{ 0x0060, 0x032aa02a },
-	{ 0x0064, 0x002d3000 },
-	{ 0x0068, 0x00000000 },
-	{ 0x0070, 0x00000000 },
-	{ 0x0074, 0x00000000 },
-	{ 0x0078, 0x00000000 },
-	{ 0x007C, 0x00000000 },
-	{ 0x0034, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x002C, 0x00000732 },
-	{ 0x0030, 0x00000040 },
-	{ 0x0028, 0x00000005 },
-	{ 0x0028, 0x00000007 },
-	{ 0x0028, 0x00000003 },
-	{ 0x0028, 0x00000001 },
-	{ 0x000C, 0x00005a08 },
-	{ 0x002C, 0x00000632 },
-	{ 0x0028, 0x00000001 },
-	{ 0x0030, 0x000003c0 },
-	{ 0x0028, 0x00000003 },
-	{ 0x0030, 0x00000040 },
-	{ 0x0028, 0x00000003 },
-	{ 0x000C, 0x00005a21 },
-	{ 0x0034, 0x00007c03 },
-	{ 0x0120, 0x00004c41 },
-	{ 0xffff, 0xffffffff },
-};
-
-static const struct ast_dramstruct ast2100_dram_table_data[] = {
-	{ 0x2000, 0x1688a8a8 },
-	{ 0x2020, 0x00004120 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x0000, 0xfc600309 },
-	{ 0x006C, 0x00909090 },
-	{ 0x0064, 0x00070000 },
-	{ 0x0004, 0x00000489 },
-	{ 0x0008, 0x0011030f },
-	{ 0x0010, 0x32302926 },
-	{ 0x0018, 0x274c0122 },
-	{ 0x0020, 0x00ce2222 },
-	{ 0x0014, 0x01001523 },
-	{ 0x001C, 0x1024010d },
-	{ 0x0024, 0x00cb2522 },
-	{ 0x0038, 0xffffff82 },
-	{ 0x003C, 0x00000000 },
-	{ 0x0040, 0x00000000 },
-	{ 0x0044, 0x00000000 },
-	{ 0x0048, 0x00000000 },
-	{ 0x004C, 0x00000000 },
-	{ 0x0050, 0x00000000 },
-	{ 0x0054, 0x00000000 },
-	{ 0x0058, 0x00000000 },
-	{ 0x005C, 0x00000000 },
-	{ 0x0060, 0x0f2aa02a },
-	{ 0x0064, 0x003f3005 },
-	{ 0x0068, 0x02020202 },
-	{ 0x0070, 0x00000000 },
-	{ 0x0074, 0x00000000 },
-	{ 0x0078, 0x00000000 },
-	{ 0x007C, 0x00000000 },
-	{ 0x0034, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
-	{ 0x002C, 0x00000942 },
-	{ 0x0030, 0x00000040 },
-	{ 0x0028, 0x00000005 },
-	{ 0x0028, 0x00000007 },
-	{ 0x0028, 0x00000003 },
-	{ 0x0028, 0x00000001 },
-	{ 0x000C, 0x00005a08 },
-	{ 0x002C, 0x00000842 },
-	{ 0x0028, 0x00000001 },
-	{ 0x0030, 0x000003c0 },
-	{ 0x0028, 0x00000003 },
-	{ 0x0030, 0x00000040 },
-	{ 0x0028, 0x00000003 },
-	{ 0x000C, 0x00005a21 },
-	{ 0x0034, 0x00007c03 },
-	{ 0x0120, 0x00005061 },
-	{ 0xffff, 0xffffffff },
-};
-
 #endif
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 653e93b05859..e37a55295ed7 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -417,6 +417,12 @@ struct ast_crtc_state {
 
 int ast_mm_init(struct ast_device *ast);
 
+/* ast_2000.c */
+int ast_2000_post(struct ast_device *ast);
+
+/* ast_2100.c */
+int ast_2100_post(struct ast_device *ast);
+
 /* ast_2300.c */
 int ast_2300_post(struct ast_device *ast);
 
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index a08264210d77..8e575e713f19 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -31,7 +31,6 @@
 
 #include <drm/drm_print.h>
 
-#include "ast_dram_tables.h"
 #include "ast_drv.h"
 #include "ast_post.h"
 
@@ -111,233 +110,6 @@ void ast_moutdwm(struct ast_device *ast, u32 r, u32 v)
 	__ast_moutdwm(ast->regs, r, v);
 }
 
-/*
- * AST2100/2150 DLL CBR Setting
- */
-#define CBR_SIZE_AST2150	     ((16 << 10) - 1)
-#define CBR_PASSNUM_AST2150          5
-#define CBR_THRESHOLD_AST2150        10
-#define CBR_THRESHOLD2_AST2150       10
-#define TIMEOUT_AST2150              5000000
-
-#define CBR_PATNUM_AST2150           8
-
-static const u32 pattern_AST2150[14] = {
-	0xFF00FF00,
-	0xCC33CC33,
-	0xAA55AA55,
-	0xFFFE0001,
-	0x683501FE,
-	0x0F1929B0,
-	0x2D0B4346,
-	0x60767F02,
-	0x6FBE36A6,
-	0x3A253035,
-	0x3019686D,
-	0x41C6167E,
-	0x620152BF,
-	0x20F050E0
-};
-
-static u32 mmctestburst2_ast2150(struct ast_device *ast, u32 datagen)
-{
-	u32 data, timeout;
-
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000001 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
-		if (++timeout > TIMEOUT_AST2150) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-			return 0xffffffff;
-		}
-	} while (!data);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000003 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
-		if (++timeout > TIMEOUT_AST2150) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-			return 0xffffffff;
-		}
-	} while (!data);
-	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	return data;
-}
-
-#if 0 /* unused in DDX driver - here for completeness */
-static u32 mmctestsingle2_ast2150(struct ast_device *ast, u32 datagen)
-{
-	u32 data, timeout;
-
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000005 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
-		if (++timeout > TIMEOUT_AST2150) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-			return 0xffffffff;
-		}
-	} while (!data);
-	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	return data;
-}
-#endif
-
-static int cbrtest_ast2150(struct ast_device *ast)
-{
-	int i;
-
-	for (i = 0; i < 8; i++)
-		if (mmctestburst2_ast2150(ast, i))
-			return 0;
-	return 1;
-}
-
-static int cbrscan_ast2150(struct ast_device *ast, int busw)
-{
-	u32 patcnt, loop;
-
-	for (patcnt = 0; patcnt < CBR_PATNUM_AST2150; patcnt++) {
-		ast_moutdwm(ast, 0x1e6e007c, pattern_AST2150[patcnt]);
-		for (loop = 0; loop < CBR_PASSNUM_AST2150; loop++) {
-			if (cbrtest_ast2150(ast))
-				break;
-		}
-		if (loop == CBR_PASSNUM_AST2150)
-			return 0;
-	}
-	return 1;
-}
-
-
-static void cbrdlli_ast2150(struct ast_device *ast, int busw)
-{
-	u32 dll_min[4], dll_max[4], dlli, data, passcnt;
-
-cbr_start:
-	dll_min[0] = dll_min[1] = dll_min[2] = dll_min[3] = 0xff;
-	dll_max[0] = dll_max[1] = dll_max[2] = dll_max[3] = 0x0;
-	passcnt = 0;
-
-	for (dlli = 0; dlli < 100; dlli++) {
-		ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
-		data = cbrscan_ast2150(ast, busw);
-		if (data != 0) {
-			if (data & 0x1) {
-				if (dll_min[0] > dlli)
-					dll_min[0] = dlli;
-				if (dll_max[0] < dlli)
-					dll_max[0] = dlli;
-			}
-			passcnt++;
-		} else if (passcnt >= CBR_THRESHOLD_AST2150)
-			goto cbr_start;
-	}
-	if (dll_max[0] == 0 || (dll_max[0]-dll_min[0]) < CBR_THRESHOLD_AST2150)
-		goto cbr_start;
-
-	dlli = dll_min[0] + (((dll_max[0] - dll_min[0]) * 7) >> 4);
-	ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
-}
-
-
-
-static void ast_init_dram_reg(struct ast_device *ast)
-{
-	u8 j;
-	u32 data, temp, i;
-	const struct ast_dramstruct *dram_reg_info;
-
-	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-
-	if ((j & 0x80) == 0) { /* VGA only */
-		if (IS_AST_GEN1(ast)) {
-			dram_reg_info = ast2000_dram_table_data;
-			ast_write32(ast, 0xf004, 0x1e6e0000);
-			ast_write32(ast, 0xf000, 0x1);
-			ast_write32(ast, 0x10100, 0xa8);
-
-			do {
-				;
-			} while (ast_read32(ast, 0x10100) != 0xa8);
-		} else { /* GEN2/GEN3 */
-			if (ast->chip == AST2100 || ast->chip == AST2200)
-				dram_reg_info = ast2100_dram_table_data;
-			else
-				dram_reg_info = ast1100_dram_table_data;
-
-			ast_write32(ast, 0xf004, 0x1e6e0000);
-			ast_write32(ast, 0xf000, 0x1);
-			ast_write32(ast, 0x12000, 0x1688A8A8);
-			do {
-				;
-			} while (ast_read32(ast, 0x12000) != 0x01);
-
-			ast_write32(ast, 0x10000, 0xfc600309);
-			do {
-				;
-			} while (ast_read32(ast, 0x10000) != 0x01);
-		}
-
-		while (dram_reg_info->index != 0xffff) {
-			if (dram_reg_info->index == 0xff00) {/* delay fn */
-				for (i = 0; i < 15; i++)
-					udelay(dram_reg_info->data);
-			} else if (dram_reg_info->index == 0x4 && !IS_AST_GEN1(ast)) {
-				data = dram_reg_info->data;
-				if (ast->dram_type == AST_DRAM_1Gx16)
-					data = 0x00000d89;
-				else if (ast->dram_type == AST_DRAM_1Gx32)
-					data = 0x00000c8d;
-
-				temp = ast_read32(ast, 0x12070);
-				temp &= 0xc;
-				temp <<= 2;
-				ast_write32(ast, 0x10000 + dram_reg_info->index, data | temp);
-			} else
-				ast_write32(ast, 0x10000 + dram_reg_info->index, dram_reg_info->data);
-			dram_reg_info++;
-		}
-
-		/* AST 2100/2150 DRAM calibration */
-		data = ast_read32(ast, 0x10120);
-		if (data == 0x5061) { /* 266Mhz */
-			data = ast_read32(ast, 0x10004);
-			if (data & 0x40)
-				cbrdlli_ast2150(ast, 16); /* 16 bits */
-			else
-				cbrdlli_ast2150(ast, 32); /* 32 bits */
-		}
-
-		switch (AST_GEN(ast)) {
-		case 1:
-			temp = ast_read32(ast, 0x10140);
-			ast_write32(ast, 0x10140, temp | 0x40);
-			break;
-		case 2:
-		case 3:
-			temp = ast_read32(ast, 0x1200c);
-			ast_write32(ast, 0x1200c, temp & 0xfffffffd);
-			temp = ast_read32(ast, 0x12040);
-			ast_write32(ast, 0x12040, temp | 0x40);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/* wait ready */
-	do {
-		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-	} while ((j & 0x40) == 0);
-}
-
 int ast_post_gpu(struct ast_device *ast)
 {
 	int ret;
@@ -356,15 +128,14 @@ int ast_post_gpu(struct ast_device *ast)
 		ret = ast_2300_post(ast);
 		if (ret)
 			return ret;
+	} else  if (AST_GEN(ast) >= 2) {
+		ret = ast_2100_post(ast);
+		if (ret)
+			return ret;
 	} else  {
-		if (ast->config_mode == ast_use_p2a) {
-			ast_init_dram_reg(ast);
-		} else {
-			if (ast->tx_chip == AST_TX_SIL164) {
-				/* Enable DVO */
-				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
-			}
-		}
+		ret = ast_2000_post(ast);
+		if (ret)
+			return ret;
 	}
 
 	return 0;
-- 
2.50.0

Re: [PATCH 05/10] drm/ast: Move Gen2+ and Gen1 POST code to separate source files

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Move POST code for Gen2+ and Gen1 to separate source files and
> hide it in ast_2100_post() ans ast_2000_post(). With P2A
> configuration, the POST logic for these chip generations has
> been mingled in ast_init_dram_reg(). Hence, handle all generations
> in a single change. The split simplifies both cases. Also move
> the DRAM init tables for each Gen into the respective source
> file. No changes to the overall logic.
> 
Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/Makefile          |   2 +
>   drivers/gpu/drm/ast/ast_2000.c        | 117 +++++++++
>   drivers/gpu/drm/ast/ast_2100.c        | 346 ++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_dram_tables.h | 134 ----------
>   drivers/gpu/drm/ast/ast_drv.h         |   6 +
>   drivers/gpu/drm/ast/ast_post.c        | 243 +-----------------
>   6 files changed, 478 insertions(+), 370 deletions(-)
>   create mode 100644 drivers/gpu/drm/ast/ast_2000.c
>   create mode 100644 drivers/gpu/drm/ast/ast_2100.c
> 
> diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
> index ccb2ff3e8eac..2547613155da 100644
> --- a/drivers/gpu/drm/ast/Makefile
> +++ b/drivers/gpu/drm/ast/Makefile
> @@ -4,6 +4,8 @@
>   # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>   
>   ast-y := \
> +	ast_2000.o \
> +	ast_2100.o \
>   	ast_2300.o \
>   	ast_2500.o \
>   	ast_2600.o \
> diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
> new file mode 100644
> index 000000000000..099c90e1402f
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_2000.c
> @@ -0,0 +1,117 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2012 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors: Dave Airlie <airlied@redhat.com>
> + */
> +
> +#include <linux/delay.h>
> +
> +#include "ast_dram_tables.h"
> +#include "ast_drv.h"
> +
> +/*
> + * POST
> + */
> +
> +static const struct ast_dramstruct ast2000_dram_table_data[] = {
> +	{ 0x0108, 0x00000000 },
> +	{ 0x0120, 0x00004a21 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0000, 0xFFFFFFFF },
> +	{ 0x0004, 0x00000089 },
> +	{ 0x0008, 0x22331353 },
> +	{ 0x000C, 0x0d07000b },
> +	{ 0x0010, 0x11113333 },
> +	{ 0x0020, 0x00110350 },
> +	{ 0x0028, 0x1e0828f0 },
> +	{ 0x0024, 0x00000001 },
> +	{ 0x001C, 0x00000000 },
> +	{ 0x0014, 0x00000003 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0018, 0x00000131 },
> +	{ 0x0014, 0x00000001 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0018, 0x00000031 },
> +	{ 0x0014, 0x00000001 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0028, 0x1e0828f1 },
> +	{ 0x0024, 0x00000003 },
> +	{ 0x002C, 0x1f0f28fb },
> +	{ 0x0030, 0xFFFFFE01 },
> +	{ 0xFFFF, 0xFFFFFFFF }
> +};
> +
> +static void ast_post_chip_2000(struct ast_device *ast)
> +{
> +	u8 j;
> +	u32 temp, i;
> +	const struct ast_dramstruct *dram_reg_info;
> +
> +	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +
> +	if ((j & 0x80) == 0) { /* VGA only */
> +		dram_reg_info = ast2000_dram_table_data;
> +		ast_write32(ast, 0xf004, 0x1e6e0000);
> +		ast_write32(ast, 0xf000, 0x1);
> +		ast_write32(ast, 0x10100, 0xa8);
> +
> +		do {
> +			;
> +		} while (ast_read32(ast, 0x10100) != 0xa8);
> +
> +		while (dram_reg_info->index != 0xffff) {
> +			if (dram_reg_info->index == 0xff00) {/* delay fn */
> +				for (i = 0; i < 15; i++)
> +					udelay(dram_reg_info->data);
> +			} else {
> +				ast_write32(ast, 0x10000 + dram_reg_info->index,
> +					    dram_reg_info->data);
> +			}
> +			dram_reg_info++;
> +		}
> +
> +		temp = ast_read32(ast, 0x10140);
> +		ast_write32(ast, 0x10140, temp | 0x40);
> +	}
> +
> +	/* wait ready */
> +	do {
> +		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	} while ((j & 0x40) == 0);
> +}
> +
> +int ast_2000_post(struct ast_device *ast)
> +{
> +	if (ast->config_mode == ast_use_p2a) {
> +		ast_post_chip_2000(ast);
> +	} else {
> +		if (ast->tx_chip == AST_TX_SIL164) {
> +			/* Enable DVO */
> +			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> +		}
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
> new file mode 100644
> index 000000000000..f41c778e02da
> --- /dev/null
> +++ b/drivers/gpu/drm/ast/ast_2100.c
> @@ -0,0 +1,346 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2012 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors: Dave Airlie <airlied@redhat.com>
> + */
> +
> +#include <linux/delay.h>
> +
> +#include "ast_dram_tables.h"
> +#include "ast_drv.h"
> +
> +/*
> + * POST
> + */
> +
> +static const struct ast_dramstruct ast1100_dram_table_data[] = {
> +	{ 0x2000, 0x1688a8a8 },
> +	{ 0x2020, 0x000041f0 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0000, 0xfc600309 },
> +	{ 0x006C, 0x00909090 },
> +	{ 0x0064, 0x00050000 },
> +	{ 0x0004, 0x00000585 },
> +	{ 0x0008, 0x0011030f },
> +	{ 0x0010, 0x22201724 },
> +	{ 0x0018, 0x1e29011a },
> +	{ 0x0020, 0x00c82222 },
> +	{ 0x0014, 0x01001523 },
> +	{ 0x001C, 0x1024010d },
> +	{ 0x0024, 0x00cb2522 },
> +	{ 0x0038, 0xffffff82 },
> +	{ 0x003C, 0x00000000 },
> +	{ 0x0040, 0x00000000 },
> +	{ 0x0044, 0x00000000 },
> +	{ 0x0048, 0x00000000 },
> +	{ 0x004C, 0x00000000 },
> +	{ 0x0050, 0x00000000 },
> +	{ 0x0054, 0x00000000 },
> +	{ 0x0058, 0x00000000 },
> +	{ 0x005C, 0x00000000 },
> +	{ 0x0060, 0x032aa02a },
> +	{ 0x0064, 0x002d3000 },
> +	{ 0x0068, 0x00000000 },
> +	{ 0x0070, 0x00000000 },
> +	{ 0x0074, 0x00000000 },
> +	{ 0x0078, 0x00000000 },
> +	{ 0x007C, 0x00000000 },
> +	{ 0x0034, 0x00000001 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x002C, 0x00000732 },
> +	{ 0x0030, 0x00000040 },
> +	{ 0x0028, 0x00000005 },
> +	{ 0x0028, 0x00000007 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x0028, 0x00000001 },
> +	{ 0x000C, 0x00005a08 },
> +	{ 0x002C, 0x00000632 },
> +	{ 0x0028, 0x00000001 },
> +	{ 0x0030, 0x000003c0 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x0030, 0x00000040 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x000C, 0x00005a21 },
> +	{ 0x0034, 0x00007c03 },
> +	{ 0x0120, 0x00004c41 },
> +	{ 0xffff, 0xffffffff },
> +};
> +
> +static const struct ast_dramstruct ast2100_dram_table_data[] = {
> +	{ 0x2000, 0x1688a8a8 },
> +	{ 0x2020, 0x00004120 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x0000, 0xfc600309 },
> +	{ 0x006C, 0x00909090 },
> +	{ 0x0064, 0x00070000 },
> +	{ 0x0004, 0x00000489 },
> +	{ 0x0008, 0x0011030f },
> +	{ 0x0010, 0x32302926 },
> +	{ 0x0018, 0x274c0122 },
> +	{ 0x0020, 0x00ce2222 },
> +	{ 0x0014, 0x01001523 },
> +	{ 0x001C, 0x1024010d },
> +	{ 0x0024, 0x00cb2522 },
> +	{ 0x0038, 0xffffff82 },
> +	{ 0x003C, 0x00000000 },
> +	{ 0x0040, 0x00000000 },
> +	{ 0x0044, 0x00000000 },
> +	{ 0x0048, 0x00000000 },
> +	{ 0x004C, 0x00000000 },
> +	{ 0x0050, 0x00000000 },
> +	{ 0x0054, 0x00000000 },
> +	{ 0x0058, 0x00000000 },
> +	{ 0x005C, 0x00000000 },
> +	{ 0x0060, 0x0f2aa02a },
> +	{ 0x0064, 0x003f3005 },
> +	{ 0x0068, 0x02020202 },
> +	{ 0x0070, 0x00000000 },
> +	{ 0x0074, 0x00000000 },
> +	{ 0x0078, 0x00000000 },
> +	{ 0x007C, 0x00000000 },
> +	{ 0x0034, 0x00000001 },
> +	{ 0xFF00, 0x00000043 },
> +	{ 0x002C, 0x00000942 },
> +	{ 0x0030, 0x00000040 },
> +	{ 0x0028, 0x00000005 },
> +	{ 0x0028, 0x00000007 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x0028, 0x00000001 },
> +	{ 0x000C, 0x00005a08 },
> +	{ 0x002C, 0x00000842 },
> +	{ 0x0028, 0x00000001 },
> +	{ 0x0030, 0x000003c0 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x0030, 0x00000040 },
> +	{ 0x0028, 0x00000003 },
> +	{ 0x000C, 0x00005a21 },
> +	{ 0x0034, 0x00007c03 },
> +	{ 0x0120, 0x00005061 },
> +	{ 0xffff, 0xffffffff },
> +};
> +
> +/*
> + * AST2100/2150 DLL CBR Setting
> + */
> +#define CBR_SIZE_AST2150	     ((16 << 10) - 1)
> +#define CBR_PASSNUM_AST2150          5
> +#define CBR_THRESHOLD_AST2150        10
> +#define CBR_THRESHOLD2_AST2150       10
> +#define TIMEOUT_AST2150              5000000
> +
> +#define CBR_PATNUM_AST2150           8
> +
> +static const u32 pattern_AST2150[14] = {
> +	0xFF00FF00,
> +	0xCC33CC33,
> +	0xAA55AA55,
> +	0xFFFE0001,
> +	0x683501FE,
> +	0x0F1929B0,
> +	0x2D0B4346,
> +	0x60767F02,
> +	0x6FBE36A6,
> +	0x3A253035,
> +	0x3019686D,
> +	0x41C6167E,
> +	0x620152BF,
> +	0x20F050E0
> +};
> +
> +static u32 mmctestburst2_ast2150(struct ast_device *ast, u32 datagen)
> +{
> +	u32 data, timeout;
> +
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000001 | (datagen << 3));
> +	timeout = 0;
> +	do {
> +		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
> +		if (++timeout > TIMEOUT_AST2150) {
> +			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +			return 0xffffffff;
> +		}
> +	} while (!data);
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000003 | (datagen << 3));
> +	timeout = 0;
> +	do {
> +		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
> +		if (++timeout > TIMEOUT_AST2150) {
> +			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +			return 0xffffffff;
> +		}
> +	} while (!data);
> +	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
> +	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> +	return data;
> +}
> +
> +static int cbrtest_ast2150(struct ast_device *ast)
> +{
> +	int i;
> +
> +	for (i = 0; i < 8; i++)
> +		if (mmctestburst2_ast2150(ast, i))
> +			return 0;
> +	return 1;
> +}
> +
> +static int cbrscan_ast2150(struct ast_device *ast, int busw)
> +{
> +	u32 patcnt, loop;
> +
> +	for (patcnt = 0; patcnt < CBR_PATNUM_AST2150; patcnt++) {
> +		ast_moutdwm(ast, 0x1e6e007c, pattern_AST2150[patcnt]);
> +		for (loop = 0; loop < CBR_PASSNUM_AST2150; loop++) {
> +			if (cbrtest_ast2150(ast))
> +				break;
> +		}
> +		if (loop == CBR_PASSNUM_AST2150)
> +			return 0;
> +	}
> +	return 1;
> +}
> +
> +static void cbrdlli_ast2150(struct ast_device *ast, int busw)
> +{
> +	u32 dll_min[4], dll_max[4], dlli, data, passcnt;
> +
> +cbr_start:
> +	dll_min[0] = 0xff;
> +	dll_min[1] = 0xff;
> +	dll_min[2] = 0xff;
> +	dll_min[3] = 0xff;
> +	dll_max[0] = 0x00;
> +	dll_max[1] = 0x00;
> +	dll_max[2] = 0x00;
> +	dll_max[3] = 0x00;
> +	passcnt = 0;
> +
> +	for (dlli = 0; dlli < 100; dlli++) {
> +		ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
> +		data = cbrscan_ast2150(ast, busw);
> +		if (data != 0) {
> +			if (data & 0x1) {
> +				if (dll_min[0] > dlli)
> +					dll_min[0] = dlli;
> +				if (dll_max[0] < dlli)
> +					dll_max[0] = dlli;
> +			}
> +			passcnt++;
> +		} else if (passcnt >= CBR_THRESHOLD_AST2150) {
> +			goto cbr_start;
> +		}
> +	}
> +	if (dll_max[0] == 0 || (dll_max[0] - dll_min[0]) < CBR_THRESHOLD_AST2150)
> +		goto cbr_start;
> +
> +	dlli = dll_min[0] + (((dll_max[0] - dll_min[0]) * 7) >> 4);
> +	ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
> +}
> +
> +static void ast_post_chip_2100(struct ast_device *ast)
> +{
> +	u8 j;
> +	u32 data, temp, i;
> +	const struct ast_dramstruct *dram_reg_info;
> +
> +	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +
> +	if ((j & 0x80) == 0) { /* VGA only */
> +		if (ast->chip == AST2100 || ast->chip == AST2200)
> +			dram_reg_info = ast2100_dram_table_data;
> +		else
> +			dram_reg_info = ast1100_dram_table_data;
> +
> +		ast_write32(ast, 0xf004, 0x1e6e0000);
> +		ast_write32(ast, 0xf000, 0x1);
> +		ast_write32(ast, 0x12000, 0x1688A8A8);
> +		do {
> +			;
> +		} while (ast_read32(ast, 0x12000) != 0x01);
> +
> +		ast_write32(ast, 0x10000, 0xfc600309);
> +		do {
> +			;
> +		} while (ast_read32(ast, 0x10000) != 0x01);
> +
> +		while (dram_reg_info->index != 0xffff) {
> +			if (dram_reg_info->index == 0xff00) {/* delay fn */
> +				for (i = 0; i < 15; i++)
> +					udelay(dram_reg_info->data);
> +			} else if (dram_reg_info->index == 0x4) {
> +				data = dram_reg_info->data;
> +				if (ast->dram_type == AST_DRAM_1Gx16)
> +					data = 0x00000d89;
> +				else if (ast->dram_type == AST_DRAM_1Gx32)
> +					data = 0x00000c8d;
> +
> +				temp = ast_read32(ast, 0x12070);
> +				temp &= 0xc;
> +				temp <<= 2;
> +				ast_write32(ast, 0x10000 + dram_reg_info->index, data | temp);
> +			} else {
> +				ast_write32(ast, 0x10000 + dram_reg_info->index,
> +					    dram_reg_info->data);
> +			}
> +			dram_reg_info++;
> +		}
> +
> +		/* AST 2100/2150 DRAM calibration */
> +		data = ast_read32(ast, 0x10120);
> +		if (data == 0x5061) { /* 266Mhz */
> +			data = ast_read32(ast, 0x10004);
> +			if (data & 0x40)
> +				cbrdlli_ast2150(ast, 16); /* 16 bits */
> +			else
> +				cbrdlli_ast2150(ast, 32); /* 32 bits */
> +		}
> +
> +		temp = ast_read32(ast, 0x1200c);
> +		ast_write32(ast, 0x1200c, temp & 0xfffffffd);
> +		temp = ast_read32(ast, 0x12040);
> +		ast_write32(ast, 0x12040, temp | 0x40);
> +	}
> +
> +	/* wait ready */
> +	do {
> +		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> +	} while ((j & 0x40) == 0);
> +}
> +
> +int ast_2100_post(struct ast_device *ast)
> +{
> +	if (ast->config_mode == ast_use_p2a) {
> +		ast_post_chip_2100(ast);
> +	} else {
> +		if (ast->tx_chip == AST_TX_SIL164) {
> +			/* Enable DVO */
> +			ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> +		}
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
> index 45bd1afab0d5..6c191e2c4e6c 100644
> --- a/drivers/gpu/drm/ast/ast_dram_tables.h
> +++ b/drivers/gpu/drm/ast/ast_dram_tables.h
> @@ -8,138 +8,4 @@ struct ast_dramstruct {
>   	u32 data;
>   };
>   
> -static const struct ast_dramstruct ast2000_dram_table_data[] = {
> -	{ 0x0108, 0x00000000 },
> -	{ 0x0120, 0x00004a21 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0000, 0xFFFFFFFF },
> -	{ 0x0004, 0x00000089 },
> -	{ 0x0008, 0x22331353 },
> -	{ 0x000C, 0x0d07000b },
> -	{ 0x0010, 0x11113333 },
> -	{ 0x0020, 0x00110350 },
> -	{ 0x0028, 0x1e0828f0 },
> -	{ 0x0024, 0x00000001 },
> -	{ 0x001C, 0x00000000 },
> -	{ 0x0014, 0x00000003 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0018, 0x00000131 },
> -	{ 0x0014, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0018, 0x00000031 },
> -	{ 0x0014, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0028, 0x1e0828f1 },
> -	{ 0x0024, 0x00000003 },
> -	{ 0x002C, 0x1f0f28fb },
> -	{ 0x0030, 0xFFFFFE01 },
> -	{ 0xFFFF, 0xFFFFFFFF }
> -};
> -
> -static const struct ast_dramstruct ast1100_dram_table_data[] = {
> -	{ 0x2000, 0x1688a8a8 },
> -	{ 0x2020, 0x000041f0 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0000, 0xfc600309 },
> -	{ 0x006C, 0x00909090 },
> -	{ 0x0064, 0x00050000 },
> -	{ 0x0004, 0x00000585 },
> -	{ 0x0008, 0x0011030f },
> -	{ 0x0010, 0x22201724 },
> -	{ 0x0018, 0x1e29011a },
> -	{ 0x0020, 0x00c82222 },
> -	{ 0x0014, 0x01001523 },
> -	{ 0x001C, 0x1024010d },
> -	{ 0x0024, 0x00cb2522 },
> -	{ 0x0038, 0xffffff82 },
> -	{ 0x003C, 0x00000000 },
> -	{ 0x0040, 0x00000000 },
> -	{ 0x0044, 0x00000000 },
> -	{ 0x0048, 0x00000000 },
> -	{ 0x004C, 0x00000000 },
> -	{ 0x0050, 0x00000000 },
> -	{ 0x0054, 0x00000000 },
> -	{ 0x0058, 0x00000000 },
> -	{ 0x005C, 0x00000000 },
> -	{ 0x0060, 0x032aa02a },
> -	{ 0x0064, 0x002d3000 },
> -	{ 0x0068, 0x00000000 },
> -	{ 0x0070, 0x00000000 },
> -	{ 0x0074, 0x00000000 },
> -	{ 0x0078, 0x00000000 },
> -	{ 0x007C, 0x00000000 },
> -	{ 0x0034, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x002C, 0x00000732 },
> -	{ 0x0030, 0x00000040 },
> -	{ 0x0028, 0x00000005 },
> -	{ 0x0028, 0x00000007 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x0028, 0x00000001 },
> -	{ 0x000C, 0x00005a08 },
> -	{ 0x002C, 0x00000632 },
> -	{ 0x0028, 0x00000001 },
> -	{ 0x0030, 0x000003c0 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x0030, 0x00000040 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x000C, 0x00005a21 },
> -	{ 0x0034, 0x00007c03 },
> -	{ 0x0120, 0x00004c41 },
> -	{ 0xffff, 0xffffffff },
> -};
> -
> -static const struct ast_dramstruct ast2100_dram_table_data[] = {
> -	{ 0x2000, 0x1688a8a8 },
> -	{ 0x2020, 0x00004120 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x0000, 0xfc600309 },
> -	{ 0x006C, 0x00909090 },
> -	{ 0x0064, 0x00070000 },
> -	{ 0x0004, 0x00000489 },
> -	{ 0x0008, 0x0011030f },
> -	{ 0x0010, 0x32302926 },
> -	{ 0x0018, 0x274c0122 },
> -	{ 0x0020, 0x00ce2222 },
> -	{ 0x0014, 0x01001523 },
> -	{ 0x001C, 0x1024010d },
> -	{ 0x0024, 0x00cb2522 },
> -	{ 0x0038, 0xffffff82 },
> -	{ 0x003C, 0x00000000 },
> -	{ 0x0040, 0x00000000 },
> -	{ 0x0044, 0x00000000 },
> -	{ 0x0048, 0x00000000 },
> -	{ 0x004C, 0x00000000 },
> -	{ 0x0050, 0x00000000 },
> -	{ 0x0054, 0x00000000 },
> -	{ 0x0058, 0x00000000 },
> -	{ 0x005C, 0x00000000 },
> -	{ 0x0060, 0x0f2aa02a },
> -	{ 0x0064, 0x003f3005 },
> -	{ 0x0068, 0x02020202 },
> -	{ 0x0070, 0x00000000 },
> -	{ 0x0074, 0x00000000 },
> -	{ 0x0078, 0x00000000 },
> -	{ 0x007C, 0x00000000 },
> -	{ 0x0034, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> -	{ 0x002C, 0x00000942 },
> -	{ 0x0030, 0x00000040 },
> -	{ 0x0028, 0x00000005 },
> -	{ 0x0028, 0x00000007 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x0028, 0x00000001 },
> -	{ 0x000C, 0x00005a08 },
> -	{ 0x002C, 0x00000842 },
> -	{ 0x0028, 0x00000001 },
> -	{ 0x0030, 0x000003c0 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x0030, 0x00000040 },
> -	{ 0x0028, 0x00000003 },
> -	{ 0x000C, 0x00005a21 },
> -	{ 0x0034, 0x00007c03 },
> -	{ 0x0120, 0x00005061 },
> -	{ 0xffff, 0xffffffff },
> -};
> -
>   #endif
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 653e93b05859..e37a55295ed7 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -417,6 +417,12 @@ struct ast_crtc_state {
>   
>   int ast_mm_init(struct ast_device *ast);
>   
> +/* ast_2000.c */
> +int ast_2000_post(struct ast_device *ast);
> +
> +/* ast_2100.c */
> +int ast_2100_post(struct ast_device *ast);
> +
>   /* ast_2300.c */
>   int ast_2300_post(struct ast_device *ast);
>   
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index a08264210d77..8e575e713f19 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -31,7 +31,6 @@
>   
>   #include <drm/drm_print.h>
>   
> -#include "ast_dram_tables.h"
>   #include "ast_drv.h"
>   #include "ast_post.h"
>   
> @@ -111,233 +110,6 @@ void ast_moutdwm(struct ast_device *ast, u32 r, u32 v)
>   	__ast_moutdwm(ast->regs, r, v);
>   }
>   
> -/*
> - * AST2100/2150 DLL CBR Setting
> - */
> -#define CBR_SIZE_AST2150	     ((16 << 10) - 1)
> -#define CBR_PASSNUM_AST2150          5
> -#define CBR_THRESHOLD_AST2150        10
> -#define CBR_THRESHOLD2_AST2150       10
> -#define TIMEOUT_AST2150              5000000
> -
> -#define CBR_PATNUM_AST2150           8
> -
> -static const u32 pattern_AST2150[14] = {
> -	0xFF00FF00,
> -	0xCC33CC33,
> -	0xAA55AA55,
> -	0xFFFE0001,
> -	0x683501FE,
> -	0x0F1929B0,
> -	0x2D0B4346,
> -	0x60767F02,
> -	0x6FBE36A6,
> -	0x3A253035,
> -	0x3019686D,
> -	0x41C6167E,
> -	0x620152BF,
> -	0x20F050E0
> -};
> -
> -static u32 mmctestburst2_ast2150(struct ast_device *ast, u32 datagen)
> -{
> -	u32 data, timeout;
> -
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000001 | (datagen << 3));
> -	timeout = 0;
> -	do {
> -		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
> -		if (++timeout > TIMEOUT_AST2150) {
> -			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -			return 0xffffffff;
> -		}
> -	} while (!data);
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000003 | (datagen << 3));
> -	timeout = 0;
> -	do {
> -		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
> -		if (++timeout > TIMEOUT_AST2150) {
> -			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -			return 0xffffffff;
> -		}
> -	} while (!data);
> -	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	return data;
> -}
> -
> -#if 0 /* unused in DDX driver - here for completeness */
> -static u32 mmctestsingle2_ast2150(struct ast_device *ast, u32 datagen)
> -{
> -	u32 data, timeout;
> -
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000005 | (datagen << 3));
> -	timeout = 0;
> -	do {
> -		data = ast_mindwm(ast, 0x1e6e0070) & 0x40;
> -		if (++timeout > TIMEOUT_AST2150) {
> -			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -			return 0xffffffff;
> -		}
> -	} while (!data);
> -	data = (ast_mindwm(ast, 0x1e6e0070) & 0x80) >> 7;
> -	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
> -	return data;
> -}
> -#endif
> -
> -static int cbrtest_ast2150(struct ast_device *ast)
> -{
> -	int i;
> -
> -	for (i = 0; i < 8; i++)
> -		if (mmctestburst2_ast2150(ast, i))
> -			return 0;
> -	return 1;
> -}
> -
> -static int cbrscan_ast2150(struct ast_device *ast, int busw)
> -{
> -	u32 patcnt, loop;
> -
> -	for (patcnt = 0; patcnt < CBR_PATNUM_AST2150; patcnt++) {
> -		ast_moutdwm(ast, 0x1e6e007c, pattern_AST2150[patcnt]);
> -		for (loop = 0; loop < CBR_PASSNUM_AST2150; loop++) {
> -			if (cbrtest_ast2150(ast))
> -				break;
> -		}
> -		if (loop == CBR_PASSNUM_AST2150)
> -			return 0;
> -	}
> -	return 1;
> -}
> -
> -
> -static void cbrdlli_ast2150(struct ast_device *ast, int busw)
> -{
> -	u32 dll_min[4], dll_max[4], dlli, data, passcnt;
> -
> -cbr_start:
> -	dll_min[0] = dll_min[1] = dll_min[2] = dll_min[3] = 0xff;
> -	dll_max[0] = dll_max[1] = dll_max[2] = dll_max[3] = 0x0;
> -	passcnt = 0;
> -
> -	for (dlli = 0; dlli < 100; dlli++) {
> -		ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
> -		data = cbrscan_ast2150(ast, busw);
> -		if (data != 0) {
> -			if (data & 0x1) {
> -				if (dll_min[0] > dlli)
> -					dll_min[0] = dlli;
> -				if (dll_max[0] < dlli)
> -					dll_max[0] = dlli;
> -			}
> -			passcnt++;
> -		} else if (passcnt >= CBR_THRESHOLD_AST2150)
> -			goto cbr_start;
> -	}
> -	if (dll_max[0] == 0 || (dll_max[0]-dll_min[0]) < CBR_THRESHOLD_AST2150)
> -		goto cbr_start;
> -
> -	dlli = dll_min[0] + (((dll_max[0] - dll_min[0]) * 7) >> 4);
> -	ast_moutdwm(ast, 0x1e6e0068, dlli | (dlli << 8) | (dlli << 16) | (dlli << 24));
> -}
> -
> -
> -
> -static void ast_init_dram_reg(struct ast_device *ast)
> -{
> -	u8 j;
> -	u32 data, temp, i;
> -	const struct ast_dramstruct *dram_reg_info;
> -
> -	j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -
> -	if ((j & 0x80) == 0) { /* VGA only */
> -		if (IS_AST_GEN1(ast)) {
> -			dram_reg_info = ast2000_dram_table_data;
> -			ast_write32(ast, 0xf004, 0x1e6e0000);
> -			ast_write32(ast, 0xf000, 0x1);
> -			ast_write32(ast, 0x10100, 0xa8);
> -
> -			do {
> -				;
> -			} while (ast_read32(ast, 0x10100) != 0xa8);
> -		} else { /* GEN2/GEN3 */
> -			if (ast->chip == AST2100 || ast->chip == AST2200)
> -				dram_reg_info = ast2100_dram_table_data;
> -			else
> -				dram_reg_info = ast1100_dram_table_data;
> -
> -			ast_write32(ast, 0xf004, 0x1e6e0000);
> -			ast_write32(ast, 0xf000, 0x1);
> -			ast_write32(ast, 0x12000, 0x1688A8A8);
> -			do {
> -				;
> -			} while (ast_read32(ast, 0x12000) != 0x01);
> -
> -			ast_write32(ast, 0x10000, 0xfc600309);
> -			do {
> -				;
> -			} while (ast_read32(ast, 0x10000) != 0x01);
> -		}
> -
> -		while (dram_reg_info->index != 0xffff) {
> -			if (dram_reg_info->index == 0xff00) {/* delay fn */
> -				for (i = 0; i < 15; i++)
> -					udelay(dram_reg_info->data);
> -			} else if (dram_reg_info->index == 0x4 && !IS_AST_GEN1(ast)) {
> -				data = dram_reg_info->data;
> -				if (ast->dram_type == AST_DRAM_1Gx16)
> -					data = 0x00000d89;
> -				else if (ast->dram_type == AST_DRAM_1Gx32)
> -					data = 0x00000c8d;
> -
> -				temp = ast_read32(ast, 0x12070);
> -				temp &= 0xc;
> -				temp <<= 2;
> -				ast_write32(ast, 0x10000 + dram_reg_info->index, data | temp);
> -			} else
> -				ast_write32(ast, 0x10000 + dram_reg_info->index, dram_reg_info->data);
> -			dram_reg_info++;
> -		}
> -
> -		/* AST 2100/2150 DRAM calibration */
> -		data = ast_read32(ast, 0x10120);
> -		if (data == 0x5061) { /* 266Mhz */
> -			data = ast_read32(ast, 0x10004);
> -			if (data & 0x40)
> -				cbrdlli_ast2150(ast, 16); /* 16 bits */
> -			else
> -				cbrdlli_ast2150(ast, 32); /* 32 bits */
> -		}
> -
> -		switch (AST_GEN(ast)) {
> -		case 1:
> -			temp = ast_read32(ast, 0x10140);
> -			ast_write32(ast, 0x10140, temp | 0x40);
> -			break;
> -		case 2:
> -		case 3:
> -			temp = ast_read32(ast, 0x1200c);
> -			ast_write32(ast, 0x1200c, temp & 0xfffffffd);
> -			temp = ast_read32(ast, 0x12040);
> -			ast_write32(ast, 0x12040, temp | 0x40);
> -			break;
> -		default:
> -			break;
> -		}
> -	}
> -
> -	/* wait ready */
> -	do {
> -		j = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
> -	} while ((j & 0x40) == 0);
> -}
> -
>   int ast_post_gpu(struct ast_device *ast)
>   {
>   	int ret;
> @@ -356,15 +128,14 @@ int ast_post_gpu(struct ast_device *ast)
>   		ret = ast_2300_post(ast);
>   		if (ret)
>   			return ret;
> +	} else  if (AST_GEN(ast) >= 2) {
> +		ret = ast_2100_post(ast);
> +		if (ret)
> +			return ret;
>   	} else  {
> -		if (ast->config_mode == ast_use_p2a) {
> -			ast_init_dram_reg(ast);
> -		} else {
> -			if (ast->tx_chip == AST_TX_SIL164) {
> -				/* Enable DVO */
> -				ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xa3, 0xcf, 0x80);
> -			}
> -		}
> +		ret = ast_2000_post(ast);
> +		if (ret)
> +			return ret;
>   	}
>   
>   	return 0;

[PATCH 06/10] drm/ast: Move struct ast_dramstruct to ast_post.h

[Thomas Zimmermann]

Declare struct ast_dramstruct in ast_post.h and remove its original
header file.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_2000.c        |  2 +-
 drivers/gpu/drm/ast/ast_2100.c        |  2 +-
 drivers/gpu/drm/ast/ast_dram_tables.h | 11 -----------
 drivers/gpu/drm/ast/ast_post.h        |  6 ++++++
 4 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 drivers/gpu/drm/ast/ast_dram_tables.h

diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
index 099c90e1402f..b2ad2ea5056b 100644
--- a/drivers/gpu/drm/ast/ast_2000.c
+++ b/drivers/gpu/drm/ast/ast_2000.c
@@ -28,8 +28,8 @@
 
 #include <linux/delay.h>
 
-#include "ast_dram_tables.h"
 #include "ast_drv.h"
+#include "ast_post.h"
 
 /*
  * POST
diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
index f41c778e02da..ee40f3911ca4 100644
--- a/drivers/gpu/drm/ast/ast_2100.c
+++ b/drivers/gpu/drm/ast/ast_2100.c
@@ -28,8 +28,8 @@
 
 #include <linux/delay.h>
 
-#include "ast_dram_tables.h"
 #include "ast_drv.h"
+#include "ast_post.h"
 
 /*
  * POST
diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
deleted file mode 100644
index 6c191e2c4e6c..000000000000
--- a/drivers/gpu/drm/ast/ast_dram_tables.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef AST_DRAM_TABLES_H
-#define AST_DRAM_TABLES_H
-
-/* DRAM timing tables */
-struct ast_dramstruct {
-	u16 index;
-	u32 data;
-};
-
-#endif
diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
index 314fa0475c79..3a55c32a7eb7 100644
--- a/drivers/gpu/drm/ast/ast_post.h
+++ b/drivers/gpu/drm/ast/ast_post.h
@@ -7,6 +7,12 @@
 
 struct ast_device;
 
+/* DRAM timing tables */
+struct ast_dramstruct {
+	u16 index;
+	u32 data;
+};
+
 u32 __ast_mindwm(void __iomem *regs, u32 r);
 void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
 
-- 
2.50.0

Re: [PATCH 06/10] drm/ast: Move struct ast_dramstruct to ast_post.h

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Declare struct ast_dramstruct in ast_post.h and remove its original
> header file.

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_2000.c        |  2 +-
>   drivers/gpu/drm/ast/ast_2100.c        |  2 +-
>   drivers/gpu/drm/ast/ast_dram_tables.h | 11 -----------
>   drivers/gpu/drm/ast/ast_post.h        |  6 ++++++
>   4 files changed, 8 insertions(+), 13 deletions(-)
>   delete mode 100644 drivers/gpu/drm/ast/ast_dram_tables.h
> 
> diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
> index 099c90e1402f..b2ad2ea5056b 100644
> --- a/drivers/gpu/drm/ast/ast_2000.c
> +++ b/drivers/gpu/drm/ast/ast_2000.c
> @@ -28,8 +28,8 @@
>   
>   #include <linux/delay.h>
>   
> -#include "ast_dram_tables.h"
>   #include "ast_drv.h"
> +#include "ast_post.h"
>   
>   /*
>    * POST
> diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
> index f41c778e02da..ee40f3911ca4 100644
> --- a/drivers/gpu/drm/ast/ast_2100.c
> +++ b/drivers/gpu/drm/ast/ast_2100.c
> @@ -28,8 +28,8 @@
>   
>   #include <linux/delay.h>
>   
> -#include "ast_dram_tables.h"
>   #include "ast_drv.h"
> +#include "ast_post.h"
>   
>   /*
>    * POST
> diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
> deleted file mode 100644
> index 6c191e2c4e6c..000000000000
> --- a/drivers/gpu/drm/ast/ast_dram_tables.h
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef AST_DRAM_TABLES_H
> -#define AST_DRAM_TABLES_H
> -
> -/* DRAM timing tables */
> -struct ast_dramstruct {
> -	u16 index;
> -	u32 data;
> -};
> -
> -#endif
> diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
> index 314fa0475c79..3a55c32a7eb7 100644
> --- a/drivers/gpu/drm/ast/ast_post.h
> +++ b/drivers/gpu/drm/ast/ast_post.h
> @@ -7,6 +7,12 @@
>   
>   struct ast_device;
>   
> +/* DRAM timing tables */
> +struct ast_dramstruct {
> +	u16 index;
> +	u32 data;
> +};
> +
>   u32 __ast_mindwm(void __iomem *regs, u32 r);
>   void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
>   

[PATCH 07/10] drm/ast: Handle known struct ast_dramstruct with helpers

[Thomas Zimmermann]

Most of struct ast_dramstruct stores hardware state. Some index
values have known or special meaning. The known values are

- 0xffff - Terminal entry in the array
- 0xff00 - Delays the programming for usecs
- 0x0004 - Sets the type of DRAM

Add constants and helper macros for these cases. Also add a helper
macro for testing. Update Gen1 and Gen2+ accordingly.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_2000.c | 16 ++++++++--------
 drivers/gpu/drm/ast/ast_2100.c | 22 +++++++++++-----------
 drivers/gpu/drm/ast/ast_post.h | 22 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
index b2ad2ea5056b..93f13ecc74dc 100644
--- a/drivers/gpu/drm/ast/ast_2000.c
+++ b/drivers/gpu/drm/ast/ast_2000.c
@@ -38,9 +38,9 @@
 static const struct ast_dramstruct ast2000_dram_table_data[] = {
 	{ 0x0108, 0x00000000 },
 	{ 0x0120, 0x00004a21 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0000, 0xFFFFFFFF },
-	{ 0x0004, 0x00000089 },
+	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000089),
 	{ 0x0008, 0x22331353 },
 	{ 0x000C, 0x0d07000b },
 	{ 0x0010, 0x11113333 },
@@ -49,18 +49,18 @@ static const struct ast_dramstruct ast2000_dram_table_data[] = {
 	{ 0x0024, 0x00000001 },
 	{ 0x001C, 0x00000000 },
 	{ 0x0014, 0x00000003 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0018, 0x00000131 },
 	{ 0x0014, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0018, 0x00000031 },
 	{ 0x0014, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0028, 0x1e0828f1 },
 	{ 0x0024, 0x00000003 },
 	{ 0x002C, 0x1f0f28fb },
 	{ 0x0030, 0xFFFFFE01 },
-	{ 0xFFFF, 0xFFFFFFFF }
+	AST_DRAMSTRUCT_INVALID,
 };
 
 static void ast_post_chip_2000(struct ast_device *ast)
@@ -81,8 +81,8 @@ static void ast_post_chip_2000(struct ast_device *ast)
 			;
 		} while (ast_read32(ast, 0x10100) != 0xa8);
 
-		while (dram_reg_info->index != 0xffff) {
-			if (dram_reg_info->index == 0xff00) {/* delay fn */
+		while (!AST_DRAMSTRUCT_IS(dram_reg_info, INVALID)) {
+			if (AST_DRAMSTRUCT_IS(dram_reg_info, UDELAY)) {
 				for (i = 0; i < 15; i++)
 					udelay(dram_reg_info->data);
 			} else {
diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
index ee40f3911ca4..1cabac647584 100644
--- a/drivers/gpu/drm/ast/ast_2100.c
+++ b/drivers/gpu/drm/ast/ast_2100.c
@@ -38,11 +38,11 @@
 static const struct ast_dramstruct ast1100_dram_table_data[] = {
 	{ 0x2000, 0x1688a8a8 },
 	{ 0x2020, 0x000041f0 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0000, 0xfc600309 },
 	{ 0x006C, 0x00909090 },
 	{ 0x0064, 0x00050000 },
-	{ 0x0004, 0x00000585 },
+	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000585),
 	{ 0x0008, 0x0011030f },
 	{ 0x0010, 0x22201724 },
 	{ 0x0018, 0x1e29011a },
@@ -68,7 +68,7 @@ static const struct ast_dramstruct ast1100_dram_table_data[] = {
 	{ 0x0078, 0x00000000 },
 	{ 0x007C, 0x00000000 },
 	{ 0x0034, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x002C, 0x00000732 },
 	{ 0x0030, 0x00000040 },
 	{ 0x0028, 0x00000005 },
@@ -85,17 +85,17 @@ static const struct ast_dramstruct ast1100_dram_table_data[] = {
 	{ 0x000C, 0x00005a21 },
 	{ 0x0034, 0x00007c03 },
 	{ 0x0120, 0x00004c41 },
-	{ 0xffff, 0xffffffff },
+	AST_DRAMSTRUCT_INVALID,
 };
 
 static const struct ast_dramstruct ast2100_dram_table_data[] = {
 	{ 0x2000, 0x1688a8a8 },
 	{ 0x2020, 0x00004120 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x0000, 0xfc600309 },
 	{ 0x006C, 0x00909090 },
 	{ 0x0064, 0x00070000 },
-	{ 0x0004, 0x00000489 },
+	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000489),
 	{ 0x0008, 0x0011030f },
 	{ 0x0010, 0x32302926 },
 	{ 0x0018, 0x274c0122 },
@@ -121,7 +121,7 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
 	{ 0x0078, 0x00000000 },
 	{ 0x007C, 0x00000000 },
 	{ 0x0034, 0x00000001 },
-	{ 0xFF00, 0x00000043 },
+	AST_DRAMSTRUCT_UDELAY(67u),
 	{ 0x002C, 0x00000942 },
 	{ 0x0030, 0x00000040 },
 	{ 0x0028, 0x00000005 },
@@ -138,7 +138,7 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
 	{ 0x000C, 0x00005a21 },
 	{ 0x0034, 0x00007c03 },
 	{ 0x0120, 0x00005061 },
-	{ 0xffff, 0xffffffff },
+	AST_DRAMSTRUCT_INVALID,
 };
 
 /*
@@ -287,11 +287,11 @@ static void ast_post_chip_2100(struct ast_device *ast)
 			;
 		} while (ast_read32(ast, 0x10000) != 0x01);
 
-		while (dram_reg_info->index != 0xffff) {
-			if (dram_reg_info->index == 0xff00) {/* delay fn */
+		while (!AST_DRAMSTRUCT_IS(dram_reg_info, INVALID)) {
+			if (AST_DRAMSTRUCT_IS(dram_reg_info, UDELAY)) {
 				for (i = 0; i < 15; i++)
 					udelay(dram_reg_info->data);
-			} else if (dram_reg_info->index == 0x4) {
+			} else if (AST_DRAMSTRUCT_IS(dram_reg_info, DRAM_TYPE)) {
 				data = dram_reg_info->data;
 				if (ast->dram_type == AST_DRAM_1Gx16)
 					data = 0x00000d89;
diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
index 3a55c32a7eb7..44136856952f 100644
--- a/drivers/gpu/drm/ast/ast_post.h
+++ b/drivers/gpu/drm/ast/ast_post.h
@@ -3,6 +3,7 @@
 #ifndef AST_POST_H
 #define AST_POST_H
 
+#include <linux/limits.h>
 #include <linux/types.h>
 
 struct ast_device;
@@ -13,6 +14,27 @@ struct ast_dramstruct {
 	u32 data;
 };
 
+/* hardware fields */
+#define __AST_DRAMSTRUCT_DRAM_TYPE      0x0004
+
+/* control commands */
+#define __AST_DRAMSTRUCT_UDELAY         0xff00
+#define __AST_DRAMSTRUCT_INVALID        0xffff
+
+#define __AST_DRAMSTRUCT_INDEX(_name) \
+	(__AST_DRAMSTRUCT_ ## _name)
+
+#define AST_DRAMSTRUCT_INIT(_name, _value) \
+	{ __AST_DRAMSTRUCT_INDEX(_name), (_value) }
+
+#define AST_DRAMSTRUCT_UDELAY(_usecs) \
+	AST_DRAMSTRUCT_INIT(UDELAY, _usecs)
+#define AST_DRAMSTRUCT_INVALID \
+	AST_DRAMSTRUCT_INIT(INVALID, U32_MAX)
+
+#define AST_DRAMSTRUCT_IS(_entry, _name) \
+	((_entry)->index == __AST_DRAMSTRUCT_INDEX(_name))
+
 u32 __ast_mindwm(void __iomem *regs, u32 r);
 void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
 
-- 
2.50.0

Re: [PATCH 07/10] drm/ast: Handle known struct ast_dramstruct with helpers

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Most of struct ast_dramstruct stores hardware state. Some index
> values have known or special meaning. The known values are
> 
> - 0xffff - Terminal entry in the array
> - 0xff00 - Delays the programming for usecs
> - 0x0004 - Sets the type of DRAM
> 
> Add constants and helper macros for these cases. Also add a helper
> macro for testing. Update Gen1 and Gen2+ accordingly.
> 

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_2000.c | 16 ++++++++--------
>   drivers/gpu/drm/ast/ast_2100.c | 22 +++++++++++-----------
>   drivers/gpu/drm/ast/ast_post.h | 22 ++++++++++++++++++++++
>   3 files changed, 41 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
> index b2ad2ea5056b..93f13ecc74dc 100644
> --- a/drivers/gpu/drm/ast/ast_2000.c
> +++ b/drivers/gpu/drm/ast/ast_2000.c
> @@ -38,9 +38,9 @@
>   static const struct ast_dramstruct ast2000_dram_table_data[] = {
>   	{ 0x0108, 0x00000000 },
>   	{ 0x0120, 0x00004a21 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0000, 0xFFFFFFFF },
> -	{ 0x0004, 0x00000089 },
> +	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000089),
>   	{ 0x0008, 0x22331353 },
>   	{ 0x000C, 0x0d07000b },
>   	{ 0x0010, 0x11113333 },
> @@ -49,18 +49,18 @@ static const struct ast_dramstruct ast2000_dram_table_data[] = {
>   	{ 0x0024, 0x00000001 },
>   	{ 0x001C, 0x00000000 },
>   	{ 0x0014, 0x00000003 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0018, 0x00000131 },
>   	{ 0x0014, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0018, 0x00000031 },
>   	{ 0x0014, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0028, 0x1e0828f1 },
>   	{ 0x0024, 0x00000003 },
>   	{ 0x002C, 0x1f0f28fb },
>   	{ 0x0030, 0xFFFFFE01 },
> -	{ 0xFFFF, 0xFFFFFFFF }
> +	AST_DRAMSTRUCT_INVALID,
>   };
>   
>   static void ast_post_chip_2000(struct ast_device *ast)
> @@ -81,8 +81,8 @@ static void ast_post_chip_2000(struct ast_device *ast)
>   			;
>   		} while (ast_read32(ast, 0x10100) != 0xa8);
>   
> -		while (dram_reg_info->index != 0xffff) {
> -			if (dram_reg_info->index == 0xff00) {/* delay fn */
> +		while (!AST_DRAMSTRUCT_IS(dram_reg_info, INVALID)) {
> +			if (AST_DRAMSTRUCT_IS(dram_reg_info, UDELAY)) {
>   				for (i = 0; i < 15; i++)
>   					udelay(dram_reg_info->data);
>   			} else {
> diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
> index ee40f3911ca4..1cabac647584 100644
> --- a/drivers/gpu/drm/ast/ast_2100.c
> +++ b/drivers/gpu/drm/ast/ast_2100.c
> @@ -38,11 +38,11 @@
>   static const struct ast_dramstruct ast1100_dram_table_data[] = {
>   	{ 0x2000, 0x1688a8a8 },
>   	{ 0x2020, 0x000041f0 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0000, 0xfc600309 },
>   	{ 0x006C, 0x00909090 },
>   	{ 0x0064, 0x00050000 },
> -	{ 0x0004, 0x00000585 },
> +	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000585),
>   	{ 0x0008, 0x0011030f },
>   	{ 0x0010, 0x22201724 },
>   	{ 0x0018, 0x1e29011a },
> @@ -68,7 +68,7 @@ static const struct ast_dramstruct ast1100_dram_table_data[] = {
>   	{ 0x0078, 0x00000000 },
>   	{ 0x007C, 0x00000000 },
>   	{ 0x0034, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x002C, 0x00000732 },
>   	{ 0x0030, 0x00000040 },
>   	{ 0x0028, 0x00000005 },
> @@ -85,17 +85,17 @@ static const struct ast_dramstruct ast1100_dram_table_data[] = {
>   	{ 0x000C, 0x00005a21 },
>   	{ 0x0034, 0x00007c03 },
>   	{ 0x0120, 0x00004c41 },
> -	{ 0xffff, 0xffffffff },
> +	AST_DRAMSTRUCT_INVALID,
>   };
>   
>   static const struct ast_dramstruct ast2100_dram_table_data[] = {
>   	{ 0x2000, 0x1688a8a8 },
>   	{ 0x2020, 0x00004120 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x0000, 0xfc600309 },
>   	{ 0x006C, 0x00909090 },
>   	{ 0x0064, 0x00070000 },
> -	{ 0x0004, 0x00000489 },
> +	AST_DRAMSTRUCT_INIT(DRAM_TYPE, 0x00000489),
>   	{ 0x0008, 0x0011030f },
>   	{ 0x0010, 0x32302926 },
>   	{ 0x0018, 0x274c0122 },
> @@ -121,7 +121,7 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
>   	{ 0x0078, 0x00000000 },
>   	{ 0x007C, 0x00000000 },
>   	{ 0x0034, 0x00000001 },
> -	{ 0xFF00, 0x00000043 },
> +	AST_DRAMSTRUCT_UDELAY(67u),
>   	{ 0x002C, 0x00000942 },
>   	{ 0x0030, 0x00000040 },
>   	{ 0x0028, 0x00000005 },
> @@ -138,7 +138,7 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
>   	{ 0x000C, 0x00005a21 },
>   	{ 0x0034, 0x00007c03 },
>   	{ 0x0120, 0x00005061 },
> -	{ 0xffff, 0xffffffff },
> +	AST_DRAMSTRUCT_INVALID,
>   };
>   
>   /*
> @@ -287,11 +287,11 @@ static void ast_post_chip_2100(struct ast_device *ast)
>   			;
>   		} while (ast_read32(ast, 0x10000) != 0x01);
>   
> -		while (dram_reg_info->index != 0xffff) {
> -			if (dram_reg_info->index == 0xff00) {/* delay fn */
> +		while (!AST_DRAMSTRUCT_IS(dram_reg_info, INVALID)) {
> +			if (AST_DRAMSTRUCT_IS(dram_reg_info, UDELAY)) {
>   				for (i = 0; i < 15; i++)
>   					udelay(dram_reg_info->data);
> -			} else if (dram_reg_info->index == 0x4) {
> +			} else if (AST_DRAMSTRUCT_IS(dram_reg_info, DRAM_TYPE)) {
>   				data = dram_reg_info->data;
>   				if (ast->dram_type == AST_DRAM_1Gx16)
>   					data = 0x00000d89;
> diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
> index 3a55c32a7eb7..44136856952f 100644
> --- a/drivers/gpu/drm/ast/ast_post.h
> +++ b/drivers/gpu/drm/ast/ast_post.h
> @@ -3,6 +3,7 @@
>   #ifndef AST_POST_H
>   #define AST_POST_H
>   
> +#include <linux/limits.h>
>   #include <linux/types.h>
>   
>   struct ast_device;
> @@ -13,6 +14,27 @@ struct ast_dramstruct {
>   	u32 data;
>   };
>   
> +/* hardware fields */
> +#define __AST_DRAMSTRUCT_DRAM_TYPE      0x0004
> +
> +/* control commands */
> +#define __AST_DRAMSTRUCT_UDELAY         0xff00
> +#define __AST_DRAMSTRUCT_INVALID        0xffff
> +
> +#define __AST_DRAMSTRUCT_INDEX(_name) \
> +	(__AST_DRAMSTRUCT_ ## _name)
> +
> +#define AST_DRAMSTRUCT_INIT(_name, _value) \
> +	{ __AST_DRAMSTRUCT_INDEX(_name), (_value) }
> +
> +#define AST_DRAMSTRUCT_UDELAY(_usecs) \
> +	AST_DRAMSTRUCT_INIT(UDELAY, _usecs)
> +#define AST_DRAMSTRUCT_INVALID \
> +	AST_DRAMSTRUCT_INIT(INVALID, U32_MAX)
> +
> +#define AST_DRAMSTRUCT_IS(_entry, _name) \
> +	((_entry)->index == __AST_DRAMSTRUCT_INDEX(_name))
> +
>   u32 __ast_mindwm(void __iomem *regs, u32 r);
>   void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
>   

[PATCH 08/10] drm/ast: Split ast_set_def_ext_reg() by chip generation

[Thomas Zimmermann]

Duplicate ast_set_def_ext_reg() for individual chip generations
and move call it into per-chip source files. Remove the original
code. AST2100 and AST2500 reuse the function from earlier chips.
AST2600 appears to be incorrect as it uses an older function. Keep
this behavior for now.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_2000.c | 32 +++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_2100.c |  2 ++
 drivers/gpu/drm/ast/ast_2300.c | 33 ++++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_2500.c |  2 ++
 drivers/gpu/drm/ast/ast_2600.c | 33 ++++++++++++++++++++++++++++
 drivers/gpu/drm/ast/ast_post.c | 40 ----------------------------------
 drivers/gpu/drm/ast/ast_post.h |  9 ++++++++
 7 files changed, 111 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
index 93f13ecc74dc..41c2aa1e425a 100644
--- a/drivers/gpu/drm/ast/ast_2000.c
+++ b/drivers/gpu/drm/ast/ast_2000.c
@@ -35,6 +35,36 @@
  * POST
  */
 
+void ast_2000_set_def_ext_reg(struct ast_device *ast)
+{
+	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
+	u8 i, index, reg;
+	const u8 *ext_reg_info;
+
+	/* reset scratch */
+	for (i = 0x81; i <= 0x9f; i++)
+		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
+
+	ext_reg_info = extreginfo;
+	index = 0xa0;
+	while (*ext_reg_info != 0xff) {
+		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
+		index++;
+		ext_reg_info++;
+	}
+
+	/* disable standard IO/MEM decode if secondary */
+	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
+
+	/* Set Ext. Default */
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
+
+	/* Enable RAMDAC for A1 */
+	reg = 0x04;
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
+}
+
 static const struct ast_dramstruct ast2000_dram_table_data[] = {
 	{ 0x0108, 0x00000000 },
 	{ 0x0120, 0x00004a21 },
@@ -104,6 +134,8 @@ static void ast_post_chip_2000(struct ast_device *ast)
 
 int ast_2000_post(struct ast_device *ast)
 {
+	ast_2000_set_def_ext_reg(ast);
+
 	if (ast->config_mode == ast_use_p2a) {
 		ast_post_chip_2000(ast);
 	} else {
diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
index 1cabac647584..477ee15eff5d 100644
--- a/drivers/gpu/drm/ast/ast_2100.c
+++ b/drivers/gpu/drm/ast/ast_2100.c
@@ -333,6 +333,8 @@ static void ast_post_chip_2100(struct ast_device *ast)
 
 int ast_2100_post(struct ast_device *ast)
 {
+	ast_2000_set_def_ext_reg(ast);
+
 	if (ast->config_mode == ast_use_p2a) {
 		ast_post_chip_2100(ast);
 	} else {
diff --git a/drivers/gpu/drm/ast/ast_2300.c b/drivers/gpu/drm/ast/ast_2300.c
index 7a2c3fde09d2..dc2a32244689 100644
--- a/drivers/gpu/drm/ast/ast_2300.c
+++ b/drivers/gpu/drm/ast/ast_2300.c
@@ -35,6 +35,37 @@
  *  POST
  */
 
+void ast_2300_set_def_ext_reg(struct ast_device *ast)
+{
+	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1f, 0xff };
+	u8 i, index, reg;
+	const u8 *ext_reg_info;
+
+	/* reset scratch */
+	for (i = 0x81; i <= 0x9f; i++)
+		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
+
+	ext_reg_info = extreginfo;
+	index = 0xa0;
+	while (*ext_reg_info != 0xff) {
+		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
+		index++;
+		ext_reg_info++;
+	}
+
+	/* disable standard IO/MEM decode if secondary */
+	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
+
+	/* Set Ext. Default */
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
+
+	/* Enable RAMDAC for A1 */
+	reg = 0x04;
+	reg |= 0x20;
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
+}
+
 /* AST 2300 DRAM settings */
 #define AST_DDR3 0
 #define AST_DDR2 1
@@ -1281,6 +1312,8 @@ static void ast_post_chip_2300(struct ast_device *ast)
 
 int ast_2300_post(struct ast_device *ast)
 {
+	ast_2300_set_def_ext_reg(ast);
+
 	if (ast->config_mode == ast_use_p2a) {
 		ast_post_chip_2300(ast);
 		ast_init_3rdtx(ast);
diff --git a/drivers/gpu/drm/ast/ast_2500.c b/drivers/gpu/drm/ast/ast_2500.c
index e5b3e0c63222..1e541498ea67 100644
--- a/drivers/gpu/drm/ast/ast_2500.c
+++ b/drivers/gpu/drm/ast/ast_2500.c
@@ -554,6 +554,8 @@ static void ast_post_chip_2500(struct ast_device *ast)
 
 int ast_2500_post(struct ast_device *ast)
 {
+	ast_2300_set_def_ext_reg(ast);
+
 	if (ast->config_mode == ast_use_p2a) {
 		ast_post_chip_2500(ast);
 	} else {
diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
index 556571efa0b2..f9b96c631d4c 100644
--- a/drivers/gpu/drm/ast/ast_2600.c
+++ b/drivers/gpu/drm/ast/ast_2600.c
@@ -27,15 +27,48 @@
  */
 
 #include "ast_drv.h"
+#include "ast_post.h"
 
 /*
  * POST
  */
 
+void ast_2600_set_def_ext_reg(struct ast_device *ast)
+{
+	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
+	u8 i, index, reg;
+	const u8 *ext_reg_info;
+
+	/* reset scratch */
+	for (i = 0x81; i <= 0x9f; i++)
+		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
+
+	ext_reg_info = extreginfo;
+	index = 0xa0;
+	while (*ext_reg_info != 0xff) {
+		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
+		index++;
+		ext_reg_info++;
+	}
+
+	/* disable standard IO/MEM decode if secondary */
+	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
+
+	/* Set Ext. Default */
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
+
+	/* Enable RAMDAC for A1 */
+	reg = 0x04;
+	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
+}
+
 int ast_2600_post(struct ast_device *ast)
 {
 	int ret;
 
+	ast_2600_set_def_ext_reg(ast);
+
 	if (ast->tx_chip == AST_TX_ASTDP) {
 		ret = ast_dp_launch(ast);
 		if (ret)
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 8e575e713f19..b72914dbed38 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -34,44 +34,6 @@
 #include "ast_drv.h"
 #include "ast_post.h"
 
-static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
-static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
-
-static void ast_set_def_ext_reg(struct ast_device *ast)
-{
-	u8 i, index, reg;
-	const u8 *ext_reg_info;
-
-	/* reset scratch */
-	for (i = 0x81; i <= 0x9f; i++)
-		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
-
-	if (IS_AST_GEN4(ast) || IS_AST_GEN5(ast) || IS_AST_GEN6(ast))
-		ext_reg_info = extreginfo_ast2300;
-	else
-		ext_reg_info = extreginfo;
-
-	index = 0xa0;
-	while (*ext_reg_info != 0xff) {
-		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
-		index++;
-		ext_reg_info++;
-	}
-
-	/* disable standard IO/MEM decode if secondary */
-	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
-
-	/* Set Ext. Default */
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
-
-	/* Enable RAMDAC for A1 */
-	reg = 0x04;
-	if (IS_AST_GEN4(ast) || IS_AST_GEN5(ast) || IS_AST_GEN6(ast))
-		reg |= 0x20;
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
-}
-
 u32 __ast_mindwm(void __iomem *regs, u32 r)
 {
 	u32 data;
@@ -114,8 +76,6 @@ int ast_post_gpu(struct ast_device *ast)
 {
 	int ret;
 
-	ast_set_def_ext_reg(ast);
-
 	if (AST_GEN(ast) >= 7) {
 		ret = ast_2600_post(ast);
 		if (ret)
diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
index 44136856952f..9f3108ddeae8 100644
--- a/drivers/gpu/drm/ast/ast_post.h
+++ b/drivers/gpu/drm/ast/ast_post.h
@@ -41,4 +41,13 @@ void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
 bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl);
 bool mmc_test_burst(struct ast_device *ast, u32 datagen);
 
+/* ast_2000.c */
+void ast_2000_set_def_ext_reg(struct ast_device *ast);
+
+/* ast_2300.c */
+void ast_2300_set_def_ext_reg(struct ast_device *ast);
+
+/* ast_2600.c */
+void ast_2600_set_def_ext_reg(struct ast_device *ast);
+
 #endif
-- 
2.50.0

Re: [PATCH 08/10] drm/ast: Split ast_set_def_ext_reg() by chip generation

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Duplicate ast_set_def_ext_reg() for individual chip generations
> and move call it into per-chip source files. Remove the original
> code. AST2100 and AST2500 reuse the function from earlier chips.
> AST2600 appears to be incorrect as it uses an older function. Keep
> this behavior for now.

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_2000.c | 32 +++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_2100.c |  2 ++
>   drivers/gpu/drm/ast/ast_2300.c | 33 ++++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_2500.c |  2 ++
>   drivers/gpu/drm/ast/ast_2600.c | 33 ++++++++++++++++++++++++++++
>   drivers/gpu/drm/ast/ast_post.c | 40 ----------------------------------
>   drivers/gpu/drm/ast/ast_post.h |  9 ++++++++
>   7 files changed, 111 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_2000.c b/drivers/gpu/drm/ast/ast_2000.c
> index 93f13ecc74dc..41c2aa1e425a 100644
> --- a/drivers/gpu/drm/ast/ast_2000.c
> +++ b/drivers/gpu/drm/ast/ast_2000.c
> @@ -35,6 +35,36 @@
>    * POST
>    */
>   
> +void ast_2000_set_def_ext_reg(struct ast_device *ast)
> +{
> +	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
> +	u8 i, index, reg;
> +	const u8 *ext_reg_info;
> +
> +	/* reset scratch */
> +	for (i = 0x81; i <= 0x9f; i++)
> +		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
> +
> +	ext_reg_info = extreginfo;
> +	index = 0xa0;
> +	while (*ext_reg_info != 0xff) {
> +		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
> +		index++;
> +		ext_reg_info++;
> +	}
> +
> +	/* disable standard IO/MEM decode if secondary */
> +	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
> +
> +	/* Set Ext. Default */
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
> +
> +	/* Enable RAMDAC for A1 */
> +	reg = 0x04;
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
> +}
> +
>   static const struct ast_dramstruct ast2000_dram_table_data[] = {
>   	{ 0x0108, 0x00000000 },
>   	{ 0x0120, 0x00004a21 },
> @@ -104,6 +134,8 @@ static void ast_post_chip_2000(struct ast_device *ast)
>   
>   int ast_2000_post(struct ast_device *ast)
>   {
> +	ast_2000_set_def_ext_reg(ast);
> +
>   	if (ast->config_mode == ast_use_p2a) {
>   		ast_post_chip_2000(ast);
>   	} else {
> diff --git a/drivers/gpu/drm/ast/ast_2100.c b/drivers/gpu/drm/ast/ast_2100.c
> index 1cabac647584..477ee15eff5d 100644
> --- a/drivers/gpu/drm/ast/ast_2100.c
> +++ b/drivers/gpu/drm/ast/ast_2100.c
> @@ -333,6 +333,8 @@ static void ast_post_chip_2100(struct ast_device *ast)
>   
>   int ast_2100_post(struct ast_device *ast)
>   {
> +	ast_2000_set_def_ext_reg(ast);
> +
>   	if (ast->config_mode == ast_use_p2a) {
>   		ast_post_chip_2100(ast);
>   	} else {
> diff --git a/drivers/gpu/drm/ast/ast_2300.c b/drivers/gpu/drm/ast/ast_2300.c
> index 7a2c3fde09d2..dc2a32244689 100644
> --- a/drivers/gpu/drm/ast/ast_2300.c
> +++ b/drivers/gpu/drm/ast/ast_2300.c
> @@ -35,6 +35,37 @@
>    *  POST
>    */
>   
> +void ast_2300_set_def_ext_reg(struct ast_device *ast)
> +{
> +	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1f, 0xff };
> +	u8 i, index, reg;
> +	const u8 *ext_reg_info;
> +
> +	/* reset scratch */
> +	for (i = 0x81; i <= 0x9f; i++)
> +		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
> +
> +	ext_reg_info = extreginfo;
> +	index = 0xa0;
> +	while (*ext_reg_info != 0xff) {
> +		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
> +		index++;
> +		ext_reg_info++;
> +	}
> +
> +	/* disable standard IO/MEM decode if secondary */
> +	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
> +
> +	/* Set Ext. Default */
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
> +
> +	/* Enable RAMDAC for A1 */
> +	reg = 0x04;
> +	reg |= 0x20;
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
> +}
> +
>   /* AST 2300 DRAM settings */
>   #define AST_DDR3 0
>   #define AST_DDR2 1
> @@ -1281,6 +1312,8 @@ static void ast_post_chip_2300(struct ast_device *ast)
>   
>   int ast_2300_post(struct ast_device *ast)
>   {
> +	ast_2300_set_def_ext_reg(ast);
> +
>   	if (ast->config_mode == ast_use_p2a) {
>   		ast_post_chip_2300(ast);
>   		ast_init_3rdtx(ast);
> diff --git a/drivers/gpu/drm/ast/ast_2500.c b/drivers/gpu/drm/ast/ast_2500.c
> index e5b3e0c63222..1e541498ea67 100644
> --- a/drivers/gpu/drm/ast/ast_2500.c
> +++ b/drivers/gpu/drm/ast/ast_2500.c
> @@ -554,6 +554,8 @@ static void ast_post_chip_2500(struct ast_device *ast)
>   
>   int ast_2500_post(struct ast_device *ast)
>   {
> +	ast_2300_set_def_ext_reg(ast);
> +
>   	if (ast->config_mode == ast_use_p2a) {
>   		ast_post_chip_2500(ast);
>   	} else {
> diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
> index 556571efa0b2..f9b96c631d4c 100644
> --- a/drivers/gpu/drm/ast/ast_2600.c
> +++ b/drivers/gpu/drm/ast/ast_2600.c
> @@ -27,15 +27,48 @@
>    */
>   
>   #include "ast_drv.h"
> +#include "ast_post.h"
>   
>   /*
>    * POST
>    */
>   
> +void ast_2600_set_def_ext_reg(struct ast_device *ast)
> +{
> +	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
> +	u8 i, index, reg;
> +	const u8 *ext_reg_info;
> +
> +	/* reset scratch */
> +	for (i = 0x81; i <= 0x9f; i++)
> +		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
> +
> +	ext_reg_info = extreginfo;
> +	index = 0xa0;
> +	while (*ext_reg_info != 0xff) {
> +		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
> +		index++;
> +		ext_reg_info++;
> +	}
> +
> +	/* disable standard IO/MEM decode if secondary */
> +	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
> +
> +	/* Set Ext. Default */
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
> +
> +	/* Enable RAMDAC for A1 */
> +	reg = 0x04;
> +	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
> +}
> +
>   int ast_2600_post(struct ast_device *ast)
>   {
>   	int ret;
>   
> +	ast_2600_set_def_ext_reg(ast);
> +
>   	if (ast->tx_chip == AST_TX_ASTDP) {
>   		ret = ast_dp_launch(ast);
>   		if (ret)
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 8e575e713f19..b72914dbed38 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -34,44 +34,6 @@
>   #include "ast_drv.h"
>   #include "ast_post.h"
>   
> -static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
> -static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
> -
> -static void ast_set_def_ext_reg(struct ast_device *ast)
> -{
> -	u8 i, index, reg;
> -	const u8 *ext_reg_info;
> -
> -	/* reset scratch */
> -	for (i = 0x81; i <= 0x9f; i++)
> -		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
> -
> -	if (IS_AST_GEN4(ast) || IS_AST_GEN5(ast) || IS_AST_GEN6(ast))
> -		ext_reg_info = extreginfo_ast2300;
> -	else
> -		ext_reg_info = extreginfo;
> -
> -	index = 0xa0;
> -	while (*ext_reg_info != 0xff) {
> -		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
> -		index++;
> -		ext_reg_info++;
> -	}
> -
> -	/* disable standard IO/MEM decode if secondary */
> -	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
> -
> -	/* Set Ext. Default */
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
> -
> -	/* Enable RAMDAC for A1 */
> -	reg = 0x04;
> -	if (IS_AST_GEN4(ast) || IS_AST_GEN5(ast) || IS_AST_GEN6(ast))
> -		reg |= 0x20;
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
> -}
> -
>   u32 __ast_mindwm(void __iomem *regs, u32 r)
>   {
>   	u32 data;
> @@ -114,8 +76,6 @@ int ast_post_gpu(struct ast_device *ast)
>   {
>   	int ret;
>   
> -	ast_set_def_ext_reg(ast);
> -
>   	if (AST_GEN(ast) >= 7) {
>   		ret = ast_2600_post(ast);
>   		if (ret)
> diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
> index 44136856952f..9f3108ddeae8 100644
> --- a/drivers/gpu/drm/ast/ast_post.h
> +++ b/drivers/gpu/drm/ast/ast_post.h
> @@ -41,4 +41,13 @@ void __ast_moutdwm(void __iomem *regs, u32 r, u32 v);
>   bool mmc_test(struct ast_device *ast, u32 datagen, u8 test_ctl);
>   bool mmc_test_burst(struct ast_device *ast, u32 datagen);
>   
> +/* ast_2000.c */
> +void ast_2000_set_def_ext_reg(struct ast_device *ast);
> +
> +/* ast_2300.c */
> +void ast_2300_set_def_ext_reg(struct ast_device *ast);
> +
> +/* ast_2600.c */
> +void ast_2600_set_def_ext_reg(struct ast_device *ast);
> +
>   #endif

[PATCH 09/10] drm/ast: Gen7: Disable VGASR0[1] as on Gen4+

[Thomas Zimmermann]

Set VGACRB6[5], which disables asynchronous sequencer resets via
VGASR0[1]. This was most likely an oversight when adding support
for Gen7. Aligns Gen7 with the earlier Gen4+.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_2600.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
index f9b96c631d4c..a426a981949e 100644
--- a/drivers/gpu/drm/ast/ast_2600.c
+++ b/drivers/gpu/drm/ast/ast_2600.c
@@ -60,6 +60,7 @@ void ast_2600_set_def_ext_reg(struct ast_device *ast)
 
 	/* Enable RAMDAC for A1 */
 	reg = 0x04;
+	reg |= 0x20;
 	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
 }
 
-- 
2.50.0

Re: [PATCH 09/10] drm/ast: Gen7: Disable VGASR0[1] as on Gen4+

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Set VGACRB6[5], which disables asynchronous sequencer resets via
> VGASR0[1]. This was most likely an oversight when adding support
> for Gen7. Aligns Gen7 with the earlier Gen4+.
> 

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_2600.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
> index f9b96c631d4c..a426a981949e 100644
> --- a/drivers/gpu/drm/ast/ast_2600.c
> +++ b/drivers/gpu/drm/ast/ast_2600.c
> @@ -60,6 +60,7 @@ void ast_2600_set_def_ext_reg(struct ast_device *ast)
>   
>   	/* Enable RAMDAC for A1 */
>   	reg = 0x04;
> +	reg |= 0x20;
>   	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
>   }
>   

[PATCH 10/10] drm/ast: Gen7: Switch default registers to gen4+ state

[Thomas Zimmermann]

Change the default register settings for Gen7 to mach Gen4 and
later. Gen7 currently uses the settings for Gen1, which is most
likely incorrect.

Using Gen4+ settings enables E2M linear-access modes in VGACRA2.
It appears to be related to the chip's PCIE2MBOX feature, which
is unused.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_2600.c | 33 +--------------------------------
 drivers/gpu/drm/ast/ast_post.h |  3 ---
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
index a426a981949e..3a3ef21684ad 100644
--- a/drivers/gpu/drm/ast/ast_2600.c
+++ b/drivers/gpu/drm/ast/ast_2600.c
@@ -33,42 +33,11 @@
  * POST
  */
 
-void ast_2600_set_def_ext_reg(struct ast_device *ast)
-{
-	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
-	u8 i, index, reg;
-	const u8 *ext_reg_info;
-
-	/* reset scratch */
-	for (i = 0x81; i <= 0x9f; i++)
-		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
-
-	ext_reg_info = extreginfo;
-	index = 0xa0;
-	while (*ext_reg_info != 0xff) {
-		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
-		index++;
-		ext_reg_info++;
-	}
-
-	/* disable standard IO/MEM decode if secondary */
-	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
-
-	/* Set Ext. Default */
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
-
-	/* Enable RAMDAC for A1 */
-	reg = 0x04;
-	reg |= 0x20;
-	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
-}
-
 int ast_2600_post(struct ast_device *ast)
 {
 	int ret;
 
-	ast_2600_set_def_ext_reg(ast);
+	ast_2300_set_def_ext_reg(ast);
 
 	if (ast->tx_chip == AST_TX_ASTDP) {
 		ret = ast_dp_launch(ast);
diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
index 9f3108ddeae8..aa5d247bebe8 100644
--- a/drivers/gpu/drm/ast/ast_post.h
+++ b/drivers/gpu/drm/ast/ast_post.h
@@ -47,7 +47,4 @@ void ast_2000_set_def_ext_reg(struct ast_device *ast);
 /* ast_2300.c */
 void ast_2300_set_def_ext_reg(struct ast_device *ast);
 
-/* ast_2600.c */
-void ast_2600_set_def_ext_reg(struct ast_device *ast);
-
 #endif
-- 
2.50.0

Re: [PATCH 10/10] drm/ast: Gen7: Switch default registers to gen4+ state

[Jocelyn Falempe]

On 02/07/2025 15:12, Thomas Zimmermann wrote:
> Change the default register settings for Gen7 to mach Gen4 and
> later. Gen7 currently uses the settings for Gen1, which is most
> likely incorrect.
> 
> Using Gen4+ settings enables E2M linear-access modes in VGACRA2.
> It appears to be related to the chip's PCIE2MBOX feature, which
> is unused.
> 
Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/ast/ast_2600.c | 33 +--------------------------------
>   drivers/gpu/drm/ast/ast_post.h |  3 ---
>   2 files changed, 1 insertion(+), 35 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_2600.c b/drivers/gpu/drm/ast/ast_2600.c
> index a426a981949e..3a3ef21684ad 100644
> --- a/drivers/gpu/drm/ast/ast_2600.c
> +++ b/drivers/gpu/drm/ast/ast_2600.c
> @@ -33,42 +33,11 @@
>    * POST
>    */
>   
> -void ast_2600_set_def_ext_reg(struct ast_device *ast)
> -{
> -	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
> -	u8 i, index, reg;
> -	const u8 *ext_reg_info;
> -
> -	/* reset scratch */
> -	for (i = 0x81; i <= 0x9f; i++)
> -		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);
> -
> -	ext_reg_info = extreginfo;
> -	index = 0xa0;
> -	while (*ext_reg_info != 0xff) {
> -		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);
> -		index++;
> -		ext_reg_info++;
> -	}
> -
> -	/* disable standard IO/MEM decode if secondary */
> -	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */
> -
> -	/* Set Ext. Default */
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);
> -
> -	/* Enable RAMDAC for A1 */
> -	reg = 0x04;
> -	reg |= 0x20;
> -	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);
> -}
> -
>   int ast_2600_post(struct ast_device *ast)
>   {
>   	int ret;
>   
> -	ast_2600_set_def_ext_reg(ast);
> +	ast_2300_set_def_ext_reg(ast);
>   
>   	if (ast->tx_chip == AST_TX_ASTDP) {
>   		ret = ast_dp_launch(ast);
> diff --git a/drivers/gpu/drm/ast/ast_post.h b/drivers/gpu/drm/ast/ast_post.h
> index 9f3108ddeae8..aa5d247bebe8 100644
> --- a/drivers/gpu/drm/ast/ast_post.h
> +++ b/drivers/gpu/drm/ast/ast_post.h
> @@ -47,7 +47,4 @@ void ast_2000_set_def_ext_reg(struct ast_device *ast);
>   /* ast_2300.c */
>   void ast_2300_set_def_ext_reg(struct ast_device *ast);
>   
> -/* ast_2600.c */
> -void ast_2600_set_def_ext_reg(struct ast_device *ast);
> -
>   #endif