diff options
author | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:42:34 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:46:02 -0400 |
commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /drivers/gpu/drm/ast | |
parent | 550e3b23a53c88adfa46e64f9d442743e65d47da (diff) | |
parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff) |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'drivers/gpu/drm/ast')
-rw-r--r-- | drivers/gpu/drm/ast/ast_main.c | 2 |
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 9759009d1da3..b1480acbb3c3 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c | |||
@@ -227,7 +227,7 @@ static int ast_get_dram_info(struct drm_device *dev) | |||
227 | } while (ast_read32(ast, 0x10000) != 0x01); | 227 | } while (ast_read32(ast, 0x10000) != 0x01); |
228 | data = ast_read32(ast, 0x10004); | 228 | data = ast_read32(ast, 0x10004); |
229 | 229 | ||
230 | if (data & 0x400) | 230 | if (data & 0x40) |
231 | ast->dram_bus_width = 16; | 231 | ast->dram_bus_width = 16; |
232 | else | 232 | else |
233 | ast->dram_bus_width = 32; | 233 | ast->dram_bus_width = 32; |