summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/mgag200
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
committerIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
commit397f09977ea350a20f20b415a9313cc790137742 (patch)
tree0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /drivers/gpu/drm/mgag200
parent6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff)
parenta4b4bedce880046feeb5b206392960f395ed02ad (diff)
downloadop-kernel-dev-397f09977ea350a20f20b415a9313cc790137742.zip
op-kernel-dev-397f09977ea350a20f20b415a9313cc790137742.tar.gz
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC support, from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/mgag200')
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_ttm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 13878d5..d70e4a9 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -323,6 +323,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align,
mgabo->gem.driver_private = NULL;
mgabo->bo.bdev = &mdev->ttm.bdev;
+ mgabo->bo.bdev->dev_mapping = dev->dev_mapping;
mgag200_ttm_placement(mgabo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
OpenPOWER on IntegriCloud