Attachment 112001 Details for Bug 88191 – Change readl(addr)

[patch] Change readl(addr)

0001-bug88191.patch (text/plain), 2.33 KB, created by Chris Wilson on 2015-01-09 10:46:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2015-01-09 10:46:49 UTC

Size: 2.33 KB

patch

obsolete

>From aa8232e453e2c726765466e11cdb6e15eb555a1d Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Thu, 8 Jan 2015 23:21:45 +0000
>Subject: [PATCH] bug88191
>
>---
> drivers/char/agp/intel-gtt.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
>index 778e8cfb1083..567641943ccc 100644
>--- a/drivers/char/agp/intel-gtt.c
>+++ b/drivers/char/agp/intel-gtt.c
>@@ -225,7 +225,7 @@ static int i810_insert_dcache_entries(struct agp_memory *mem, off_t pg_start,
> 		intel_private.driver->write_entry(addr,
> 						  i, type);
> 	}
>-	readl(intel_private.gtt+i-1);
>+	readl(intel_private.gtt+pg_start);
> 
> 	return 0;
> }
>@@ -329,7 +329,7 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry,
> 		break;
> 	}
> 
>-	writel(addr | pte_flags, intel_private.gtt + entry);
>+	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
> }
> 
> static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
>@@ -742,7 +742,7 @@ static void i830_write_entry(dma_addr_t addr, unsigned int entry,
> 	if (flags ==  AGP_USER_CACHED_MEMORY)
> 		pte_flags |= I830_PTE_SYSTEM_CACHED;
> 
>-	writel(addr | pte_flags, intel_private.gtt + entry);
>+	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
> }
> 
> bool intel_enable_gtt(void)
>@@ -865,7 +865,7 @@ void intel_gtt_insert_sg_entries(struct sg_table *st,
> 			j++;
> 		}
> 	}
>-	readl(intel_private.gtt+j-1);
>+	readl(intel_private.gtt+pg_start);
> }
> EXPORT_SYMBOL(intel_gtt_insert_sg_entries);
> 
>@@ -882,7 +882,7 @@ static void intel_gtt_insert_pages(unsigned int first_entry,
> 		intel_private.driver->write_entry(addr,
> 						  j, flags);
> 	}
>-	readl(intel_private.gtt+j-1);
>+	readl(intel_private.gtt+first_entry);
> }
> 
> static int intel_fake_agp_insert_entries(struct agp_memory *mem,
>@@ -945,7 +945,6 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries)
> 		intel_private.driver->write_entry(intel_private.scratch_page_dma,
> 						  i, 0);
> 	}
>-	readl(intel_private.gtt+i-1);
> }
> EXPORT_SYMBOL(intel_gtt_clear_range);
> 
>@@ -1113,7 +1112,7 @@ static void i965_write_entry(dma_addr_t addr,
> 
> 	/* Shift high bits down */
> 	addr |= (addr >> 28) & 0xf0;
>-	writel(addr | pte_flags, intel_private.gtt + entry);
>+	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
> }
> 
> static int i9xx_setup(void)
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 88191: 111939 | 111983 | 112001

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.