On 25/10/2019 02:30, Yi Wang wrote:
> We get these warnings when build kernel W=1:
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:35:6: warning: no previous prototype for ‘panfrost_perfcnt_clean_cache_done’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:40:6: warning: no previous prototype for ‘panfrost_perfcnt_sample_done’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:190:5: warning: no previous prototype for ‘panfrost_ioctl_perfcnt_enable’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:218:5: warning: no previous prototype for ‘panfrost_ioctl_perfcnt_dump’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:250:6: warning: no previous prototype for ‘panfrost_perfcnt_close’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:264:5: warning: no previous prototype for ‘panfrost_perfcnt_init’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c:320:6: warning: no previous prototype for ‘panfrost_perfcnt_fini’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_mmu.c:227:6: warning: no previous prototype for ‘panfrost_mmu_flush_range’ [-Wmissing-prototypes]
> drivers/gpu/drm/panfrost/panfrost_mmu.c:435:5: warning: no previous prototype for ‘panfrost_mmu_map_fault_addr’ [-Wmissing-prototypes]
>
> For file panfrost_mmu.c, make functions static to fix this.
> For file panfrost_perfcnt.c, include header file can fix this.
>
> Signed-off-by: Yi Wang <wang.yi59@xxxxxxxxxx>
> Reviewed-by: Steven Price <steven.price@xxxxxxx>
> ---
>
> v3: using tab size of 8 other than 4.
>
> v2: align parameter line and modify comment. Thanks to Steve.
> ---
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 9 +++++----
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 1 +
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index bdd9905..871574c 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -224,9 +224,9 @@ static size_t get_pgsize(u64 addr, size_t size)
> return SZ_2M;
> }
>
> -void panfrost_mmu_flush_range(struct panfrost_device *pfdev,
> - struct panfrost_mmu *mmu,
> - u64 iova, size_t size)
> +static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,
> + struct panfrost_mmu *mmu,
> + u64 iova, size_t size)
Ok, I'll admit I wouldn't have spotted this unless I'd double checked by
applying the patch, but you still seem to have something misconfigured
in your editor. This is out by one character:
static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,
>------->------->------->------- struct panfrost_mmu *mmu,
>------->------->------->------- u64 iova, size_t size)
There should be an extra space to align correctly.
> {
> if (mmu->as < 0)
> return;
> @@ -432,7 +432,8 @@ void panfrost_mmu_pgtable_free(struct panfrost_file_priv *priv)
>
> #define NUM_FAULT_PAGES (SZ_2M / PAGE_SIZE)
>
> -int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr)
> +static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
> + u64 addr)
Here you're off-by-one in the other direction - you need to replace the
final tab with 7 spaces:
static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
>------->------->------->------->-------u64 addr)
Sorry to nit-pick over this, but it's good to get your editor setup
correctly to ensure your formatting is correct.
Thanks,
Steve
> {
> int ret, i;
> struct panfrost_gem_object *bo;
> diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> index 83c57d3..2dba192 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> @@ -16,6 +16,7 @@
> #include "panfrost_issues.h"
> #include "panfrost_job.h"
> #include "panfrost_mmu.h"
> +#include "panfrost_perfcnt.h"
> #include "panfrost_regs.h"
>
> #define COUNTERS_PER_BLOCK 64
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
