drm: Missed clflushopt in drm_clflush_virt_range
diff mbox

Message ID 1400082072-22482-1-git-send-email-ross.zwisler@linux.intel.com
State New, archived
Headers show

Commit Message

Ross Zwisler May 14, 2014, 3:41 p.m. UTC
With this commit:

2a0788dc9bc4 x86: Use clflushopt in drm_clflush_virt_range

If clflushopt is available on the system, we use it instead of clflush
in drm_clflush_virt_range.  There were two calls to clflush in this
function, but only one was changed to clflushopt.  This patch changes
the other clflush call to clflushopt.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reported-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: H Peter Anvin <h.peter.anvin@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>

---
 drivers/gpu/drm/drm_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Vetter May 15, 2014, 12:38 p.m. UTC | #1
On Wed, May 14, 2014 at 09:41:12AM -0600, Ross Zwisler wrote:
> With this commit:
> 
> 2a0788dc9bc4 x86: Use clflushopt in drm_clflush_virt_range
> 
> If clflushopt is available on the system, we use it instead of clflush
> in drm_clflush_virt_range.  There were two calls to clflush in this
> function, but only one was changed to clflushopt.  This patch changes
> the other clflush call to clflushopt.
> 
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> Reported-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
> 
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
> Cc: H Peter Anvin <h.peter.anvin@intel.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>

Picked to my topic/core-stuff drm branch so it doesn't get lost.
-Daniel

> 
> ---
>  drivers/gpu/drm/drm_cache.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
> index 534cb89..041b73b 100644
> --- a/drivers/gpu/drm/drm_cache.c
> +++ b/drivers/gpu/drm/drm_cache.c
> @@ -138,7 +138,7 @@ drm_clflush_virt_range(char *addr, unsigned long length)
>  		char *end = addr + length;
>  		mb();
>  		for (; addr < end; addr += boot_cpu_data.x86_clflush_size)
> -			clflush(addr);
> +			clflushopt(addr);
>  		clflushopt(end - 1);
>  		mb();
>  		return;
> -- 
> 1.9.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
H. Peter Anvin May 15, 2014, 2:37 p.m. UTC | #2
On 05/15/2014 05:38 AM, Daniel Vetter wrote:
> On Wed, May 14, 2014 at 09:41:12AM -0600, Ross Zwisler wrote:
>> With this commit:
>>
>> 2a0788dc9bc4 x86: Use clflushopt in drm_clflush_virt_range
>>
>> If clflushopt is available on the system, we use it instead of clflush
>> in drm_clflush_virt_range.  There were two calls to clflush in this
>> function, but only one was changed to clflushopt.  This patch changes
>> the other clflush call to clflushopt.
>>
>> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
>> Reported-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
>>
>> Cc: David Airlie <airlied@linux.ie>
>> Cc: dri-devel@lists.freedesktop.org
>> Cc: H Peter Anvin <h.peter.anvin@intel.com>
>> Cc: Ingo Molnar <mingo@kernel.org>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
> 
> Picked to my topic/core-stuff drm branch so it doesn't get lost.
> -Daniel
> 

Does this mean you're picking this up, or do you want me to put it into
-tip?

	-hpa
Daniel Vetter May 15, 2014, 8:40 p.m. UTC | #3
On Thu, May 15, 2014 at 07:37:32AM -0700, H. Peter Anvin wrote:
> On 05/15/2014 05:38 AM, Daniel Vetter wrote:
> > On Wed, May 14, 2014 at 09:41:12AM -0600, Ross Zwisler wrote:
> >> With this commit:
> >>
> >> 2a0788dc9bc4 x86: Use clflushopt in drm_clflush_virt_range
> >>
> >> If clflushopt is available on the system, we use it instead of clflush
> >> in drm_clflush_virt_range.  There were two calls to clflush in this
> >> function, but only one was changed to clflushopt.  This patch changes
> >> the other clflush call to clflushopt.
> >>
> >> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> >> Reported-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
> >>
> >> Cc: David Airlie <airlied@linux.ie>
> >> Cc: dri-devel@lists.freedesktop.org
> >> Cc: H Peter Anvin <h.peter.anvin@intel.com>
> >> Cc: Ingo Molnar <mingo@kernel.org>
> >> Cc: Thomas Gleixner <tglx@linutronix.de>
> > 
> > Picked to my topic/core-stuff drm branch so it doesn't get lost.
> > -Daniel
> > 
> 
> Does this mean you're picking this up, or do you want me to put it into

I'll forward it eventually to Dave for 3.16. But if someone else steals it
beforehand I don't mind ;-)
-Daniel

Patch
diff mbox

diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 534cb89..041b73b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -138,7 +138,7 @@  drm_clflush_virt_range(char *addr, unsigned long length)
 		char *end = addr + length;
 		mb();
 		for (; addr < end; addr += boot_cpu_data.x86_clflush_size)
-			clflush(addr);
+			clflushopt(addr);
 		clflushopt(end - 1);
 		mb();
 		return;