Skip to contentSkip to conversation

Add 1024x768 timing for AST2600

PATCH In review Tommy Haung 2 participants 8 messages Mar 4, 2022 – Jun 7, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Add 1024x768 timing for AST2600

v1:
Add 1024x768 at 70Hz for AST2600 soc display timing selection. Add gfx flag for future usage.

Testing 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.
3. Check the display mode is 1024x768 at 70Hz at AST2600.
4. Check the display mode is 800x600 at 60Hz at AST2500.

Tommy Haung (2):
drm/aspeed: Add gfx flags and clock selection for AST2600 drm/aspeed: Add 1024x768 mode for AST2600

 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 15 ++++++++++
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 35 ++++++++++++++++++++++++
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  | 20 ++++++++++++--
 drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14 +++++++++-
 4 files changed, 81 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 drm/aspeed: Add gfx flags and clock selection for AST2600

Add clock selection code for AST2600. At AST2600 user could select more than one dispaly timing. Add gfx flags for future usage.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 11 +++++++++++
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 14 ++++++++++++++
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  |  4 ++++
 3 files changed, 29 insertions(+)
drivers/gpu/drm/aspeed/aspeed_gfx.h +11 -0
index 4e6a442c3886..eb4c267cde5e 100644
@@ -16,6 +16,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 +107,13 @@ 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 CLK_MASK			BIT(0)
+#define CLK_G6				BIT(0)
+
+#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 +14 -0
index 827e62c1daba..a24fab22eac4 100644
@@ -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. */
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +4 -0
index d10246b1d1c2..af56ffdccc65 100644
@@ -64,6 +64,7 @@ struct aspeed_gfx_config {
 	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 */
+	u32 gfx_flags;	/* Flags for gfx chip caps */
 };
 
 static const struct aspeed_gfx_config ast2400_config = {
@@ -72,6 +73,7 @@ static const struct aspeed_gfx_config ast2400_config = {
 	.vga_scratch_reg = 0x50,
 	.throd_val = CRT_THROD_LOW(0x1e) | CRT_THROD_HIGH(0x12),
 	.scan_line_max = 64,
+	.gfx_flags = 0,
 };
 
 static const struct aspeed_gfx_config ast2500_config = {
@@ -80,6 +82,7 @@ static const struct aspeed_gfx_config ast2500_config = {
 	.vga_scratch_reg = 0x50,
 	.throd_val = CRT_THROD_LOW(0x24) | CRT_THROD_HIGH(0x3c),
 	.scan_line_max = 128,
+	.gfx_flags = 0,
 };
 
 static const struct aspeed_gfx_config ast2600_config = {
@@ -88,6 +91,7 @@ static const struct aspeed_gfx_config ast2600_config = {
 	.vga_scratch_reg = 0x50,
 	.throd_val = CRT_THROD_LOW(0x50) | CRT_THROD_HIGH(0x70),
 	.scan_line_max = 128,
+	.gfx_flags = CLK_G6,
 };
 
 static const struct of_device_id aspeed_gfx_match[] = {
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 drm/aspeed: Add 1024x768 mode for AST2600

In reply to Tommy Haung

Update the aspeed_gfx_set_clk with display width. At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz. Another chip will still keep 800x600.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29 ++++++++++++++++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  | 16 +++++++++++--
 drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14 +++++++++++-
 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +8 -4
index eb4c267cde5e..c7aefee0657a 100644
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device *drm);
 #define CRT_THROD_HIGH(x)		((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE		0x300
+#define G6_CLK_SOURCE			0x300
+#define G6_CLK_SOURCE_MASK		(BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL		(BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB		BIT(9)
+#define G6_CLK_SEL3			0x308
+#define G6_CLK_DIV_MASK			0x3F000
+#define G6_CLK_DIV_16			(BIT(16)|BIT(15)|BIT(13)|BIT(12))
+#define G6_USB_40_CLK			BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK			BIT(0)
 #define CLK_G6				BIT(0)
-
-#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 +25 -4
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct drm_simple_display_pipe *pipe)
 	return container_of(pipe, struct aspeed_gfx, pipe);
 }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv, int mode_width)
+{
+	regmap_update_bits(priv->scu, G6_CLK_SOURCE, G6_CLK_SOURCE_MASK, 0x0);
+	regmap_update_bits(priv->scu, G6_CLK_SEL3, G6_CLK_DIV_MASK, 0x0);
+
+	switch (mode_width) {
+	case 1024:
+		/* hpll div 16 = 75Mhz */
+		regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+		G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);
+		regmap_update_bits(priv->scu, G6_CLK_SEL3,
+		G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+		break;
+	case 800:
+	default:
+		/* usb 40Mhz */
+		regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+		G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+		break;
+	}
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32 *bpp)
 {
 	struct drm_crtc *crtc = &priv->pipe.crtc;
@@ -77,12 +99,11 @@ 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)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int mode_width)
 {
 	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);
+		aspeed_gfx_set_clock_source(priv, mode_width);
 		break;
 	default:
 		break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv)
 	if (err)
 		return;
 
-	aspeed_gfx_set_clk(priv);
+	aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
 	/* TODO: we have only been able to test with the 40MHz USB clock. The
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +14 -2
index af56ffdccc65..e1a814aebc2d 100644
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 {
+	struct aspeed_gfx *priv = to_aspeed_gfx(drm);
 	int ret;
 
 	ret = drmm_mode_config_init(drm);
@@ -118,8 +119,18 @@ static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 
 	drm->mode_config.min_width = 0;
 	drm->mode_config.min_height = 0;
-	drm->mode_config.max_width = 800;
-	drm->mode_config.max_height = 600;
+
+	switch (priv->flags & CLK_MASK) {
+	case CLK_G6:
+		drm->mode_config.max_width = 1024;
+		drm->mode_config.max_height = 768;
+		break;
+	default:
+		drm->mode_config.max_width = 800;
+		drm->mode_config.max_height = 600;
+		break;
+	}
+
 	drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
 	return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
 	priv->vga_scratch_reg = config->vga_scratch_reg;
 	priv->throd_val = config->throd_val;
 	priv->scan_line_max = config->scan_line_max;
+	priv->flags = config->gfx_flags;
 
 	priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
 	if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +13 -1
index 6759cb88415a..5d5e04f15c59 100644
@@ -10,7 +10,19 @@
 
 static int aspeed_gfx_get_modes(struct drm_connector *connector)
 {
-	return drm_add_modes_noedid(connector, 800, 600);
+	struct aspeed_gfx *priv = container_of(connector, struct aspeed_gfx, connector);
+	int mode_count = 0;
+
+	switch (priv->flags & CLK_MASK) {
+	case CLK_G6:
+		mode_count = drm_add_modes_noedid(connector, 1024, 768);
+		break;
+	default:
+		mode_count = drm_add_modes_noedid(connector, 800, 600);
+		break;
+	}
+
+	return mode_count;
 }
 
 static const struct
Signature · 1 line
2.17.1
maintainer
#3 lore raw

Re: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Quoted 56 lines · Tommy Haung

Update the aspeed_gfx_set_clk with display width. At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz. Another chip will still keep 800x600.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29 ++++++++++++++++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  | 16 +++++++++++--
 drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14 +++++++++++-
 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +8 -4
index eb4c267cde5e..c7aefee0657a 100644
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device *drm);
 #define CRT_THROD_HIGH(x)              ((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE              0x300
+#define G6_CLK_SOURCE                  0x300
+#define G6_CLK_SOURCE_MASK             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB              BIT(9)
+#define G6_CLK_SEL3                    0x308
+#define G6_CLK_DIV_MASK                        0x3F000
+#define G6_CLK_DIV_16                  (BIT(16)|BIT(15)|BIT(13)|BIT(12))
+#define G6_USB_40_CLK                  BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK                       BIT(0)
 #define CLK_G6                         BIT(0)
-
-#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 +10 -0
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct drm_simple_display_pipe *pipe)
        return container_of(pipe, struct aspeed_gfx, pipe);
 }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv, int mode_width)
+{
+       regmap_update_bits(priv->scu, G6_CLK_SOURCE, G6_CLK_SOURCE_MASK, 0x0);
+       regmap_update_bits(priv->scu, G6_CLK_SEL3, G6_CLK_DIV_MASK, 0x0);
+
+       switch (mode_width) {
+       case 1024:
+               /* hpll div 16 = 75Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct drm_simple_display_pipe *pipe) · line 45

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +10 -0
+               regmap_update_bits(priv->scu, G6_CLK_SEL3,
+               G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+               break;
+       case 800:
+       default:
+               /* usb 40Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+               break;
+       }

I'm not familiar with this area, but I think this belongs in the clock driver.

We want to be able to call clk_set_rate() from the drm driver and have the clock driver update the correct bits in the SCU.

Instead of specialising the 2600 vs others, could clk_set_rate() fail on the others, and cause the driver to stay at 800x600. If the set succeeds it can then run at the higher resolution. If this is not how the APIs work, we could instead have a clock_rate in struct aspeed_gfx and each platform can define its expected clock rate. It would then need a corresponding resolution.

Please take a look at other drivers and see what they do.

Quoted 98 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +5 -4
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32 *bpp)
 {
        struct drm_crtc *crtc = &priv->pipe.crtc;
@@ -77,12 +99,11 @@ 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)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int mode_width)
 {
        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);
+               aspeed_gfx_set_clock_source(priv, mode_width);
                break;
        default:
                break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv)
        if (err)
                return;
 
-       aspeed_gfx_set_clk(priv);
+       aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
        /* TODO: we have only been able to test with the 40MHz USB clock. The
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +14 -2
index af56ffdccc65..e1a814aebc2d 100644
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 {
+       struct aspeed_gfx *priv = to_aspeed_gfx(drm);
        int ret;
 
        ret = drmm_mode_config_init(drm);
@@ -118,8 +119,18 @@ static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 
        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
-       drm->mode_config.max_width = 800;
-       drm->mode_config.max_height = 600;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               drm->mode_config.max_width = 1024;
+               drm->mode_config.max_height = 768;
+               break;
+       default:
+               drm->mode_config.max_width = 800;
+               drm->mode_config.max_height = 600;
+               break;
+       }
+
        drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
        return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
        priv->vga_scratch_reg = config->vga_scratch_reg;
        priv->throd_val = config->throd_val;
        priv->scan_line_max = config->scan_line_max;
+       priv->flags = config->gfx_flags;
 
        priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +13 -2
index 6759cb88415a..5d5e04f15c59 100644
@@ -10,7 +10,19 @@
 
 static int aspeed_gfx_get_modes(struct drm_connector *connector)
 {
-       return drm_add_modes_noedid(connector, 800, 600);
+       struct aspeed_gfx *priv = container_of(connector, struct aspeed_gfx, connector);
+       int mode_count = 0;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               mode_count = drm_add_modes_noedid(connector, 1024, 768);
+               break;
+       default:
+               mode_count = drm_add_modes_noedid(connector, 800, 600);
+               break;
+       }
+
+       return mode_count;
 }
 
 static const struct
--

2.17.1

#4 lore raw

RE: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Hi Joel,

Quoted 93 lines

-----Original Message-----
From: Joel Stanley <[email protected]>
Sent: Tuesday, April 26, 2022 11:27 AM
To: Tommy Huang <[email protected]>
Cc: David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Rob Herring <[email protected]>; Andrew Jeffery <[email protected]>; linux-aspeed <[email protected]>; open list:DRM DRIVERS <[email protected]>; devicetree <[email protected]>; Linux ARM <[email protected]>; Linux Kernel Mailing List <[email protected]>; BMC-SW <[email protected]>
Subject: Re: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device

Quoted 21 lines · Tommy Haung

Update the aspeed_gfx_set_clk with display width.
At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz.
Another chip will still keep 800x600.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29
++++++++++++++++++++----  drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  |
16 +++++++++++--  drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14
+++++++++++-
 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +0 -0
index eb4c267cde5e..c7aefee0657a 100644
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device

*drm);

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device *drm);

Quoted 11 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +7 -1
 #define CRT_THROD_HIGH(x)              ((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE              0x300
+#define G6_CLK_SOURCE                  0x300
+#define G6_CLK_SOURCE_MASK             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB              BIT(9)
+#define G6_CLK_SEL3                    0x308
+#define G6_CLK_DIV_MASK                        0x3F000
+#define G6_CLK_DIV_16

(BIT(16)|BIT(15)|BIT(13)|BIT(12))

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -3
+#define G6_USB_40_CLK                  BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK                       BIT(0)
 #define CLK_G6                         BIT(0)
-
-#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 +0 -0
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct

drm_simple_display_pipe *pipe)

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct · line 27

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +3 -0
        return container_of(pipe, struct aspeed_gfx, pipe);  }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv, int
+mode_width) {
+       regmap_update_bits(priv->scu, G6_CLK_SOURCE,

G6_CLK_SOURCE_MASK, 0x0);

Quoted 8 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +8 -0
+       regmap_update_bits(priv->scu, G6_CLK_SEL3, G6_CLK_DIV_MASK,
+0x0);
+
+       switch (mode_width) {
+       case 1024:
+               /* hpll div 16 = 75Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct drm_simple_display_pipe *pipe) · line 45

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +10 -0
+               regmap_update_bits(priv->scu, G6_CLK_SEL3,
+               G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+               break;
+       case 800:
+       default:
+               /* usb 40Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+               break;
+       }

I'm not familiar with this area, but I think this belongs in the clock driver.

We want to be able to call clk_set_rate() from the drm driver and have the clock driver update the correct bits in the SCU.

Quoted 7 lines

Instead of specialising the 2600 vs others, could clk_set_rate() fail on the others, and cause the driver to stay at 800x600. If the set succeeds it can then run at the higher resolution. If this is not how the APIs work, we could instead have a clock_rate in struct aspeed_gfx and each platform can define its expected clock rate. It would then need a corresponding resolution.

Please take a look at other drivers and see what they do.

Thanks for your common. The pixel clock selection is very limit on soc display.
Until now, there are just two resolutions (800x600 at 60 and 1024x768 at 70)could be selected at ast2600. And there is just 800x600 at 60 could be selected at ast2500 and ast2400.
Although I also want to have clk_set_rate() function to select flexible pixel clock with a programable pll. We might define support clock rate in every device structure for this situation.

Quoted 109 lines
Quoted 11 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +2 -0
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32
 *bpp)  {
        struct drm_crtc *crtc = &priv->pipe.crtc; @@ -77,12 +99,11 @@

static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

        regmap_update_bits(priv->scu, priv->dac_reg, BIT(16), 0);  }

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +2 -2
-static void aspeed_gfx_set_clk(struct aspeed_gfx *priv)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int
+mode_width)
 {
        switch (priv->flags & CLK_MASK) {
        case CLK_G6:
-               regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, 0x0);

Quoted 1 line

- regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, G6_USB_40_CLK);

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_crtc_mode_set_nofb(struct

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -0
+               aspeed_gfx_set_clock_source(priv, mode_width);
                break;
        default:
                break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct

aspeed_gfx *priv)

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -1
        if (err)
                return;
 
-       aspeed_gfx_set_clk(priv);
+       aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
        /* TODO: we have only been able to test with the 40MHz USB

clock. The diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
index af56ffdccc65..e1a814aebc2d 100644

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c static const struct drm_mode_config_funcs · line 116

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -0
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs
 aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)  {
+       struct aspeed_gfx *priv = to_aspeed_gfx(drm);
        int ret;
 
        ret = drmm_mode_config_init(drm); @@ -118,8 +119,18 @@

static

Quoted 35 lines

int aspeed_gfx_setup_mode_config(struct drm_device *drm)

        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +13 -2
-       drm->mode_config.max_width = 800;
-       drm->mode_config.max_height = 600;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               drm->mode_config.max_width = 1024;
+               drm->mode_config.max_height = 768;
+               break;
+       default:
+               drm->mode_config.max_width = 800;
+               drm->mode_config.max_height = 600;
+               break;
+       }
+
        drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
        return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
        priv->vga_scratch_reg = config->vga_scratch_reg;
        priv->throd_val = config->throd_val;
        priv->scan_line_max = config->scan_line_max;
+       priv->flags = config->gfx_flags;
 
        priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +0 -0
index 6759cb88415a..5d5e04f15c59 100644

drivers/gpu/drm/aspeed/aspeed_gfx_out.c line 12

Quoted 4 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +1 -1
@@ -10,7 +10,19 @@
 
 static int aspeed_gfx_get_modes(struct drm_connector *connector)  {
-       return drm_add_modes_noedid(connector, 800, 600);
+       struct aspeed_gfx *priv = container_of(connector, struct

aspeed_gfx, connector);

drivers/gpu/drm/aspeed/aspeed_gfx_out.c

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +5 -0
+       int mode_count = 0;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               mode_count = drm_add_modes_noedid(connector, 1024,

768);

drivers/gpu/drm/aspeed/aspeed_gfx_out.c line 20

Quoted 3 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +3 -0
+               break;
+       default:
+               mode_count = drm_add_modes_noedid(connector, 800,

600);

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +4 -1
+               break;
+       }
+
+       return mode_count;
 }
 
 static const struct
--

2.17.1

maintainer
#5 lore raw

Re: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

In reply to Tommy Haung
Quoted 19 lines · Tommy Haung

Update the aspeed_gfx_set_clk with display width. At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz. Another chip will still keep 800x600.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29 ++++++++++++++++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  | 16 +++++++++++--
 drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14 +++++++++++-
 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +0 -0
index eb4c267cde5e..c7aefee0657a 100644

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device *drm); · line 117

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +6 -1
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device *drm);
 #define CRT_THROD_HIGH(x)              ((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE              0x300
+#define G6_CLK_SOURCE                  0x300
+#define G6_CLK_SOURCE_MASK             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB              BIT(9)
+#define G6_CLK_SEL3                    0x308
+#define G6_CLK_DIV_MASK                        0x3F000

This register is defined in the data sheet as:

17:12 SOC Display clock selection when source is from DisplayPort PHY

That doesn't match with what the code is doing. Can you clarify the register definition?

Quoted 135 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +2 -3
+#define G6_CLK_DIV_16                  (BIT(16)|BIT(15)|BIT(13)|BIT(12))
+#define G6_USB_40_CLK                  BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK                       BIT(0)
 #define CLK_G6                         BIT(0)
-
-#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 +25 -4
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct drm_simple_display_pipe *pipe)
        return container_of(pipe, struct aspeed_gfx, pipe);
 }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv, int mode_width)
+{
+       regmap_update_bits(priv->scu, G6_CLK_SOURCE, G6_CLK_SOURCE_MASK, 0x0);
+       regmap_update_bits(priv->scu, G6_CLK_SEL3, G6_CLK_DIV_MASK, 0x0);
+
+       switch (mode_width) {
+       case 1024:
+               /* hpll div 16 = 75Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);
+               regmap_update_bits(priv->scu, G6_CLK_SEL3,
+               G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+               break;
+       case 800:
+       default:
+               /* usb 40Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+               break;
+       }
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32 *bpp)
 {
        struct drm_crtc *crtc = &priv->pipe.crtc;
@@ -77,12 +99,11 @@ 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)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int mode_width)
 {
        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);
+               aspeed_gfx_set_clock_source(priv, mode_width);
                break;
        default:
                break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv)
        if (err)
                return;
 
-       aspeed_gfx_set_clk(priv);
+       aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
        /* TODO: we have only been able to test with the 40MHz USB clock. The
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +14 -2
index af56ffdccc65..e1a814aebc2d 100644
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 {
+       struct aspeed_gfx *priv = to_aspeed_gfx(drm);
        int ret;
 
        ret = drmm_mode_config_init(drm);
@@ -118,8 +119,18 @@ static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
 
        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
-       drm->mode_config.max_width = 800;
-       drm->mode_config.max_height = 600;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               drm->mode_config.max_width = 1024;
+               drm->mode_config.max_height = 768;
+               break;
+       default:
+               drm->mode_config.max_width = 800;
+               drm->mode_config.max_height = 600;
+               break;
+       }
+
        drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
        return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
        priv->vga_scratch_reg = config->vga_scratch_reg;
        priv->throd_val = config->throd_val;
        priv->scan_line_max = config->scan_line_max;
+       priv->flags = config->gfx_flags;
 
        priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +13 -2
index 6759cb88415a..5d5e04f15c59 100644
@@ -10,7 +10,19 @@
 
 static int aspeed_gfx_get_modes(struct drm_connector *connector)
 {
-       return drm_add_modes_noedid(connector, 800, 600);
+       struct aspeed_gfx *priv = container_of(connector, struct aspeed_gfx, connector);
+       int mode_count = 0;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               mode_count = drm_add_modes_noedid(connector, 1024, 768);
+               break;
+       default:
+               mode_count = drm_add_modes_noedid(connector, 800, 600);
+               break;
+       }
+
+       return mode_count;
 }
 
 static const struct
--

2.17.1

#6 lore raw

RE: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Quoted 51 lines

-----Original Message-----
From: Joel Stanley <[email protected]>
Sent: Tuesday, April 26, 2022 3:48 PM
To: Tommy Huang <[email protected]>
Cc: David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Rob Herring <[email protected]>; Andrew Jeffery <[email protected]>; linux-aspeed <[email protected]>; open list:DRM DRIVERS <[email protected]>; devicetree <[email protected]>; Linux ARM <[email protected]>; Linux Kernel Mailing List <[email protected]>; BMC-SW <[email protected]>
Subject: Re: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device

Quoted 21 lines · Tommy Haung

Update the aspeed_gfx_set_clk with display width.
At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz.
Another chip will still keep 800x600.

---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29
++++++++++++++++++++----  drivers/gpu/drm/aspeed/aspeed_gfx_drv.c  |
16 +++++++++++--  drivers/gpu/drm/aspeed/aspeed_gfx_out.c  | 14
+++++++++++-
 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +0 -0
index eb4c267cde5e..c7aefee0657a 100644
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device

*drm);

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device *drm); · line 117

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +6 -1
 #define CRT_THROD_HIGH(x)              ((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE              0x300
+#define G6_CLK_SOURCE                  0x300
+#define G6_CLK_SOURCE_MASK             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB              BIT(9)
+#define G6_CLK_SEL3                    0x308
+#define G6_CLK_DIV_MASK                        0x3F000

This register is defined in the data sheet as:

Quoted 4 lines

17:12 SOC Display clock selection when source is from DisplayPort PHY

That doesn't match with what the code is doing. Can you clarify the register definition?

OK. I will clarify it and response it to you.

Quoted 148 lines

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device · line 118

Quoted 2 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -0
+#define G6_CLK_DIV_16

(BIT(16)|BIT(15)|BIT(13)|BIT(12))

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -3
+#define G6_USB_40_CLK                  BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK                       BIT(0)
 #define CLK_G6                         BIT(0)
-
-#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 +0 -0
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct

drm_simple_display_pipe *pipe)

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct · line 27

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +3 -0
        return container_of(pipe, struct aspeed_gfx, pipe);  }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv, int
+mode_width) {
+       regmap_update_bits(priv->scu, G6_CLK_SOURCE,

G6_CLK_SOURCE_MASK, 0x0);

Quoted 26 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +20 -0
+       regmap_update_bits(priv->scu, G6_CLK_SEL3, G6_CLK_DIV_MASK,
+0x0);
+
+       switch (mode_width) {
+       case 1024:
+               /* hpll div 16 = 75Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);
+               regmap_update_bits(priv->scu, G6_CLK_SEL3,
+               G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+               break;
+       case 800:
+       default:
+               /* usb 40Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+               break;
+       }
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32
 *bpp)  {
        struct drm_crtc *crtc = &priv->pipe.crtc; @@ -77,12 +99,11 @@

static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

        regmap_update_bits(priv->scu, priv->dac_reg, BIT(16), 0);  }

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +2 -2
-static void aspeed_gfx_set_clk(struct aspeed_gfx *priv)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int
+mode_width)
 {
        switch (priv->flags & CLK_MASK) {
        case CLK_G6:
-               regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, 0x0);

Quoted 1 line

- regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, G6_USB_40_CLK);

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_crtc_mode_set_nofb(struct

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -0
+               aspeed_gfx_set_clock_source(priv, mode_width);
                break;
        default:
                break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct

aspeed_gfx *priv)

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -1
        if (err)
                return;
 
-       aspeed_gfx_set_clk(priv);
+       aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
        /* TODO: we have only been able to test with the 40MHz USB

clock. The diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
index af56ffdccc65..e1a814aebc2d 100644

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c static const struct drm_mode_config_funcs · line 116

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -0
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs
 aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)  {
+       struct aspeed_gfx *priv = to_aspeed_gfx(drm);
        int ret;
 
        ret = drmm_mode_config_init(drm); @@ -118,8 +119,18 @@

static

Quoted 35 lines

int aspeed_gfx_setup_mode_config(struct drm_device *drm)

        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +13 -2
-       drm->mode_config.max_width = 800;
-       drm->mode_config.max_height = 600;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               drm->mode_config.max_width = 1024;
+               drm->mode_config.max_height = 768;
+               break;
+       default:
+               drm->mode_config.max_width = 800;
+               drm->mode_config.max_height = 600;
+               break;
+       }
+
        drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
        return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
        priv->vga_scratch_reg = config->vga_scratch_reg;
        priv->throd_val = config->throd_val;
        priv->scan_line_max = config->scan_line_max;
+       priv->flags = config->gfx_flags;
 
        priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +0 -0
index 6759cb88415a..5d5e04f15c59 100644

drivers/gpu/drm/aspeed/aspeed_gfx_out.c line 12

Quoted 4 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +1 -1
@@ -10,7 +10,19 @@
 
 static int aspeed_gfx_get_modes(struct drm_connector *connector)  {
-       return drm_add_modes_noedid(connector, 800, 600);
+       struct aspeed_gfx *priv = container_of(connector, struct

aspeed_gfx, connector);

drivers/gpu/drm/aspeed/aspeed_gfx_out.c

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +5 -0
+       int mode_count = 0;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               mode_count = drm_add_modes_noedid(connector, 1024,

768);

drivers/gpu/drm/aspeed/aspeed_gfx_out.c line 20

Quoted 3 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +3 -0
+               break;
+       default:
+               mode_count = drm_add_modes_noedid(connector, 800,

600);

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +4 -1
+               break;
+       }
+
+       return mode_count;
 }
 
 static const struct
--

2.17.1

#7 lore raw

RE: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Hi Joel,

	We have released related datasheet and update these registers description.

	SCU300: Clock Selection Register
	...
	10:8 Soc display clock selection
	000b: D-PLL
	001b: Reserved
	010b: 40MHz from USB 2.0 port1 PHY
	011b: GPIOC6
	100b: Reserved
	101b: E-PLL divided by SCU308[17:12]
	110b: M-PLL divided by SCU308[17:12]
	111b: H-PLL divided by SCU308[17:12]

	SCU308: Clock Selection Register Set 3
	17:12 Soc display clock divider selection
	000000b: div 1
	011011b: div 16

	Thanks,

	By Tommy
Quoted 225 lines

-----Original Message-----
From: Tommy Huang
Sent: Tuesday, April 26, 2022 4:28 PM
To: Joel Stanley <[email protected]>
Cc: David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Rob Herring <[email protected]>; Andrew Jeffery <[email protected]>; linux-aspeed <[email protected]>; open list:DRM DRIVERS <[email protected]>; devicetree <[email protected]>; Linux ARM <[email protected]>; Linux Kernel Mailing List <[email protected]>; BMC-SW <[email protected]>
Subject: RE: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Quoted 13 lines

-----Original Message-----
From: Joel Stanley <[email protected]>
Sent: Tuesday, April 26, 2022 3:48 PM
To: Tommy Huang <[email protected]>
Cc: David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Rob Herring <[email protected]>; Andrew Jeffery <[email protected]>; linux-aspeed <[email protected]>; open list:DRM DRIVERS <[email protected]>; devicetree <[email protected]>; Linux ARM <[email protected]>; Linux Kernel Mailing List <[email protected]>; BMC-SW <[email protected]>
Subject: Re: [PATCH v1 2/2] drm/aspeed: Add 1024x768 mode for AST2600

Quoted 1 line

On Fri, 4 Mar 2022 at 06:32, Tommy Haung

<[email protected]>

Quoted 7 lines
Quoted 6 lines · wrote:

Update the aspeed_gfx_set_clk with display width.
At AST2600, the display clock could be coming from HPLL clock / 16 = 75MHz. It would fit 1024x768 at 70Hz.
Another chip will still keep 800x600.

Quoted 5 lines
Quoted 5 lines
---
 drivers/gpu/drm/aspeed/aspeed_gfx.h      | 12 ++++++----
 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 29

++++++++++++++++++++---- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c

|

Quoted 24 lines

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device

Quoted 10 lines

16 +++++++++++-- drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 14
+++++++++++-

 4 files changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/aspeed/aspeed_gfx.h +0 -0
index eb4c267cde5e..c7aefee0657a 100644
@@ -109,11 +109,15 @@ int aspeed_gfx_create_output(struct drm_device

*drm);

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device *drm); · line 117

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +6 -1
 #define CRT_THROD_HIGH(x)              ((x) << 8)
 
 /* SCU control */
-#define SCU_G6_CLK_COURCE              0x300
+#define G6_CLK_SOURCE                  0x300
+#define G6_CLK_SOURCE_MASK             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_HPLL             (BIT(8) | BIT(9) | BIT(10))
+#define G6_CLK_SOURCE_USB              BIT(9)
+#define G6_CLK_SEL3                    0x308
+#define G6_CLK_DIV_MASK                        0x3F000

This register is defined in the data sheet as:

Quoted 4 lines

17:12 SOC Display clock selection when source is from DisplayPort PHY

That doesn't match with what the code is doing. Can you clarify the register definition?

OK. I will clarify it and response it to you.

Quoted 18 lines

drivers/gpu/drm/aspeed/aspeed_gfx.h int aspeed_gfx_create_output(struct drm_device · line 118

Quoted 2 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -0
+#define G6_CLK_DIV_16

(BIT(16)|BIT(15)|BIT(13)|BIT(12))

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx.h +1 -3
+#define G6_USB_40_CLK                  BIT(9)
 
 /* GFX FLAGS */
 #define CLK_MASK                       BIT(0)
 #define CLK_G6                         BIT(0)
-
-#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 +0 -0
index a24fab22eac4..5829be9c7c67 100644
@@ -23,6 +23,28 @@ drm_pipe_to_aspeed_gfx(struct

drm_simple_display_pipe *pipe)

Quoted 8 lines

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c drm_pipe_to_aspeed_gfx(struct · line 28

Quoted 6 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +4 -0
        return container_of(pipe, struct aspeed_gfx, pipe);  }
 
+static void aspeed_gfx_set_clock_source(struct aspeed_gfx *priv,
+int
+mode_width) {
+       regmap_update_bits(priv->scu, G6_CLK_SOURCE,

G6_CLK_SOURCE_MASK, 0x0);

Quoted 1 line
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -0
+       regmap_update_bits(priv->scu, G6_CLK_SEL3,

G6_CLK_DIV_MASK,

Quoted 99 lines
Quoted 25 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +19 -0
+0x0);
+
+       switch (mode_width) {
+       case 1024:
+               /* hpll div 16 = 75Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_HPLL);
+               regmap_update_bits(priv->scu, G6_CLK_SEL3,
+               G6_CLK_DIV_MASK, G6_CLK_DIV_16);
+               break;
+       case 800:
+       default:
+               /* usb 40Mhz */
+               regmap_update_bits(priv->scu, G6_CLK_SOURCE,
+               G6_CLK_SOURCE_MASK, G6_CLK_SOURCE_USB);
+               break;
+       }
+}
+
 static int aspeed_gfx_set_pixel_fmt(struct aspeed_gfx *priv, u32
 *bpp)  {
        struct drm_crtc *crtc = &priv->pipe.crtc; @@ -77,12 +99,11

@@ static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

        regmap_update_bits(priv->scu, priv->dac_reg, BIT(16), 0);  }

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_disable_controller(struct aspeed_gfx *priv)

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +2 -2
-static void aspeed_gfx_set_clk(struct aspeed_gfx *priv)
+static void aspeed_gfx_set_clk(struct aspeed_gfx *priv, int
+mode_width)
 {
        switch (priv->flags & CLK_MASK) {
        case CLK_G6:
-               regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, 0x0);

Quoted 1 line

- regmap_update_bits(priv->scu, SCU_G6_CLK_COURCE,

G6_CLK_MASK, G6_USB_40_CLK);

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c static void aspeed_gfx_crtc_mode_set_nofb(struct

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -0
+               aspeed_gfx_set_clock_source(priv, mode_width);
                break;
        default:
                break;
@@ -99,7 +120,7 @@ static void aspeed_gfx_crtc_mode_set_nofb(struct

aspeed_gfx *priv)

Quoted 14 lines
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +1 -1
        if (err)
                return;
 
-       aspeed_gfx_set_clk(priv);
+       aspeed_gfx_set_clk(priv, m->hdisplay);
 
 #if 0
        /* TODO: we have only been able to test with the 40MHz USB

clock. The diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
index af56ffdccc65..e1a814aebc2d 100644

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c static const struct drm_mode_config_funcs · line 116

Quoted 7 lines
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -0
@@ -110,6 +110,7 @@ static const struct drm_mode_config_funcs
 aspeed_gfx_mode_config_funcs = {
 
 static int aspeed_gfx_setup_mode_config(struct drm_device *drm)  {
+       struct aspeed_gfx *priv = to_aspeed_gfx(drm);
        int ret;
 
        ret = drmm_mode_config_init(drm); @@ -118,8 +119,18 @@

static

Quoted 36 lines

int aspeed_gfx_setup_mode_config(struct drm_device *drm)

        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +13 -2
-       drm->mode_config.max_width = 800;
-       drm->mode_config.max_height = 600;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               drm->mode_config.max_width = 1024;
+               drm->mode_config.max_height = 768;
+               break;
+       default:
+               drm->mode_config.max_width = 800;
+               drm->mode_config.max_height = 600;
+               break;
+       }
+
        drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
 
        return ret;
@@ -167,6 +178,7 @@ static int aspeed_gfx_load(struct drm_device *drm)
        priv->vga_scratch_reg = config->vga_scratch_reg;
        priv->throd_val = config->throd_val;
        priv->scan_line_max = config->scan_line_max;
+       priv->flags = config->gfx_flags;
 
        priv->scu = syscon_regmap_lookup_by_phandle(np, "syscon");
        if (IS_ERR(priv->scu)) {
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +0 -0
index 6759cb88415a..5d5e04f15c59 100644
@@ -10,7 +10,19 @@
 
Quoted 9 lines

drivers/gpu/drm/aspeed/aspeed_gfx_out.c line 12

Quoted 3 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +1 -1
 static int aspeed_gfx_get_modes(struct drm_connector *connector)  {
-       return drm_add_modes_noedid(connector, 800, 600);
+       struct aspeed_gfx *priv = container_of(connector, struct

aspeed_gfx, connector);

Quoted 5 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +5 -0
+       int mode_count = 0;
+
+       switch (priv->flags & CLK_MASK) {
+       case CLK_G6:
+               mode_count = drm_add_modes_noedid(connector,

1024,

Quoted 4 lines

768);

Quoted 3 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +3 -0
+               break;
+       default:
+               mode_count = drm_add_modes_noedid(connector,

800,

Quoted 11 lines

600);

Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_out.c +4 -1
+               break;
+       }
+
+       return mode_count;
 }
 
 static const struct
--

2.17.1