Commit 91db9311 authored by Su Sung Chung's avatar Su Sung Chung Committed by Alex Deucher
Browse files

drm/amd/display: refactor gpio to allocate hw_container in constructor 



[why]
if dynamic allocation fails during gpio_open, it will cause crash due to
page fault.

[how]
handle allocation when gpio object gets created and prevent from calling
gpio_open if allocation failed

Signed-off-by: default avatarSu Sung Chung <Su.Chung@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 37495fbd

drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c

+12 −6
Original line number Diff line number Diff line
@@ -24,9 +24,15 @@ 
 */



#include "dm_services.h"



#include "include/gpio_types.h"

#include "../hw_factory.h"



#include "../hw_gpio.h"

#include "../hw_ddc.h"

#include "../hw_hpd.h"

#include "../hw_generic.h"



#include "hw_factory_dce110.h"



#include "dce/dce_11_0_d.h"
@@ -143,12 +149,12 @@ static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) 
}



static const struct hw_factory_funcs funcs = {

	.create_ddc_data = dal_hw_ddc_create,

	.create_ddc_clock = dal_hw_ddc_create,

	.create_generic = NULL,

	.create_hpd = dal_hw_hpd_create,

	.create_sync = NULL,

	.create_gsl = NULL,

	.init_ddc_data = dal_hw_ddc_init,

	.init_generic = NULL,

	.init_hpd = dal_hw_hpd_init,

	.get_ddc_pin = dal_hw_ddc_get_pin,

	.get_hpd_pin = dal_hw_hpd_get_pin,

	.get_generic_pin = NULL,

	.define_hpd_registers = define_hpd_registers,

	.define_ddc_registers = define_ddc_registers

};

drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_factory_dce120.c

+7 −7
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include "include/gpio_types.h"

#include "../hw_factory.h"





#include "../hw_gpio.h"

#include "../hw_ddc.h"

#include "../hw_hpd.h"

#include "../hw_generic.h"



#include "hw_factory_dce120.h"
@@ -164,12 +164,12 @@ static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) 


/* fucntion table */

static const struct hw_factory_funcs funcs = {

	.create_ddc_data = dal_hw_ddc_create,

	.create_ddc_clock = dal_hw_ddc_create,

	.create_generic = NULL,

	.create_hpd = dal_hw_hpd_create,

	.create_sync = NULL,

	.create_gsl = NULL,

	.init_ddc_data = dal_hw_ddc_init,

	.init_generic = NULL,

	.init_hpd = dal_hw_hpd_init,

	.get_ddc_pin = dal_hw_ddc_get_pin,

	.get_hpd_pin = dal_hw_hpd_get_pin,

	.get_generic_pin = NULL,

	.define_hpd_registers = define_hpd_registers,

	.define_ddc_registers = define_ddc_registers

};

drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_factory_dce80.c

+8 −6
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ 
#include "../hw_gpio.h"

#include "../hw_ddc.h"

#include "../hw_hpd.h"

#include "../hw_generic.h"



#include "dce/dce_8_0_d.h"

#include "dce/dce_8_0_sh_mask.h"





#define REG(reg_name)\

		mm ## reg_name
@@ -147,12 +149,12 @@ static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) 
}



static const struct hw_factory_funcs funcs = {

	.create_ddc_data = dal_hw_ddc_create,

	.create_ddc_clock = dal_hw_ddc_create,

	.create_generic = NULL,

	.create_hpd = dal_hw_hpd_create,

	.create_sync = NULL,

	.create_gsl = NULL,

	.init_ddc_data = dal_hw_ddc_init,

	.init_generic = NULL,

	.init_hpd = dal_hw_hpd_init,

	.get_ddc_pin = dal_hw_ddc_get_pin,

	.get_hpd_pin = dal_hw_hpd_get_pin,

	.get_generic_pin = NULL,

	.define_hpd_registers = define_hpd_registers,

	.define_ddc_registers = define_ddc_registers

};

drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c

+6 −6
Original line number Diff line number Diff line
@@ -196,12 +196,12 @@ static void define_hpd_registers(struct hw_gpio_pin *pin, uint32_t en) 


/* fucntion table */

static const struct hw_factory_funcs funcs = {

	.create_ddc_data = dal_hw_ddc_create,

	.create_ddc_clock = dal_hw_ddc_create,

	.create_generic = dal_hw_generic_create,

	.create_hpd = dal_hw_hpd_create,

	.create_sync = NULL,

	.create_gsl = NULL,

	.init_ddc_data = dal_hw_ddc_init,

	.init_generic = dal_hw_generic_init,

	.init_hpd = dal_hw_hpd_init,

	.get_ddc_pin = dal_hw_ddc_get_pin,

	.get_hpd_pin = dal_hw_hpd_get_pin,

	.get_generic_pin = dal_hw_generic_get_pin,

	.define_hpd_registers = define_hpd_registers,

	.define_ddc_registers = define_ddc_registers,

	.define_generic_registers = define_generic_registers

drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c

+6 −6
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ static void define_generic_registers(struct hw_gpio_pin *pin, uint32_t en) 


/* fucntion table */

static const struct hw_factory_funcs funcs = {

	.create_ddc_data = dal_hw_ddc_create,

	.create_ddc_clock = dal_hw_ddc_create,

	.create_generic = dal_hw_generic_create,

	.create_hpd = dal_hw_hpd_create,

	.create_sync = NULL,

	.create_gsl = NULL,

	.init_ddc_data = dal_hw_ddc_init,

	.init_generic = dal_hw_generic_init,

	.init_hpd = dal_hw_hpd_init,

	.get_ddc_pin = dal_hw_ddc_get_pin,

	.get_hpd_pin = dal_hw_hpd_get_pin,

	.get_generic_pin = dal_hw_generic_get_pin,

	.define_hpd_registers = define_hpd_registers,

	.define_ddc_registers = define_ddc_registers,

	.define_generic_registers = define_generic_registers,

CRA Git | Maintained and supported by SUSTech CRA and CCSE