Rosen Penev
2017-Jul-29 21:46 UTC
[Nouveau] [PATCH] nouveau: Fix declarations with incorrect variables.
Signed-off by: Rosen Penev <rosenp at gmail.com> --- drm/nouveau/dispnv04/disp.h | 4 ++-- drm/nouveau/dispnv04/hw.h | 2 +- drm/nouveau/nouveau_bo.h | 2 +- drm/nouveau/nouveau_display.h | 4 ++-- drm/nouveau/nvkm/engine/dma/user.h | 2 +- drm/nouveau/nvkm/subdev/clk/pll.h | 2 +- drm/nouveau/nvkm/subdev/fb/priv.h | 2 +- drm/nouveau/nvkm/subdev/ltc/priv.h | 2 +- drm/nouveau/nvkm/subdev/therm/priv.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drm/nouveau/dispnv04/disp.h b/drm/nouveau/dispnv04/disp.h index 74a8795c..31f81437 100644 --- a/drm/nouveau/dispnv04/disp.h +++ b/drm/nouveau/dispnv04/disp.h @@ -96,7 +96,7 @@ int nv04_display_init(struct drm_device *); void nv04_display_fini(struct drm_device *); /* nv04_crtc.c */ -int nv04_crtc_create(struct drm_device *, int index); +int nv04_crtc_create(struct drm_device *, int crtc_num); /* nv04_dac.c */ int nv04_dac_create(struct drm_connector *, struct dcb_output *); @@ -121,7 +121,7 @@ int nv04_tv_create(struct drm_connector *, struct dcb_output *); int nv17_tv_create(struct drm_connector *, struct dcb_output *); /* overlay.c */ -void nouveau_overlay_init(struct drm_device *dev); +void nouveau_overlay_init(struct drm_device *device); static inline bool nv_two_heads(struct drm_device *dev) diff --git a/drm/nouveau/dispnv04/hw.h b/drm/nouveau/dispnv04/hw.h index 3a2be47f..2afda90a 100644 --- a/drm/nouveau/dispnv04/hw.h +++ b/drm/nouveau/dispnv04/hw.h @@ -43,7 +43,7 @@ void NVSetOwner(struct drm_device *, int owner); void NVBlankScreen(struct drm_device *, int head, bool blank); int nouveau_hw_get_pllvals(struct drm_device *, enum nvbios_pll_type plltype, struct nvkm_pll_vals *pllvals); -int nouveau_hw_pllvals_to_clk(struct nvkm_pll_vals *pllvals); +int nouveau_hw_pllvals_to_clk(struct nvkm_pll_vals *pv); int nouveau_hw_get_clock(struct drm_device *, enum nvbios_pll_type plltype); void nouveau_hw_save_vga_fonts(struct drm_device *, bool save); void nouveau_hw_save_state(struct drm_device *, int head, diff --git a/drm/nouveau/nouveau_bo.h b/drm/nouveau/nouveau_bo.h index b06a5385..20f06ce9 100644 --- a/drm/nouveau/nouveau_bo.h +++ b/drm/nouveau/nouveau_bo.h @@ -75,7 +75,7 @@ int nouveau_bo_new(struct nouveau_cli *, u64 size, int align, u32 flags, u32 tile_mode, u32 tile_flags, struct sg_table *sg, struct reservation_object *robj, struct nouveau_bo **); -int nouveau_bo_pin(struct nouveau_bo *, u32 flags, bool contig); +int nouveau_bo_pin(struct nouveau_bo *, u32 memtype, bool contig); int nouveau_bo_unpin(struct nouveau_bo *); int nouveau_bo_map(struct nouveau_bo *); void nouveau_bo_unmap(struct nouveau_bo *); diff --git a/drm/nouveau/nouveau_display.h b/drm/nouveau/nouveau_display.h index 201aec2e..63f47ab2 100644 --- a/drm/nouveau/nouveau_display.h +++ b/drm/nouveau/nouveau_display.h @@ -74,7 +74,7 @@ bool nouveau_display_scanoutpos(struct drm_device *, unsigned int, int nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, - uint32_t page_flip_flags, + uint32_t flags, struct drm_modeset_acquire_ctx *ctx); int nouveau_finish_page_flip(struct nouveau_channel *, struct nouveau_page_flip_state *); @@ -82,7 +82,7 @@ int nouveau_finish_page_flip(struct nouveau_channel *, int nouveau_display_dumb_create(struct drm_file *, struct drm_device *, struct drm_mode_create_dumb *args); int nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *, - u32 handle, u64 *offset); + u32 handle, u64 *poffset); void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *); diff --git a/drm/nouveau/nvkm/engine/dma/user.h b/drm/nouveau/nvkm/engine/dma/user.h index 69a7f103..1341894b 100644 --- a/drm/nouveau/nvkm/engine/dma/user.h +++ b/drm/nouveau/nvkm/engine/dma/user.h @@ -4,7 +4,7 @@ #include "priv.h" int nvkm_dmaobj_ctor(const struct nvkm_dmaobj_func *, struct nvkm_dma *, - const struct nvkm_oclass *, void **data, u32 *size, + const struct nvkm_oclass *, void **pdata, u32 *psize, struct nvkm_dmaobj *); int nv04_dmaobj_new(struct nvkm_dma *, const struct nvkm_oclass *, void *, u32, diff --git a/drm/nouveau/nvkm/subdev/clk/pll.h b/drm/nouveau/nvkm/subdev/clk/pll.h index 44020a30..adcf287f 100644 --- a/drm/nouveau/nvkm/subdev/clk/pll.h +++ b/drm/nouveau/nvkm/subdev/clk/pll.h @@ -7,5 +7,5 @@ struct nvbios_pll; int nv04_pll_calc(struct nvkm_subdev *, struct nvbios_pll *, u32 freq, int *N1, int *M1, int *N2, int *M2, int *P); int gt215_pll_calc(struct nvkm_subdev *, struct nvbios_pll *, u32 freq, - int *N, int *fN, int *M, int *P); + int *pN, int *pfN, int *pM, int *P); #endif diff --git a/drm/nouveau/nvkm/subdev/fb/priv.h b/drm/nouveau/nvkm/subdev/fb/priv.h index e905d44f..d499ab39 100644 --- a/drm/nouveau/nvkm/subdev/fb/priv.h +++ b/drm/nouveau/nvkm/subdev/fb/priv.h @@ -33,7 +33,7 @@ int nvkm_fb_new_(const struct nvkm_fb_func *, struct nvkm_device *device, int index, struct nvkm_fb **); int nvkm_fb_bios_memtype(struct nvkm_bios *); -bool nv04_fb_memtype_valid(struct nvkm_fb *, u32 memtype); +bool nv04_fb_memtype_valid(struct nvkm_fb *, u32 tile_flags); void nv10_fb_tile_init(struct nvkm_fb *, int i, u32 addr, u32 size, u32 pitch, u32 flags, struct nvkm_fb_tile *); diff --git a/drm/nouveau/nvkm/subdev/ltc/priv.h b/drm/nouveau/nvkm/subdev/ltc/priv.h index 8b95f96e..4af4aebe 100644 --- a/drm/nouveau/nvkm/subdev/ltc/priv.h +++ b/drm/nouveau/nvkm/subdev/ltc/priv.h @@ -35,7 +35,7 @@ void gf100_ltc_flush(struct nvkm_ltc *); extern const struct nvkm_bitfield gf100_ltc_lts_intr_name[]; void gm107_ltc_intr(struct nvkm_ltc *); -void gm107_ltc_intr_lts(struct nvkm_ltc *, int ltc, int lts); +void gm107_ltc_intr_lts(struct nvkm_ltc *ltc, int c, int s); void gm107_ltc_cbc_clear(struct nvkm_ltc *, u32, u32); void gm107_ltc_cbc_wait(struct nvkm_ltc *); void gm107_ltc_zbc_clear_color(struct nvkm_ltc *, int, const u32[4]); diff --git a/drm/nouveau/nvkm/subdev/therm/priv.h b/drm/nouveau/nvkm/subdev/therm/priv.h index 1f46e371..06a400d1 100644 --- a/drm/nouveau/nvkm/subdev/therm/priv.h +++ b/drm/nouveau/nvkm/subdev/therm/priv.h @@ -62,7 +62,7 @@ int nvkm_therm_fan_ctor(struct nvkm_therm *); int nvkm_therm_fan_init(struct nvkm_therm *); int nvkm_therm_fan_fini(struct nvkm_therm *, bool suspend); int nvkm_therm_fan_get(struct nvkm_therm *); -int nvkm_therm_fan_set(struct nvkm_therm *, bool now, int percent); +int nvkm_therm_fan_set(struct nvkm_therm *, bool immediate, int percent); int nvkm_therm_fan_user_get(struct nvkm_therm *); int nvkm_therm_fan_user_set(struct nvkm_therm *, int percent); -- 2.13.3
Possibly Parallel Threads
- [PATCH v2 1/4] subdev/iccsense: add new subdev for power sensors
- [PATCH v4 1/6] subdev/iccsense: add new subdev for power sensors
- [PATCH] drm/nouveau: remove redundant check
- [PATCH 1/2] power sensor support
- [PATCH 2/3] ltc/gf100: add flush/invalidate functions