lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH 20/43] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header
    On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones@linaro.org> wrote:
    >
    > Fixes the following W=1 kernel build warning(s):
    >
    > drivers/gpu/drm/radeon/ni.c:1378:6: warning: no previous prototype for ‘cayman_cp_int_cntl_setup’ [-Wmissing-prototypes]
    > 1378 | void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
    > | ^~~~~~~~~~~~~~~~~~~~~~~~
    > drivers/gpu/drm/radeon/ni.c:1732:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes]
    > 1732 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev)
    > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    >
    > Cc: Alex Deucher <alexander.deucher@amd.com>
    > Cc: "Christian König" <christian.koenig@amd.com>
    > Cc: David Airlie <airlied@linux.ie>
    > Cc: Daniel Vetter <daniel@ffwll.ch>
    > Cc: amd-gfx@lists.freedesktop.org
    > Cc: dri-devel@lists.freedesktop.org
    > Signed-off-by: Lee Jones <lee.jones@linaro.org>

    Applied with minor changes. Thanks!

    Alex


    > ---
    > drivers/gpu/drm/radeon/evergreen.c | 5 +---
    > drivers/gpu/drm/radeon/ni.c | 1 +
    > drivers/gpu/drm/radeon/ni.h | 38 ++++++++++++++++++++++++++++++
    > 3 files changed, 40 insertions(+), 4 deletions(-)
    > create mode 100644 drivers/gpu/drm/radeon/ni.h
    >
    > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
    > index f860f5ef2df88..8fb0b8c3db5b5 100644
    > --- a/drivers/gpu/drm/radeon/evergreen.c
    > +++ b/drivers/gpu/drm/radeon/evergreen.c
    > @@ -31,6 +31,7 @@
    >
    > #include "atom.h"
    > #include "avivod.h"
    > +#include "ni.h"
    > #include "rv770.h"
    > #include "evergreen.h"
    > #include "evergreen_blit_shaders.h"
    > @@ -215,10 +216,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev);
    > void evergreen_fini(struct radeon_device *rdev);
    > void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
    > void evergreen_program_aspm(struct radeon_device *rdev);
    > -extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
    > - int ring, u32 cp_int_cntl);
    > -extern void cayman_vm_decode_fault(struct radeon_device *rdev,
    > - u32 status, u32 addr);
    > void cik_init_cp_pg_table(struct radeon_device *rdev);
    >
    > extern u32 si_get_csb_size(struct radeon_device *rdev);
    > diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
    > index 1c9030a4631b8..ab7bd30802176 100644
    > --- a/drivers/gpu/drm/radeon/ni.c
    > +++ b/drivers/gpu/drm/radeon/ni.c
    > @@ -33,6 +33,7 @@
    > #include "cayman_blit_shaders.h"
    > #include "clearstate_cayman.h"
    > #include "evergreen.h"
    > +#include "ni.h"
    > #include "ni_reg.h"
    > #include "nid.h"
    > #include "radeon.h"
    > diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h
    > new file mode 100644
    > index 0000000000000..d63be1c88c0f1
    > --- /dev/null
    > +++ b/drivers/gpu/drm/radeon/ni.h
    > @@ -0,0 +1,38 @@
    > +/* ni.h -- Private header for radeon driver -*- linux-c -*-
    > + *
    > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
    > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
    > + * All rights reserved.
    > + *
    > + * Permission is hereby granted, free of charge, to any person obtaining a
    > + * copy of this software and associated documentation files (the "Software"),
    > + * to deal in the Software without restriction, including without limitation
    > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
    > + * and/or sell copies of the Software, and to permit persons to whom the
    > + * Software is furnished to do so, subject to the following conditions:
    > + *
    > + * The above copyright notice and this permission notice (including the next
    > + * paragraph) shall be included in all copies or substantial portions of the
    > + * Software.
    > + *
    > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
    > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
    > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    > + * DEALINGS IN THE SOFTWARE.
    > + *
    > + */
    > +
    > +#ifndef __NI_H__
    > +#define __NI_H__
    > +
    > +struct radeon_device;
    > +
    > +void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
    > + int ring, u32 cp_int_cntl);
    > +void cayman_vm_decode_fault(struct radeon_device *rdev,
    > + u32 status, u32 addr);
    > +
    > +#endif /* __NI_H__ */
    > --
    > 2.25.1
    >
    > _______________________________________________
    > dri-devel mailing list
    > dri-devel@lists.freedesktop.org
    > https://lists.freedesktop.org/mailman/listinfo/dri-devel

    \
     
     \ /
      Last update: 2020-11-16 21:12    [W:5.578 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site