From: Alex Deucher Date: Thu, 6 Aug 2015 15:51:23 +0000 (-0400) Subject: drm/amdgpu: remove VM workaround for Fiji X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d07f5c4c235670fa4686eb08cb6211eb3bd0c864;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/amdgpu: remove VM workaround for Fiji The bug is fixed in fiji. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 88ca79fc55bf..6c63a2c6395c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -227,7 +227,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, * do this as a temporary workaround */ if (!(domain & (AMDGPU_GEM_DOMAIN_GDS | AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA))) { - if (adev->asic_type >= CHIP_TOPAZ) { + if ((adev->asic_type >= CHIP_TOPAZ) && (adev->asic_type != CHIP_FIJI)) { if (byte_align & 0x7fff) byte_align = ALIGN(byte_align, 0x8000); if (size & 0x7fff)