From: Michel Dänzer Date: Fri, 1 Aug 2014 08:22:09 +0000 (+0900) Subject: drm/radeon: Only flush HDP cache from idle ioctl if BO is in VRAM X-Git-Tag: MMI-PSA29.97-13-9~11757^2~6^2~19 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=404a6a512fdc6022d93fdd7085947f3a95f978c5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/radeon: Only flush HDP cache from idle ioctl if BO is in VRAM The HDP cache only applies to CPU access to VRAM. Signed-off-by: Michel Dänzer Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index ab9abfa1ba01..99e4e0cd72a6 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -358,15 +358,17 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, struct drm_gem_object *gobj; struct radeon_bo *robj; int r; + uint32_t cur_placement = 0; gobj = drm_gem_object_lookup(dev, filp, args->handle); if (gobj == NULL) { return -ENOENT; } robj = gem_to_radeon_bo(gobj); - r = radeon_bo_wait(robj, NULL, false); + r = radeon_bo_wait(robj, &cur_placement, false); /* Flush HDP cache via MMIO if necessary */ - if (rdev->asic->mmio_hdp_flush) + if (rdev->asic->mmio_hdp_flush && + radeon_mem_type_to_domain(cur_placement) == RADEON_GEM_DOMAIN_VRAM) robj->rdev->asic->mmio_hdp_flush(rdev); drm_gem_object_unreference_unlocked(gobj); r = radeon_gem_handle_lockup(rdev, r);