Commit ef072392 authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header 



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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8595a0bf

drivers/gpu/drm/radeon/evergreen.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/radeon/ni.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/radeon/ni.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* ni.h -- Private header for radeon driver -*- linux-c -*-

 *

 * Copyright 2010 Advanced Micro Devices, Inc.

 *

 * 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__ */