Commit 5034b935 authored by Dillon Varone's avatar Dillon Varone Committed by Alex Deucher
Browse files

drm/amd/display: Modify DHCUB waterwark structures and functions 



[WHY&HOW]
Converting the watermark set structure to a union and modifying some interfaces
to accommodate future usage.

Reviewed-by: default avatarChaitanya Dhere <chaitanya.dhere@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarDillon Varone <dillon.varone@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 285a7054

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub) 


bool hubbub1_program_urgent_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{
@@ -356,7 +356,7 @@ bool hubbub1_program_urgent_watermarks( 


bool hubbub1_program_stutter_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{
@@ -501,7 +501,7 @@ bool hubbub1_program_stutter_watermarks( 


bool hubbub1_program_pstate_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{
@@ -582,7 +582,7 @@ bool hubbub1_program_pstate_watermarks( 


bool hubbub1_program_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h

+5 −5
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ struct dcn10_hubbub { 
	const struct dcn_hubbub_shift *shifts;

	const struct dcn_hubbub_mask *masks;

	unsigned int debug_test_index_pstate;

	struct dcn_watermark_set watermarks;

	union dcn_watermark_set watermarks;

};



void hubbub1_update_dchub(
@@ -423,7 +423,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub); 


bool hubbub1_program_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower);
@@ -446,17 +446,17 @@ void hubbub1_construct(struct hubbub *hubbub, 


bool hubbub1_program_urgent_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower);

bool hubbub1_program_stutter_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower);

bool hubbub1_program_pstate_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower);

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ void hubbub2_get_dchub_ref_freq(struct hubbub *hubbub, 


static bool hubbub2_program_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct dcn20_hubbub { 
	const struct dcn_hubbub_shift *shifts;

	const struct dcn_hubbub_mask *masks;

	unsigned int debug_test_index_pstate;

	struct dcn_watermark_set watermarks;

	union dcn_watermark_set watermarks;

	int num_vmid;

	struct dcn20_vmid vmid[16];

	unsigned int detile_buf_size;

drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


static bool hubbub201_program_watermarks(

		struct hubbub *hubbub,

		struct dcn_watermark_set *watermarks,

		union dcn_watermark_set *watermarks,

		unsigned int refclk_mhz,

		bool safe_to_lower)

{