Skip to contentSkip to conversation

drm/amd/display: Make function pointer structs const

PATCH In review Harry Wentland 2 participants 2 messages Jul 6, 2018 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: Make function pointer structs const

const to avoid hard-to-find bugs where some function overrides a function pointer.

---
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c     | 2 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c      | 2 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c      | 2 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 ++--
 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +1 -1
index 8b124948c3d0..5f686aa8fc84 100644
@@ -1139,7 +1139,7 @@ void hubp1_vtg_sel(struct hubp *hubp, uint32_t otg_inst)
 	REG_UPDATE(DCHUBP_CNTL, HUBP_VTG_SEL, otg_inst);
 }
 
-static struct hubp_funcs dcn10_hubp_funcs = {
+static const struct hubp_funcs dcn10_hubp_funcs = {
 	.hubp_program_surface_flip_and_addr =
 			hubp1_program_surface_flip_and_addr,
 	.hubp_program_surface_config =
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +1 -1
index 9ca51ae46de7..958994edf2c4 100644
@@ -428,7 +428,7 @@ void mpc1_read_mpcc_state(
 			MPCC_BUSY, &s->busy);
 }
 
-const struct mpc_funcs dcn10_mpc_funcs = {
+static const struct mpc_funcs dcn10_mpc_funcs = {
 	.read_mpcc_state = mpc1_read_mpcc_state,
 	.insert_plane = mpc1_insert_plane,
 	.remove_mpcc = mpc1_remove_mpcc,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c +1 -1
index 77a1a9d541a4..ab958cff3b76 100644
@@ -385,7 +385,7 @@ void opp1_destroy(struct output_pixel_processor **opp)
 	*opp = NULL;
 }
 
-static struct opp_funcs dcn10_opp_funcs = {
+static const struct opp_funcs dcn10_opp_funcs = {
 		.opp_set_dyn_expansion = opp1_set_dyn_expansion,
 		.opp_program_fmt = opp1_program_fmt,
 		.opp_program_bit_depth_reduction = opp1_program_bit_depth_reduction,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +2 -2
index 771e0cf29bba..84581b3c392b 100644
@@ -1035,11 +1035,11 @@ static enum dc_status dcn10_validate_plane(const struct dc_plane_state *plane_st
 	return DC_OK;
 }
 
-static struct dc_cap_funcs cap_funcs = {
+static const struct dc_cap_funcs cap_funcs = {
 	.get_dcc_compression_cap = dcn10_get_dcc_compression_cap
 };
 
-static struct resource_funcs dcn10_res_pool_funcs = {
+static const struct resource_funcs dcn10_res_pool_funcs = {
 	.destroy = dcn10_destroy_resource_pool,
 	.link_enc_create = dcn10_link_encoder_create,
 	.validate_bandwidth = dcn_validate_bandwidth,
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +1 -1
index 97df82cddf82..5b7976f6861a 100644
@@ -43,7 +43,7 @@ enum cursor_lines_per_chunk {
 };
 
 struct hubp {
-	struct hubp_funcs *funcs;
+	const struct hubp_funcs *funcs;
 	struct dc_context *ctx;
 	struct dc_plane_address request_address;
 	struct dc_plane_address current_address;
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20180706142240.21580-1-harry.wentland-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw

Am 06.07.2018 um 16:22 schrieb Harry Wentland:

Quoted 4 lines

const to avoid hard-to-find bugs where some function overrides a function pointer.

Quoted 70 lines
---
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c     | 2 +-
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c      | 2 +-
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c      | 2 +-
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 ++--
  drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h          | 2 +-
  5 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +1 -1
index 8b124948c3d0..5f686aa8fc84 100644
@@ -1139,7 +1139,7 @@ void hubp1_vtg_sel(struct hubp *hubp, uint32_t otg_inst)
  	REG_UPDATE(DCHUBP_CNTL, HUBP_VTG_SEL, otg_inst);
  }
 
-static struct hubp_funcs dcn10_hubp_funcs = {
+static const struct hubp_funcs dcn10_hubp_funcs = {
  	.hubp_program_surface_flip_and_addr =
  			hubp1_program_surface_flip_and_addr,
  	.hubp_program_surface_config =
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +1 -1
index 9ca51ae46de7..958994edf2c4 100644
@@ -428,7 +428,7 @@ void mpc1_read_mpcc_state(
  			MPCC_BUSY, &s->busy);
  }
 
-const struct mpc_funcs dcn10_mpc_funcs = {
+static const struct mpc_funcs dcn10_mpc_funcs = {
  	.read_mpcc_state = mpc1_read_mpcc_state,
  	.insert_plane = mpc1_insert_plane,
  	.remove_mpcc = mpc1_remove_mpcc,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c +1 -1
index 77a1a9d541a4..ab958cff3b76 100644
@@ -385,7 +385,7 @@ void opp1_destroy(struct output_pixel_processor **opp)
  	*opp = NULL;
  }
 
-static struct opp_funcs dcn10_opp_funcs = {
+static const struct opp_funcs dcn10_opp_funcs = {
  		.opp_set_dyn_expansion = opp1_set_dyn_expansion,
  		.opp_program_fmt = opp1_program_fmt,
  		.opp_program_bit_depth_reduction = opp1_program_bit_depth_reduction,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +2 -2
index 771e0cf29bba..84581b3c392b 100644
@@ -1035,11 +1035,11 @@ static enum dc_status dcn10_validate_plane(const struct dc_plane_state *plane_st
  	return DC_OK;
  }
 
-static struct dc_cap_funcs cap_funcs = {
+static const struct dc_cap_funcs cap_funcs = {
  	.get_dcc_compression_cap = dcn10_get_dcc_compression_cap
  };
 
-static struct resource_funcs dcn10_res_pool_funcs = {
+static const struct resource_funcs dcn10_res_pool_funcs = {
  	.destroy = dcn10_destroy_resource_pool,
  	.link_enc_create = dcn10_link_encoder_create,
  	.validate_bandwidth = dcn_validate_bandwidth,
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +0 -0
index 97df82cddf82..5b7976f6861a 100644

drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h enum cursor_lines_per_chunk { · line 49

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +1 -1
@@ -43,7 +43,7 @@ enum cursor_lines_per_chunk {
  };
 
  struct hubp {
-	struct hubp_funcs *funcs;
+	const struct hubp_funcs *funcs;
  	struct dc_context *ctx;
  	struct dc_plane_address request_address;
  	struct dc_plane_address current_address;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx