Attachment 53952 Details for Bug 21442 – properly clflush phys cursor writes

[patch] properly clflush phys cursor writes

phys-cursor.patch (text/plain), 1.67 KB, created by Daniel Vetter on 2011-11-29 07:10:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2011-11-29 07:10:59 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
>index 5928653..c7c8f6b 100644
>--- a/drivers/gpu/drm/drm_cache.c
>+++ b/drivers/gpu/drm/drm_cache.c
>@@ -98,3 +98,26 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
> #endif
> }
> EXPORT_SYMBOL(drm_clflush_pages);
>+
>+void
>+drm_clflush_virt_range(char *addr, unsigned long length)
>+{
>+#if defined(CONFIG_X86)
>+	if (cpu_has_clflush) {
>+		char *end = addr + length;
>+		mb();
>+		for (; addr < end; addr += boot_cpu_data.x86_clflush_size)
>+			clflush(addr);
>+		clflush(end - 1);
>+		mb();
>+		return;
>+	}
>+
>+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
>+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
>+#else
>+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
>+	WARN_ON_ONCE(1);
>+#endif
>+}
>+EXPORT_SYMBOL(drm_clflush_virt_range);
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 39459d2..e395a7d 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -4123,6 +4123,7 @@ i915_gem_phys_pwrite(struct drm_device *dev,
> 			return -EFAULT;
> 	}
> 
>+	drm_clflush_virt_range(vaddr, args->size);
> 	intel_gtt_chipset_flush();
> 	return 0;
> }
>diff --git a/include/drm/drmP.h b/include/drm/drmP.h
>index 1f9e951..ededdd0 100644
>--- a/include/drm/drmP.h
>+++ b/include/drm/drmP.h
>@@ -1331,6 +1331,7 @@ extern int drm_authmagic(struct drm_device *dev, void *data,
> 
> /* Cache management (drm_cache.c) */
> void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
>+void drm_clflush_virt_range(char *addr, unsigned long length);
> 
> 				/* Locking IOCTL support (drm_lock.h) */
> extern int drm_lock(struct drm_device *dev, void *data,

Actions: View | Splinter Review

Attachments on bug 21442: 25201 | 25220 | 25221 | 25870 | 29049 | 53952 | 53955 | 61351

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.