Add Aspeed AST2600 soc display support
Subsystems (5)
v4 cover Add Aspeed AST2600 soc display support
From: tommy-huang <[email protected]>
v4:
Add necessary reset control for ast2600.
Add chip caps for futher use.
These code are test on AST2500 and AST2600 by below steps.
1. Add below config to turn VT and LOGO on.
CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y
2. The Linux logo will be shown on the screen, when the BMC boot in Linux.
v3:
Refine the patch for clear separate purpose.
Skip to send devicetree patch
v2:
Remove some unnecessary patch.
Refine for reviwer request.
v1:
First add patch.
Joel Stanley (2):
ARM: dts: aspeed: Add GFX node to AST2600
ARM: dts: aspeed: ast2600-evb: Enable GFX device
tommy-huang (4):
drm/aspeed: Update INTR_STS handling drm/aspeed: Add AST2600 chip support drm/aspeed: Add reset and clock for AST2600 arm:boot:dts:aspeed-g6 Add more gfx reset control
arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 +++++++ arch/arm/boot/dts/aspeed-g6.dtsi | 13 +++++ drivers/gpu/drm/aspeed/aspeed_gfx.h | 17 ++++++- drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 16 ++++++ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 65 ++++++++++++++++++++++-- 5 files changed, 123 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/1 arm:boot:dts:aspeed-g6 Add more gfx reset control
From: tommy-huang <[email protected]>
Add more gfx reset control for ast2600.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g6.dtsi +3 -1
@@ -356,7 +356,9 @@ reg = <0x1e6e6000 0x1000>; reg-io-width = <4>; clocks = <&syscon ASPEED_CLK_GATE_D1CLK>; - resets = <&syscon ASPEED_RESET_GRAPHICS>; + resets = <&syscon ASPEED_RESET_CRT>, + <&syscon ASPEED_RESET_GRAPHICS>; + reset-names = "crt", "engine"; syscon = <&syscon>; status = "disabled"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.17.1
PATCH v4 1/6 ARM: dts: aspeed: Add GFX node to AST2600
In reply to Tommy HaungFrom: Joel Stanley <[email protected]>
The GFX device is present in the AST2600 SoC.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +11 -0
@@ -351,6 +351,17 @@ quality = <100>; }; + gfx: display at 1e6e6000 { + compatible = "aspeed,ast2600-gfx", "aspeed,ast2500-gfx", "syscon"; + reg = <0x1e6e6000 0x1000>; + reg-io-width = <4>; + clocks = <&syscon ASPEED_CLK_GATE_D1CLK>; + resets = <&syscon ASPEED_RESET_GRAPHICS>; + syscon = <&syscon>; + status = "disabled"; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + }; + xdma: xdma at 1e6e7000 { compatible = "aspeed,ast2600-xdma"; reg = <0x1e6e7000 0x100>;
Signature · 1 line
2.17.1
PATCH v4 2/6 ARM: dts: aspeed: ast2600-evb: Enable GFX device
In reply to Tommy HaungFrom: Joel Stanley <[email protected]>
Enable the GFX device with a framebuffer memory region.
--- arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/boot/dts/aspeed-ast2600-evb.dts +18 -0
@@ -23,6 +23,19 @@ reg = <0x80000000 0x80000000>; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; + }; + vcc_sdhci0: regulator-vcc-sdhci0 { compatible = "regulator-fixed"; regulator-name = "SDHCI0 Vcc";
@@ -300,3 +313,8 @@ vqmmc-supply = <&vccq_sdhci1>; clk-phase-sd-hs = <7>, <200>; }; + +&gfx { + status = "okay"; + memory-region = <&gfx_memory>; +};
Signature · 1 line
2.17.1
PATCH v4 3/6 drm/aspeed: Update INTR_STS handling
In reply to Tommy HaungFrom: tommy-huang <[email protected]>
Add interrupt clear register define for further chip support.
--- drivers/gpu/drm/aspeed/aspeed_gfx.h | 1 + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -0
@@ -12,6 +12,7 @@ struct aspeed_gfx {struct regmap *scu;u32 dac_reg; +u32 int_clr_reg;u32 vga_scratch_reg;u32 throd_val;u32 scan_line_max;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +5 -1
@@ -60,6 +60,7 @@struct aspeed_gfx_config {u32 dac_reg;/* DAC register in SCU */ +u32 int_clear_reg;/* Interrupt clear register */ u32 vga_scratch_reg;/* VGA scratch register in SCU */ u32 throd_val;/* Default Threshold Seting */ u32 scan_line_max;/* Max memory size of one scan line */
@@ -67,6 +68,7 @@ struct aspeed_gfx_config {static const struct aspeed_gfx_config ast2400_config = { .dac_reg =0x2c , + .int_clear_reg =0x60 , .vga_scratch_reg =0x50 , .throd_val =CRT_THROD_LOW (0x1e ) |CRT_THROD_HIGH (0x12 ), .scan_line_max =64 ,
@@ -74,6 +76,7 @@ static const struct aspeed_gfx_config ast2400_config = {static const struct aspeed_gfx_config ast2500_config = { .dac_reg =0x2c , + .int_clear_reg =0x60 , .vga_scratch_reg =0x50 , .throd_val =CRT_THROD_LOW (0x24 ) |CRT_THROD_HIGH (0x3c ), .scan_line_max =128 ,
@@ -119,7 +122,7 @@ static irqreturn_t aspeed_gfx_irq_handler(int irq, void *data)if (reg &CRT_CTRL_VERTICAL_INTR_STS ) {drm_crtc_handle_vblank (&priv->pipe.crtc); -writel (reg, priv->base +CRT_CTRL1 ); +writel (reg, priv->base + priv->int_clr_reg);return IRQ_HANDLED ; }
@@ -147,6 +150,7 @@ static int aspeed_gfx_load(struct drm_device *drm) config = match->data; priv->dac_reg = config->dac_reg; + priv->int_clr_reg = config->int_clear_reg; priv->vga_scratch_reg = config->vga_scratch_reg; priv->throd_val = config->throd_val; priv->scan_line_max = config->scan_line_max;
Signature · 1 line
2.17.1
PATCH v4 4/6 drm/aspeed: Add AST2600 chip support
In reply to Tommy HaungFrom: tommy-huang <[email protected]>
Add AST2600 chip support and setting.
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +9 -0
@@ -82,9 +82,18 @@ static const struct aspeed_gfx_config ast2500_config = { .scan_line_max = 128, }; +static const struct aspeed_gfx_config ast2600_config = { + .dac_reg =0xc0 , + .int_clear_reg =0x68 , + .vga_scratch_reg =0x50 , + .throd_val =CRT_THROD_LOW (0x50 ) |CRT_THROD_HIGH (0x70 ), + .scan_line_max =128 , +}; +static const struct of_device_id aspeed_gfx_match[] = { { .compatible ="aspeed,ast2400-gfx" , .data = &ast2400_config }, { .compatible ="aspeed,ast2500-gfx" , .data = &ast2500_config }, + { .compatible ="aspeed,ast2600-gfx" , .data = &ast2600_config }, { }, };MODULE_DEVICE_TABLE (of, aspeed_gfx_match);
Signature · 1 line
2.17.1
PATCH v4 5/6 drm/aspeed: Add reset and clock for AST2600
In reply to Tommy HaungFrom: tommy-huang <[email protected]>
Add more reset and clock select code for AST2600. The gfx_flags parameter was added for chip caps idenified.
--- drivers/gpu/drm/aspeed/aspeed_gfx.h | 16 +++++++- drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 16 ++++++++ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 50 ++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 5 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +15 -1
@@ -8,7 +8,8 @@ struct aspeed_gfx {struct drm_device drm;void __iomem *base;struct clk *clk; -struct reset_control *rst; +struct reset_control *rst_crt; +struct reset_control *rst_engine;struct regmap *scu;u32 dac_reg;
@@ -16,6 +17,7 @@ struct aspeed_gfx {u32 vga_scratch_reg;u32 throd_val;u32 scan_line_max; +u32 flags;struct drm_simple_display_pipe pipe;struct drm_connector connector;
@@ -106,3 +108,15 @@ int aspeed_gfx_create_output(struct drm_device *drm);/* CRT_THROD */ #define CRT_THROD_LOW (x) (x)#define CRT_THROD_HIGH (x) ((x) << 8) + +/* SCU control */ +#define SCU_G6_CLK_COURCE 0x300 + +/* GFX FLAGS */ +#define RESET_MASK BIT(0) +#define RESET_G6 BIT(0) +#define CLK_MASK BIT(4) +#define CLK_G6 BIT(4) + +#define G6_CLK_MASK (BIT(8) | BIT(9) | BIT(10)) +#define G6_USB_40_CLK BIT(9)
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +16 -0
@@ -77,6 +77,18 @@ static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)regmap_update_bits (priv->scu, priv->dac_reg,BIT (16 ),0 ); } +static void aspeed_gfx_set_clk (struct aspeed_gfx *priv) +{ +switch (priv->flags &CLK_MASK ) { +case CLK_G6 : +regmap_update_bits (priv->scu,SCU_G6_CLK_COURCE ,G6_CLK_MASK ,0x0 ); +regmap_update_bits (priv->scu,SCU_G6_CLK_COURCE ,G6_CLK_MASK ,G6_USB_40_CLK ); +break ; +default : +break ; + } +} +static void aspeed_gfx_crtc_mode_set_nofb (struct aspeed_gfx *priv) {struct drm_display_mode *m = &priv->pipe.crtc.state->adjusted_mode;
@@ -87,6 +99,8 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv)if (err)return ; +aspeed_gfx_set_clk (priv); +#if 0 /* TODO: we have only been able to test with the 40MHz USB clock. The * clock is fixed, so we cannot adjust it here. */
@@ -193,6 +207,7 @@ static void aspeed_gfx_pipe_update(struct drm_simple_display_pipe *pipe,static int aspeed_gfx_enable_vblank (struct drm_simple_display_pipe *pipe) {struct aspeed_gfx *priv =drm_pipe_to_aspeed_gfx (pipe); +u32 reg =readl (priv->base +CRT_CTRL1 );/* Clear pending VBLANK IRQ */
@@ -207,6 +222,7 @@ static int aspeed_gfx_enable_vblank(struct drm_simple_display_pipe *pipe)static void aspeed_gfx_disable_vblank (struct drm_simple_display_pipe *pipe) {struct aspeed_gfx *priv =drm_pipe_to_aspeed_gfx (pipe); +u32 reg =readl (priv->base +CRT_CTRL1 ); reg &= ~CRT_CTRL_VERTICAL_INTR_EN ;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +46 -4
95 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 6/6 arm:boot:dts:aspeed-g6 Add more gfx reset control
In reply to Tommy HaungFrom: tommy-huang <[email protected]>
Add more gfx reset control for ast2600.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g6.dtsi +3 -1
@@ -356,7 +356,9 @@ reg = <0x1e6e6000 0x1000>; reg-io-width = <4>; clocks = <&syscon ASPEED_CLK_GATE_D1CLK>; - resets = <&syscon ASPEED_RESET_GRAPHICS>; + resets = <&syscon ASPEED_RESET_CRT>, + <&syscon ASPEED_RESET_GRAPHICS>; + reset-names = "crt", "engine"; syscon = <&syscon>; status = "disabled"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.17.1
kernel test robot
build botRe: [PATCH v4 6/6] arm:boot:dts:aspeed-g6 Add more gfx reset control
Thank you for the patch! Yet something to improve:
Hi Tommy,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on v5.16-rc4]
[also build test ERROR on next-20211207]
[cannot apply to joel-aspeed/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Tommy-Haung/Add-Aspeed-AST2600-soc-display-support/20211207-183100 base: 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 config: arm-defconfig (https://download.01.org/0day-ci/archive/20211208/202112080327.zlIz9vRq-lkp at intel.com/config) compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/1f021d3aa80957f6bd0434bf4b5d66898b8d2e9c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tommy-Haung/Add-Aspeed-AST2600-soc-display-support/20211207-183100 git checkout 1f021d3aa80957f6bd0434bf4b5d66898b8d2e9c
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> Error: arch/arm/boot/dts/aspeed-g6.dtsi:359.23-24 syntax error
FATAL ERROR: Unable to parse input tree
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all at lists.01.org