projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_drv.h
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drv.h
b/drivers/gpu/drm/nouveau/nouveau_drv.h
index
3331e82
..
96f6bd8
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_drv.h
@@
-157,8
+157,8
@@
struct nouveau_drm {
struct nvif_object copy;
int mtrr;
int type_vram;
struct nvif_object copy;
int mtrr;
int type_vram;
- int type_host;
- int type_ncoh;
+ int type_host
[2]
;
+ int type_ncoh
[2]
;
} ttm;
/* GEM interface support */
} ttm;
/* GEM interface support */
@@
-217,6
+217,13
@@
nouveau_drm(struct drm_device *dev)
return dev->dev_private;
}
return dev->dev_private;
}
+static inline bool
+nouveau_drm_use_coherent_gpu_mapping(struct nouveau_drm *drm)
+{
+ struct nvif_mmu *mmu = &drm->client.mmu;
+ return !(mmu->type[drm->ttm.type_host[0]].type & NVIF_MEM_UNCACHED);
+}
+
int nouveau_pmops_suspend(struct device *);
int nouveau_pmops_resume(struct device *);
bool nouveau_pmops_runtime(void);
int nouveau_pmops_suspend(struct device *);
int nouveau_pmops_resume(struct device *);
bool nouveau_pmops_runtime(void);