Commit 429770b3 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: add asic callbacks for hpd 



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e0df1ac5

drivers/gpu/drm/radeon/radeon.h

+8 −0
Original line number Diff line number Diff line
@@ -649,6 +649,10 @@ struct radeon_asic { 
	int (*clear_surface_reg)(struct radeon_device *rdev, int reg);

	void (*bandwidth_update)(struct radeon_device *rdev);

	void (*hdp_flush)(struct radeon_device *rdev);

	void (*hpd_init)(struct radeon_device *rdev);

	void (*hpd_fini)(struct radeon_device *rdev);

	bool (*hpd_sense)(struct radeon_device *rdev, enum radeon_hpd_id hpd);

	void (*hpd_set_polarity)(struct radeon_device *rdev, enum radeon_hpd_id hpd);

};



/*
@@ -988,6 +992,10 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) 
#define radeon_clear_surface_reg(rdev, r) ((rdev)->asic->clear_surface_reg((rdev), (r)))

#define radeon_bandwidth_update(rdev) (rdev)->asic->bandwidth_update((rdev))

#define radeon_hdp_flush(rdev) (rdev)->asic->hdp_flush((rdev))

#define radeon_hpd_init(rdev) (rdev)->asic->hpd_init((rdev))

#define radeon_hpd_fini(rdev) (rdev)->asic->hpd_fini((rdev))

#define radeon_hpd_sense(rdev, hpd) (rdev)->asic->hpd_sense((rdev), (hpd))

#define radeon_hpd_set_polarity(rdev, hpd) (rdev)->asic->hpd_set_polarity((rdev), (hpd))



/* Common functions */

extern int radeon_gart_table_vram_pin(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_asic.h

+56 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ void r100_bandwidth_update(struct radeon_device *rdev); 
void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);

int r100_ring_test(struct radeon_device *rdev);

void r100_hdp_flush(struct radeon_device *rdev);

void r100_hpd_init(struct radeon_device *rdev);

void r100_hpd_fini(struct radeon_device *rdev);

bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);

void r100_hpd_set_polarity(struct radeon_device *rdev,

			   enum radeon_hpd_id hpd);



static struct radeon_asic r100_asic = {

	.init = &r100_init,
@@ -109,6 +114,10 @@ static struct radeon_asic r100_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &r100_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &r100_hpd_init,

	.hpd_fini = &r100_hpd_fini,

	.hpd_sense = &r100_hpd_sense,

	.hpd_set_polarity = &r100_hpd_set_polarity,

};
@@ -165,6 +174,10 @@ static struct radeon_asic r300_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &r100_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &r100_hpd_init,

	.hpd_fini = &r100_hpd_fini,

	.hpd_sense = &r100_hpd_sense,

	.hpd_set_polarity = &r100_hpd_set_polarity,

};



/*
@@ -205,6 +218,10 @@ static struct radeon_asic r420_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &r100_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &r100_hpd_init,

	.hpd_fini = &r100_hpd_fini,

	.hpd_sense = &r100_hpd_sense,

	.hpd_set_polarity = &r100_hpd_set_polarity,

};
@@ -250,6 +267,10 @@ static struct radeon_asic rs400_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &r100_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &r100_hpd_init,

	.hpd_fini = &r100_hpd_fini,

	.hpd_sense = &r100_hpd_sense,

	.hpd_set_polarity = &r100_hpd_set_polarity,

};
@@ -268,6 +289,12 @@ int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); 
uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg);

void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);

void rs600_bandwidth_update(struct radeon_device *rdev);

void rs600_hpd_init(struct radeon_device *rdev);

void rs600_hpd_fini(struct radeon_device *rdev);

bool rs600_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);

void rs600_hpd_set_polarity(struct radeon_device *rdev,

			    enum radeon_hpd_id hpd);



static struct radeon_asic rs600_asic = {

	.init = &rs600_init,

	.fini = &rs600_fini,
@@ -297,6 +324,10 @@ static struct radeon_asic rs600_asic = { 
	.set_clock_gating = &radeon_atom_set_clock_gating,

	.bandwidth_update = &rs600_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &rs600_hpd_init,

	.hpd_fini = &rs600_hpd_fini,

	.hpd_sense = &rs600_hpd_sense,

	.hpd_set_polarity = &rs600_hpd_set_polarity,

};
@@ -341,6 +372,10 @@ static struct radeon_asic rs690_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &rs690_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &rs600_hpd_init,

	.hpd_fini = &rs600_hpd_fini,

	.hpd_sense = &rs600_hpd_sense,

	.hpd_set_polarity = &rs600_hpd_set_polarity,

};
@@ -389,6 +424,10 @@ static struct radeon_asic rv515_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &rv515_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &rs600_hpd_init,

	.hpd_fini = &rs600_hpd_fini,

	.hpd_sense = &rs600_hpd_sense,

	.hpd_set_polarity = &rs600_hpd_set_polarity,

};
@@ -428,6 +467,10 @@ static struct radeon_asic r520_asic = { 
	.clear_surface_reg = r100_clear_surface_reg,

	.bandwidth_update = &rv515_bandwidth_update,

	.hdp_flush = &r100_hdp_flush,

	.hpd_init = &rs600_hpd_init,

	.hpd_fini = &rs600_hpd_fini,

	.hpd_sense = &rs600_hpd_sense,

	.hpd_set_polarity = &rs600_hpd_set_polarity,

};



/*
@@ -465,6 +508,11 @@ int r600_copy_blit(struct radeon_device *rdev, 
		   uint64_t src_offset, uint64_t dst_offset,

		   unsigned num_pages, struct radeon_fence *fence);

void r600_hdp_flush(struct radeon_device *rdev);

void r600_hpd_init(struct radeon_device *rdev);

void r600_hpd_fini(struct radeon_device *rdev);

bool r600_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);

void r600_hpd_set_polarity(struct radeon_device *rdev,

			   enum radeon_hpd_id hpd);



static struct radeon_asic r600_asic = {

	.init = &r600_init,
@@ -496,6 +544,10 @@ static struct radeon_asic r600_asic = { 
	.clear_surface_reg = r600_clear_surface_reg,

	.bandwidth_update = &rv515_bandwidth_update,

	.hdp_flush = &r600_hdp_flush,

	.hpd_init = &r600_hpd_init,

	.hpd_fini = &r600_hpd_fini,

	.hpd_sense = &r600_hpd_sense,

	.hpd_set_polarity = &r600_hpd_set_polarity,

};



/*
@@ -537,6 +589,10 @@ static struct radeon_asic rv770_asic = { 
	.clear_surface_reg = r600_clear_surface_reg,

	.bandwidth_update = &rv515_bandwidth_update,

	.hdp_flush = &r600_hdp_flush,

	.hpd_init = &r600_hpd_init,

	.hpd_fini = &r600_hpd_fini,

	.hpd_sense = &r600_hpd_sense,

	.hpd_set_polarity = &r600_hpd_set_polarity,

};



#endif

drivers/gpu/drm/radeon/r600.c

+1 −1

File changed.

Contains only whitespace changes.