summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2016-02-26 15:29:32 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-09 15:33:26 -0800
commit6029977f2d433d2703f4a440bf55ecc86aeb9764 (patch)
tree7b31700d7db7cc50564adbf48b33514957b856c4
parenta18a6aab3319c13860837dedfcd25ae1ecf3b278 (diff)
downloadlwn-6029977f2d433d2703f4a440bf55ecc86aeb9764.tar.gz
lwn-6029977f2d433d2703f4a440bf55ecc86aeb9764.zip
drm/ast: Fix incorrect register check for DRAM width
commit 2d02b8bdba322b527c5f5168ce1ca10c2d982a78 upstream. During DRAM initialization on certain ASpeed devices, an incorrect bit (bit 10) was checked in the "SDRAM Bus Width Status" register to determine DRAM width. Query bit 6 instead in accordance with the Aspeed AST2050 datasheet v1.05. Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/ast/ast_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index c0f284230a39..ed8d93cbd1ca 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -124,7 +124,7 @@ static int ast_get_dram_info(struct drm_device *dev)
} while (ast_read32(ast, 0x10000) != 0x01);
data = ast_read32(ast, 0x10004);
- if (data & 0x400)
+ if (data & 0x40)
ast->dram_bus_width = 16;
else
ast->dram_bus_width = 32;