git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-intel-next-queued
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
gt
/
intel_ggtt.c
diff --git
a/drivers/gpu/drm/i915/gt/intel_ggtt.c
b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 048240b197720af5cc8967498cae37935cc9bebf..41a00281f364029b66a05480e260d728f56d0dee 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/
drivers/gpu/drm/i915/gt/intel_ggtt.c
@@
-754,7
+754,7
@@
static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
* readback check when writing GTT PTE entries.
*/
if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
- ggtt->gsm = ioremap
_nocache
(phys_addr, size);
+ ggtt->gsm = ioremap(phys_addr, size);
else
ggtt->gsm = ioremap_wc(phys_addr, size);
if (!ggtt->gsm) {