Merge tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux (3437f9f0) · Commits · 戴 / test

drivers/gpu/drm/ast/ast_dram_tables.h

+62 −0

Original line number	Diff line number	Diff line
		@@ -141,4 +141,66 @@ 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

drivers/gpu/drm/ast/ast_drv.h

+9 −3

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ enum ast_chip {
		AST2150,
		AST2300,
		AST2400,
		AST2500,
		AST1180,
		};

		@@ -81,6 +82,7 @@ enum ast_tx_chip {
		#define AST_DRAM_1Gx32 3
		#define AST_DRAM_2Gx16 6
		#define AST_DRAM_4Gx16 7
		#define AST_DRAM_8Gx16 8

		struct ast_fbdev;

		@@ -114,7 +116,11 @@ struct ast_private {
		struct ttm_bo_kmap_obj cache_kmap;
		int next_cursor;
		bool support_wide_screen;
		bool DisableP2A;
		enum {
		ast_use_p2a,
		ast_use_dt,
		ast_use_defaults
		} config_mode;

		enum ast_tx_chip tx_chip_type;
		u8 dp501_maxclk;
		@@ -301,8 +307,8 @@ struct ast_vbios_dclk_info {
		};

		struct ast_vbios_mode_info {
		struct ast_vbios_stdtable *std_table;
		struct ast_vbios_enhtable *enh_table;
		const struct ast_vbios_stdtable *std_table;
		const struct ast_vbios_enhtable *enh_table;
		};

		extern int ast_mode_init(struct drm_device *dev);

drivers/gpu/drm/ast/ast_main.c

+194 −110

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@
		#include <drm/drm_fb_helper.h>
		#include <drm/drm_crtc_helper.h>

		#include "ast_dram_tables.h"

		void ast_set_index_reg_mask(struct ast_private *ast,
		uint32_t base, uint8_t index,
		uint8_t mask, uint8_t val)
		@@ -62,30 +60,99 @@ uint8_t ast_get_index_reg_mask(struct ast_private *ast,
		return ret;
		}

		static void ast_detect_config_mode(struct drm_device dev, u32 scu_rev)
		{
		struct device_node *np = dev->pdev->dev.of_node;
		struct ast_private *ast = dev->dev_private;
		uint32_t data, jregd0, jregd1;

		/* Defaults */
		ast->config_mode = ast_use_defaults;
		*scu_rev = 0xffffffff;

		/* Check if we have device-tree properties */
		if (np && !of_property_read_u32(np, "aspeed,scu-revision-id",
		scu_rev)) {
		/* We do, disable P2A access */
		ast->config_mode = ast_use_dt;
		DRM_INFO("Using device-tree for configuration\n");
		return;
		}

		/* Not all families have a P2A bridge */
		if (dev->pdev->device != PCI_CHIP_AST2000)
		return;

		/*
		* The BMC will set SCU 0x40 D[12] to 1 if the P2 bridge
		* is disabled. We force using P2A if VGA only mode bit
		* is set D[7]
		*/
		jregd0 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
		jregd1 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1, 0xff);
		if (!(jregd0 & 0x80) \|\| !(jregd1 & 0x10)) {
		/* Double check it's actually working */
		data = ast_read32(ast, 0xf004);
		if (data != 0xFFFFFFFF) {
		/* P2A works, grab silicon revision */
		ast->config_mode = ast_use_p2a;

		DRM_INFO("Using P2A bridge for configuration\n");

		/* Read SCU7c (silicon revision register) */
		ast_write32(ast, 0xf004, 0x1e6e0000);
		ast_write32(ast, 0xf000, 0x1);
		*scu_rev = ast_read32(ast, 0x1207c);
		return;
		}
		}

		/* We have a P2A bridge but it's disabled */
		DRM_INFO("P2A bridge disabled, using default configuration\n");
		}

		static int ast_detect_chip(struct drm_device dev, bool need_post)
		{
		struct ast_private *ast = dev->dev_private;
		uint32_t data, jreg;
		uint32_t jreg, scu_rev;

		/*
		* If VGA isn't enabled, we need to enable now or subsequent
		* access to the scratch registers will fail. We also inform
		* our caller that it needs to POST the chip
		* (Assumption: VGA not enabled -> need to POST)
		*/
		if (!ast_is_vga_enabled(dev)) {
		ast_enable_vga(dev);
		DRM_INFO("VGA not enabled on entry, requesting chip POST\n");
		*need_post = true;
		} else
		*need_post = false;


		/* Enable extended register access */
		ast_enable_mmio(dev);
		ast_open_key(ast);

		/* Find out whether P2A works or whether to use device-tree */
		ast_detect_config_mode(dev, &scu_rev);

		/* Identify chipset */
		if (dev->pdev->device == PCI_CHIP_AST1180) {
		ast->chip = AST1100;
		DRM_INFO("AST 1180 detected\n");
		} else {
		if (dev->pdev->revision >= 0x30) {
		if (dev->pdev->revision >= 0x40) {
		ast->chip = AST2500;
		DRM_INFO("AST 2500 detected\n");
		} else if (dev->pdev->revision >= 0x30) {
		ast->chip = AST2400;
		DRM_INFO("AST 2400 detected\n");
		} else if (dev->pdev->revision >= 0x20) {
		ast->chip = AST2300;
		DRM_INFO("AST 2300 detected\n");
		} else if (dev->pdev->revision >= 0x10) {
		uint32_t data;
		ast_write32(ast, 0xf004, 0x1e6e0000);
		ast_write32(ast, 0xf000, 0x1);

		data = ast_read32(ast, 0x1207c);
		switch (data & 0x0300) {
		switch (scu_rev & 0x0300) {
		case 0x0200:
		ast->chip = AST1100;
		DRM_INFO("AST 1100 detected\n");
		@@ -110,26 +177,6 @@ static int ast_detect_chip(struct drm_device dev, bool need_post)
		}
		}

		/*
		* If VGA isn't enabled, we need to enable now or subsequent
		* access to the scratch registers will fail. We also inform
		* our caller that it needs to POST the chip
		* (Assumption: VGA not enabled -> need to POST)
		*/
		if (!ast_is_vga_enabled(dev)) {
		ast_enable_vga(dev);
		ast_enable_mmio(dev);
		DRM_INFO("VGA not enabled on entry, requesting chip POST\n");
		*need_post = true;
		} else
		*need_post = false;

		/* Check P2A Access */
		ast->DisableP2A = true;
		data = ast_read32(ast, 0xf004);
		if (data != 0xFFFFFFFF)
		ast->DisableP2A = false;

		/* Check if we support wide screen */
		switch (ast->chip) {
		case AST1180:
		@@ -146,17 +193,15 @@ static int ast_detect_chip(struct drm_device dev, bool need_post)
		ast->support_wide_screen = true;
		else {
		ast->support_wide_screen = false;
		if (ast->DisableP2A == false) {
		/* Read SCU7c (silicon revision register) */
		ast_write32(ast, 0xf004, 0x1e6e0000);
		ast_write32(ast, 0xf000, 0x1);
		data = ast_read32(ast, 0x1207c);
		data &= 0x300;
		if (ast->chip == AST2300 && data == 0x0) /* ast1300 */
		if (ast->chip == AST2300 &&
		(scu_rev & 0x300) == 0x0) /* ast1300 */
		ast->support_wide_screen = true;
		if (ast->chip == AST2400 && data == 0x100) /* ast1400 */
		if (ast->chip == AST2400 &&
		(scu_rev & 0x300) == 0x100) /* ast1400 */
		ast->support_wide_screen = true;
		if (ast->chip == AST2500 &&
		scu_rev == 0x100) /* ast2510 */
		ast->support_wide_screen = true;
		}
		}
		break;
		}
		@@ -220,29 +265,68 @@ static int ast_detect_chip(struct drm_device dev, bool need_post)

		static int ast_get_dram_info(struct drm_device *dev)
		{
		struct device_node *np = dev->pdev->dev.of_node;
		struct ast_private *ast = dev->dev_private;
		uint32_t data, data2;
		uint32_t denum, num, div, ref_pll;
		uint32_t mcr_cfg, mcr_scu_mpll, mcr_scu_strap;
		uint32_t denum, num, div, ref_pll, dsel;

		if (ast->DisableP2A)
		{
		switch (ast->config_mode) {
		case ast_use_dt:
		/*
		* If some properties are missing, use reasonable
		* defaults for AST2400
		*/
		if (of_property_read_u32(np, "aspeed,mcr-configuration",
		&mcr_cfg))
		mcr_cfg = 0x00000577;
		if (of_property_read_u32(np, "aspeed,mcr-scu-mpll",
		&mcr_scu_mpll))
		mcr_scu_mpll = 0x000050C0;
		if (of_property_read_u32(np, "aspeed,mcr-scu-strap",
		&mcr_scu_strap))
		mcr_scu_strap = 0;
		break;
		case ast_use_p2a:
		ast_write32(ast, 0xf004, 0x1e6e0000);
		ast_write32(ast, 0xf000, 0x1);
		mcr_cfg = ast_read32(ast, 0x10004);
		mcr_scu_mpll = ast_read32(ast, 0x10120);
		mcr_scu_strap = ast_read32(ast, 0x10170);
		break;
		case ast_use_defaults:
		default:
		ast->dram_bus_width = 16;
		ast->dram_type = AST_DRAM_1Gx16;
		if (ast->chip == AST2500)
		ast->mclk = 800;
		else
		ast->mclk = 396;
		return 0;
		}
		else
		{
		ast_write32(ast, 0xf004, 0x1e6e0000);
		ast_write32(ast, 0xf000, 0x1);
		data = ast_read32(ast, 0x10004);

		if (data & 0x40)
		if (mcr_cfg & 0x40)
		ast->dram_bus_width = 16;
		else
		ast->dram_bus_width = 32;

		if (ast->chip == AST2300 \|\| ast->chip == AST2400) {
		switch (data & 0x03) {
		if (ast->chip == AST2500) {
		switch (mcr_cfg & 0x03) {
		case 0:
		ast->dram_type = AST_DRAM_1Gx16;
		break;
		default:
		case 1:
		ast->dram_type = AST_DRAM_2Gx16;
		break;
		case 2:
		ast->dram_type = AST_DRAM_4Gx16;
		break;
		case 3:
		ast->dram_type = AST_DRAM_8Gx16;
		break;
		}
		} else if (ast->chip == AST2300 \|\| ast->chip == AST2400) {
		switch (mcr_cfg & 0x03) {
		case 0:
		ast->dram_type = AST_DRAM_512Mx16;
		break;
		@@ -258,13 +342,13 @@ static int ast_get_dram_info(struct drm_device *dev)
		break;
		}
		} else {
		switch (data & 0x0c) {
		switch (mcr_cfg & 0x0c) {
		case 0:
		case 4:
		ast->dram_type = AST_DRAM_512Mx16;
		break;
		case 8:
		if (data & 0x40)
		if (mcr_cfg & 0x40)
		ast->dram_type = AST_DRAM_1Gx16;
		else
		ast->dram_type = AST_DRAM_512Mx32;
		@@ -275,17 +359,15 @@ static int ast_get_dram_info(struct drm_device *dev)
		}
		}

		data = ast_read32(ast, 0x10120);
		data2 = ast_read32(ast, 0x10170);
		if (data2 & 0x2000)
		if (mcr_scu_strap & 0x2000)
		ref_pll = 14318;
		else
		ref_pll = 12000;

		denum = data & 0x1f;
		num = (data & 0x3fe0) >> 5;
		data = (data & 0xc000) >> 14;
		switch (data) {
		denum = mcr_scu_mpll & 0x1f;
		num = (mcr_scu_mpll & 0x3fe0) >> 5;
		dsel = (mcr_scu_mpll & 0xc000) >> 14;
		switch (dsel) {
		case 3:
		div = 0x4;
		break;
		@@ -297,8 +379,7 @@ static int ast_get_dram_info(struct drm_device *dev)
		div = 0x1;
		break;
		}
		ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
		}
		ast->mclk = ref_pll * (num + 2) / ((denum + 2) * (div * 1000));
		return 0;
		}

		@@ -437,17 +518,19 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)

		ast_detect_chip(dev, &need_post);

		if (need_post)
		ast_post_gpu(dev);

		if (ast->chip != AST1180) {
		ret = ast_get_dram_info(dev);
		if (ret)
		goto out_free;
		ast->vram_size = ast_get_vram_info(dev);
		DRM_INFO("dram %d %d %d %08x\n", ast->mclk, ast->dram_type, ast->dram_bus_width, ast->vram_size);
		DRM_INFO("dram MCLK=%u Mhz type=%d bus_width=%d size=%08x\n",
		ast->mclk, ast->dram_type,
		ast->dram_bus_width, ast->vram_size);
		}

		if (need_post)
		ast_post_gpu(dev);

		ret = ast_mm_init(ast);
		if (ret)
		goto out_free;
		@@ -465,6 +548,7 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
		ast->chip == AST2200 \|\|
		ast->chip == AST2300 \|\|
		ast->chip == AST2400 \|\|
		ast->chip == AST2500 \|\|
		ast->chip == AST1180) {
		dev->mode_config.max_width = 1920;
		dev->mode_config.max_height = 2048;

drivers/gpu/drm/ast/ast_mode.c

+27 −11

Original line number	Diff line number	Diff line
		@@ -81,9 +81,9 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
		struct ast_private *ast = crtc->dev->dev_private;
		const struct drm_framebuffer *fb = crtc->primary->fb;
		u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;
		const struct ast_vbios_enhtable *best = NULL;
		u32 hborder, vborder;
		bool check_sync;
		struct ast_vbios_enhtable *best = NULL;

		switch (fb->format->cpp[0] * 8) {
		case 8:
		@@ -147,7 +147,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
		refresh_rate = drm_mode_vrefresh(mode);
		check_sync = vbios_mode->enh_table->flags & WideScreenMode;
		do {
		struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
		const struct ast_vbios_enhtable *loop = vbios_mode->enh_table;

		while (loop->refresh_rate != 0xff) {
		if ((check_sync) &&
		@@ -227,7 +227,7 @@ static void ast_set_std_reg(struct drm_crtc crtc, struct drm_display_mode mode
		struct ast_vbios_mode_info *vbios_mode)
		{
		struct ast_private *ast = crtc->dev->dev_private;
		struct ast_vbios_stdtable *stdtable;
		const struct ast_vbios_stdtable *stdtable;
		u32 i;
		u8 jreg;

		@@ -273,7 +273,11 @@ static void ast_set_crtc_reg(struct drm_crtc crtc, struct drm_display_mode mod
		{
		struct ast_private *ast = crtc->dev->dev_private;
		u8 jreg05 = 0, jreg07 = 0, jreg09 = 0, jregAC = 0, jregAD = 0, jregAE = 0;
		u16 temp;
		u16 temp, precache = 0;

		if ((ast->chip == AST2500) &&
		(vbios_mode->enh_table->flags & AST2500PreCatchCRT))
		precache = 40;

		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x00);

		@@ -299,12 +303,12 @@ static void ast_set_crtc_reg(struct drm_crtc crtc, struct drm_display_mode mod
		jregAD \|= 0x01; /* HBE D[5] */
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x03, 0xE0, (temp & 0x1f));

		temp = (mode->crtc_hsync_start >> 3) - 1;
		temp = ((mode->crtc_hsync_start-precache) >> 3) - 1;
		if (temp & 0x100)
		jregAC \|= 0x40; /* HRS D[5] */
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x04, 0x00, temp);

		temp = ((mode->crtc_hsync_end >> 3) - 1) & 0x3f;
		temp = (((mode->crtc_hsync_end-precache) >> 3) - 1) & 0x3f;
		if (temp & 0x20)
		jregAD \|= 0x04; /* HRE D[5] */
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x05, 0x60, (u8)((temp & 0x1f) \| jreg05));
		@@ -365,6 +369,11 @@ static void ast_set_crtc_reg(struct drm_crtc crtc, struct drm_display_mode mod
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x09, 0xdf, jreg09);
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xAE, 0x00, (jregAE \| 0x80));

		if (precache)
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x80);
		else
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x00);

		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x80);
		}

		@@ -384,14 +393,18 @@ static void ast_set_dclk_reg(struct drm_device dev, struct drm_display_mode mo
		struct ast_vbios_mode_info *vbios_mode)
		{
		struct ast_private *ast = dev->dev_private;
		struct ast_vbios_dclk_info *clk_info;
		const struct ast_vbios_dclk_info *clk_info;

		if (ast->chip == AST2500)
		clk_info = &dclk_table_ast2500[vbios_mode->enh_table->dclk_index];
		else
		clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];

		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc0, 0x00, clk_info->param1);
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc1, 0x00, clk_info->param2);
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xbb, 0x0f,
		(clk_info->param3 & 0x80) \| ((clk_info->param3 & 0x3) << 4));
		(clk_info->param3 & 0xc0) \|
		((clk_info->param3 & 0x3) << 4));
		}

		static void ast_set_ext_reg(struct drm_crtc crtc, struct drm_display_mode mode,
		@@ -425,7 +438,8 @@ static void ast_set_ext_reg(struct drm_crtc crtc, struct drm_display_mode mode
		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa8, 0xfd, jregA8);

		/* Set Threshold */
		if (ast->chip == AST2300 \|\| ast->chip == AST2400) {
		if (ast->chip == AST2300 \|\| ast->chip == AST2400 \|\|
		ast->chip == AST2500) {
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa7, 0x78);
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa6, 0x60);
		} else if (ast->chip == AST2100 \|\|
		@@ -800,7 +814,9 @@ static int ast_mode_valid(struct drm_connector *connector,
		if ((mode->hdisplay == 1600) && (mode->vdisplay == 900))
		return MODE_OK;

		if ((ast->chip == AST2100) \|\| (ast->chip == AST2200) \|\| (ast->chip == AST2300) \|\| (ast->chip == AST2400) \|\| (ast->chip == AST1180)) {
		if ((ast->chip == AST2100) \|\| (ast->chip == AST2200) \|\|
		(ast->chip == AST2300) \|\| (ast->chip == AST2400) \|\|
		(ast->chip == AST2500) \|\| (ast->chip == AST1180)) {
		if ((mode->hdisplay == 1920) && (mode->vdisplay == 1080))
		return MODE_OK;

drivers/gpu/drm/ast/ast_post.c

+489 −73

File changed.

Preview size limit exceeded, changes collapsed.

Admin message