Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d39c3b89 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: Convert RV515 to new init path and associated cleanup 



Convert the rv515 asic support to new init path also add an explanation
in radeon.h about the new init path. There is also few cleanups
associated with this change (others asic calling rv515 helper
functions).

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent f4e45d02

drivers/gpu/drm/radeon/avivod.h

+0 −9
Original line number Diff line number Diff line
@@ -57,13 +57,4 @@ 
#define	VGA_RENDER_CONTROL				0x0300

#define		VGA_VSTATUS_CNTL_MASK				0x00030000



/* AVIVO disable VGA rendering */

static inline void radeon_avivo_vga_render_disable(struct radeon_device *rdev)

{

	u32 vga_render;

	vga_render = RREG32(VGA_RENDER_CONTROL);

	vga_render &= ~VGA_VSTATUS_CNTL_MASK;

	WREG32(VGA_RENDER_CONTROL, vga_render);

}



#endif

drivers/gpu/drm/radeon/r520.c

+7 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
void r100_hdp_reset(struct radeon_device *rdev);

void r420_pipes_init(struct radeon_device *rdev);

void rs600_mc_disable_clients(struct radeon_device *rdev);

void rs600_disable_vga(struct radeon_device *rdev);

int rv515_debugfs_pipes_info_init(struct radeon_device *rdev);

int rv515_debugfs_ga_info_init(struct radeon_device *rdev);
@@ -148,7 +147,7 @@ void r520_gpu_init(struct radeon_device *rdev) 
	unsigned pipe_select_current, gb_pipe_select, tmp;



	r100_hdp_reset(rdev);

	rs600_disable_vga(rdev);

	rv515_vga_render_disable(rdev);

	/*

	 * DST_PIPE_CONFIG		0x170C

	 * GB_TILE_CONFIG		0x4018
@@ -237,3 +236,9 @@ void r520_bandwidth_update(struct radeon_device *rdev) 
{

	rv515_bandwidth_avivo_update(rdev);

}



int r520_init(struct radeon_device *rdev)

{

	rv515_set_safe_registers(rdev);

	return 0;

}

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#include "radeon.h"

#include "radeon_mode.h"

#include "r600d.h"

#include "avivod.h"

#include "atom.h"

#include "avivod.h"



#define PFP_UCODE_SIZE 576

#define PM4_UCODE_SIZE 1792
@@ -342,7 +342,7 @@ static void r600_mc_resume(struct radeon_device *rdev) 


	/* we need to own VRAM, so turn off the VGA renderer here

	 * to stop it overwriting our objects */

	radeon_avivo_vga_render_disable(rdev);

	rv515_vga_render_disable(rdev);

}



int r600_mc_init(struct radeon_device *rdev)

drivers/gpu/drm/radeon/r600_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "drmP.h"

#include "radeon.h"

#include "r600d.h"

#include "avivod.h"



static int r600_cs_packet_next_reloc_mm(struct radeon_cs_parser *p,

					struct radeon_cs_reloc **cs_reloc);

drivers/gpu/drm/radeon/radeon.h

+34 −0
Original line number Diff line number Diff line
@@ -44,6 +44,24 @@ 
 *	- TESTING, TESTING, TESTING

 */



/* Initialization path:

 *  We expect that acceleration initialization might fail for various

 *  reasons even thought we work hard to make it works on most

 *  configurations. In order to still have a working userspace in such

 *  situation the init path must succeed up to the memory controller

 *  initialization point. Failure before this point are considered as

 *  fatal error. Here is the init callchain :

 *      radeon_device_init  perform common structure, mutex initialization

 *      asic_init           setup the GPU memory layout and perform all

 *                          one time initialization (failure in this

 *                          function are considered fatal)

 *      asic_startup        setup the GPU acceleration, in order to

 *                          follow guideline the first thing this

 *                          function should do is setting the GPU

 *                          memory controller (only MC setup failure

 *                          are considered as fatal)

 */



#include <asm/atomic.h>

#include <linux/wait.h>

#include <linux/list.h>
@@ -976,6 +994,7 @@ extern void radeon_clocks_fini(struct radeon_device *rdev); 
extern void radeon_scratch_init(struct radeon_device *rdev);

extern void radeon_surface_init(struct radeon_device *rdev);

extern int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data);

extern void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable);



/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */

struct r100_mc_save {
@@ -1007,6 +1026,9 @@ extern void r100_vram_init_sizes(struct radeon_device *rdev); 
extern void r100_wb_disable(struct radeon_device *rdev);

extern void r100_wb_fini(struct radeon_device *rdev);

extern int r100_wb_init(struct radeon_device *rdev);

extern void r100_hdp_reset(struct radeon_device *rdev);

extern int r100_rb2d_reset(struct radeon_device *rdev);

extern int r100_cp_reset(struct radeon_device *rdev);



/* r300,r350,rv350,rv370,rv380 */

extern void r300_set_reg_safe(struct radeon_device *rdev);
@@ -1018,12 +1040,24 @@ extern int rv370_pcie_gart_enable(struct radeon_device *rdev); 
extern void rv370_pcie_gart_disable(struct radeon_device *rdev);



/* r420,r423,rv410 */

extern int r420_mc_init(struct radeon_device *rdev);

extern u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg);

extern void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v);

extern int r420_debugfs_pipes_info_init(struct radeon_device *rdev);

extern void r420_pipes_init(struct radeon_device *rdev);



/* rv515 */

struct rv515_mc_save {

	u32 d1vga_control;

	u32 d2vga_control;

	u32 vga_render_control;

	u32 vga_hdp_control;

	u32 d1crtc_control;

	u32 d2crtc_control;

};

extern void rv515_bandwidth_avivo_update(struct radeon_device *rdev);

extern void rv515_vga_render_disable(struct radeon_device *rdev);

extern void rv515_set_safe_registers(struct radeon_device *rdev);



/* rs690, rs740 */

extern void rs690_line_buffer_adjust(struct radeon_device *rdev,