aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@ensi-bourges.fr>2011-12-17 06:24:59 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-03-13 03:06:04 -0400
commitddb2005516949dc50d117cb8381d7a3f8f0614b0 (patch)
tree1388f36a7ae6b7067ccd3040c36b1bd544c15d51 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent668b6c097dbaf190f5d3974798fef37aee025385 (diff)
drm/nouveau/pm: style fixes
Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 5a4947919f1c..760f85c85ccd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -448,14 +448,14 @@ struct nouveau_pm_memtiming {
448 u8 WR; 448 u8 WR;
449}; 449};
450 450
451struct nouveau_pm_tbl_header{ 451struct nouveau_pm_tbl_header {
452 u8 version; 452 u8 version;
453 u8 header_len; 453 u8 header_len;
454 u8 entry_cnt; 454 u8 entry_cnt;
455 u8 entry_len; 455 u8 entry_len;
456}; 456};
457 457
458struct nouveau_pm_tbl_entry{ 458struct nouveau_pm_tbl_entry {
459 u8 tWR; 459 u8 tWR;
460 u8 tUNK_1; 460 u8 tUNK_1;
461 u8 tCL; 461 u8 tCL;
@@ -471,11 +471,6 @@ struct nouveau_pm_tbl_entry{
471 u8 tUNK_18, tUNK_19, tUNK_20, tUNK_21; 471 u8 tUNK_18, tUNK_19, tUNK_20, tUNK_21;
472}; 472};
473 473
474/* nouveau_mem.c */
475void nv30_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header *hdr,
476 struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
477 struct nouveau_pm_memtiming *timing);
478
479#define NOUVEAU_PM_MAX_LEVEL 8 474#define NOUVEAU_PM_MAX_LEVEL 8
480struct nouveau_pm_level { 475struct nouveau_pm_level {
481 struct device_attribute dev_attr; 476 struct device_attribute dev_attr;
@@ -918,6 +913,10 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev,
918 struct nouveau_fence *fence); 913 struct nouveau_fence *fence);
919extern const struct ttm_mem_type_manager_func nouveau_vram_manager; 914extern const struct ttm_mem_type_manager_func nouveau_vram_manager;
920extern const struct ttm_mem_type_manager_func nouveau_gart_manager; 915extern const struct ttm_mem_type_manager_func nouveau_gart_manager;
916void nv30_mem_timing_entry(struct drm_device *dev,
917 struct nouveau_pm_tbl_header *hdr,
918 struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
919 struct nouveau_pm_memtiming *timing);
921 920
922/* nouveau_notifier.c */ 921/* nouveau_notifier.c */
923extern int nouveau_notifier_init_channel(struct nouveau_channel *); 922extern int nouveau_notifier_init_channel(struct nouveau_channel *);