Commit 7e340d3c authored by Sebastian Aguilera Novoa's avatar Sebastian Aguilera Novoa Committed by Alex Deucher
Browse files

drm/amd/display/dc/irq: Remove duplications of hpd_ack function from IRQ 



The major of dcn and dce irqs share a copy-pasted collection
of copy-pasted function, which is: hpd_ack.

This patch removes the multiple copy-pasted by moving them to
the irq_service.c and make the irq_service's
calls the functions implemented by the irq_service.c
instead.

The hpd_ack function is replaced by hpd0_ack and hpd1_ack, the
required constants are also added.

The changes were not tested on actual hardware. I am only able
to verify that the changes keep the code compileable and do my
best to look repeatedly if I am not actually changing any code.

Signed-off-by: default avatarSebastian Aguilera Novoa <saguileran@ime.usp.br>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d8d47f73

drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c

+1 −28
Original line number Diff line number Diff line
@@ -37,36 +37,9 @@ 


#include "ivsrcid/ivsrcid_vislands30.h"



static bool hpd_ack(

	struct irq_service *irq_service,

	const struct irq_source_info *info)

{

	uint32_t addr = info->status_reg;

	uint32_t value = dm_read_reg(irq_service->ctx, addr);

	uint32_t current_status =

		get_reg_field_value(

			value,

			HPD0_DC_HPD_INT_STATUS,

			DC_HPD_SENSE_DELAYED);



	dal_irq_service_ack_generic(irq_service, info);



	value = dm_read_reg(irq_service->ctx, info->enable_reg);



	set_reg_field_value(

		value,

		current_status ? 0 : 1,

		HPD0_DC_HPD_INT_CONTROL,

		DC_HPD_INT_POLARITY);



	dm_write_reg(irq_service->ctx, info->enable_reg, value);



	return true;

}



static struct irq_source_info_funcs hpd_irq_info_funcs  = {

	.set = NULL,

	.ack = hpd_ack

	.ack = hpd0_ack

};



static struct irq_source_info_funcs hpd_rx_irq_info_funcs = {

drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c

+1 −30
Original line number Diff line number Diff line
@@ -46,36 +46,9 @@ 


#include "dc_types.h"



static bool hpd_ack(

	struct irq_service *irq_service,

	const struct irq_source_info *info)

{

	uint32_t addr = info->status_reg;

	uint32_t value = dm_read_reg(irq_service->ctx, addr);

	uint32_t current_status =

		get_reg_field_value(

			value,

			DC_HPD1_INT_STATUS,

			DC_HPD1_SENSE_DELAYED);



	dal_irq_service_ack_generic(irq_service, info);



	value = dm_read_reg(irq_service->ctx, info->enable_reg);



	set_reg_field_value(

		value,

		current_status ? 0 : 1,

		DC_HPD1_INT_CONTROL,

		DC_HPD1_INT_POLARITY);



	dm_write_reg(irq_service->ctx, info->enable_reg, value);



	return true;

}



static struct irq_source_info_funcs hpd_irq_info_funcs  = {

	.set = NULL,

	.ack = hpd_ack

	.ack = hpd1_ack

};



static struct irq_source_info_funcs hpd_rx_irq_info_funcs = {
@@ -391,5 +364,3 @@ struct irq_service *dal_irq_service_dce60_create( 
	dce60_irq_construct(irq_service, init_data);

	return irq_service;

}

drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c

+1 −30
Original line number Diff line number Diff line
@@ -37,36 +37,9 @@ 


#include "dc_types.h"



static bool hpd_ack(

	struct irq_service *irq_service,

	const struct irq_source_info *info)

{

	uint32_t addr = info->status_reg;

	uint32_t value = dm_read_reg(irq_service->ctx, addr);

	uint32_t current_status =

		get_reg_field_value(

			value,

			DC_HPD1_INT_STATUS,

			DC_HPD1_SENSE_DELAYED);



	dal_irq_service_ack_generic(irq_service, info);



	value = dm_read_reg(irq_service->ctx, info->enable_reg);



	set_reg_field_value(

		value,

		current_status ? 0 : 1,

		DC_HPD1_INT_CONTROL,

		DC_HPD1_INT_POLARITY);



	dm_write_reg(irq_service->ctx, info->enable_reg, value);



	return true;

}



static struct irq_source_info_funcs hpd_irq_info_funcs  = {

	.set = NULL,

	.ack = hpd_ack

	.ack = hpd1_ack

};



static struct irq_source_info_funcs hpd_rx_irq_info_funcs = {
@@ -303,5 +276,3 @@ struct irq_service *dal_irq_service_dce80_create( 
	dce80_irq_construct(irq_service, init_data);

	return irq_service;

}

drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c

+1 −28
Original line number Diff line number Diff line
@@ -129,36 +129,9 @@ static enum dc_irq_source to_dal_irq_source_dcn10(struct irq_service *irq_servic 
	}

}



static bool hpd_ack(

	struct irq_service *irq_service,

	const struct irq_source_info *info)

{

	uint32_t addr = info->status_reg;

	uint32_t value = dm_read_reg(irq_service->ctx, addr);

	uint32_t current_status =

		get_reg_field_value(

			value,

			HPD0_DC_HPD_INT_STATUS,

			DC_HPD_SENSE_DELAYED);



	dal_irq_service_ack_generic(irq_service, info);



	value = dm_read_reg(irq_service->ctx, info->enable_reg);



	set_reg_field_value(

		value,

		current_status ? 0 : 1,

		HPD0_DC_HPD_INT_CONTROL,

		DC_HPD_INT_POLARITY);



	dm_write_reg(irq_service->ctx, info->enable_reg, value);



	return true;

}



static struct irq_source_info_funcs hpd_irq_info_funcs  = {

	.set = NULL,

	.ack = hpd_ack

	.ack = hpd0_ack

};



static struct irq_source_info_funcs hpd_rx_irq_info_funcs = {

drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c

+1 −28
Original line number Diff line number Diff line
@@ -130,36 +130,9 @@ static enum dc_irq_source to_dal_irq_source_dcn20( 
	}

}



static bool hpd_ack(

	struct irq_service *irq_service,

	const struct irq_source_info *info)

{

	uint32_t addr = info->status_reg;

	uint32_t value = dm_read_reg(irq_service->ctx, addr);

	uint32_t current_status =

		get_reg_field_value(

			value,

			HPD0_DC_HPD_INT_STATUS,

			DC_HPD_SENSE_DELAYED);



	dal_irq_service_ack_generic(irq_service, info);



	value = dm_read_reg(irq_service->ctx, info->enable_reg);



	set_reg_field_value(

		value,

		current_status ? 0 : 1,

		HPD0_DC_HPD_INT_CONTROL,

		DC_HPD_INT_POLARITY);



	dm_write_reg(irq_service->ctx, info->enable_reg, value);



	return true;

}



static struct irq_source_info_funcs hpd_irq_info_funcs  = {

	.set = NULL,

	.ack = hpd_ack

	.ack = hpd0_ack

};



static struct irq_source_info_funcs hpd_rx_irq_info_funcs = {