Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8ef3b4c authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: constify find_section in VBT parsing 



Make input and output of find_section const, and fix the fallout. We
shouldn't modify the VBT, so make the compiler help us here.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4bca26d0

drivers/gpu/drm/i915/intel_bios.c

+31 −29
Original line number Original line Diff line number Diff line
@@ -36,10 +36,11 @@ 




static int panel_type;

static int panel_type;





static void *

static const void *

find_section(struct bdb_header *bdb, int section_id)

find_section(const void *_bdb, int section_id)

{

{

	u8 *base = (u8 *)bdb;

	const struct bdb_header *bdb = _bdb;

	const u8 *base = _bdb;

	int index = 0;

	int index = 0;

	u16 total, current_size;

	u16 total, current_size;

	u8 current_id;

	u8 current_id;
@@ -53,7 +54,7 @@ find_section(struct bdb_header *bdb, int section_id) 
		current_id = *(base + index);

		current_id = *(base + index);

		index++;

		index++;





		current_size = *((u16 *)(base + index));

		current_size = *((const u16 *)(base + index));

		index += 2;

		index += 2;





		if (index + current_size > total)

		if (index + current_size > total)
@@ -69,7 +70,7 @@ find_section(struct bdb_header *bdb, int section_id) 
}

}





static u16

static u16

get_blocksize(void *p)

get_blocksize(const void *p)

{

{

	u16 *block_ptr, block_size;

	u16 *block_ptr, block_size;
@@ -350,7 +351,7 @@ static void 
parse_sdvo_panel_data(struct drm_i915_private *dev_priv,

parse_sdvo_panel_data(struct drm_i915_private *dev_priv,

		      struct bdb_header *bdb)

		      struct bdb_header *bdb)

{

{

	struct lvds_dvo_timing *dvo_timing;

	const struct lvds_dvo_timing *dvo_timing;

	struct drm_display_mode *panel_fixed_mode;

	struct drm_display_mode *panel_fixed_mode;

	int index;

	int index;
@@ -361,7 +362,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv, 
	}

	}





	if (index == -1) {

	if (index == -1) {

		struct bdb_sdvo_lvds_options *sdvo_lvds_options;

		const struct bdb_sdvo_lvds_options *sdvo_lvds_options;





		sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);

		sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);

		if (!sdvo_lvds_options)

		if (!sdvo_lvds_options)
@@ -405,7 +406,7 @@ parse_general_features(struct drm_i915_private *dev_priv, 
		       struct bdb_header *bdb)

		       struct bdb_header *bdb)

{

{

	struct drm_device *dev = dev_priv->dev;

	struct drm_device *dev = dev_priv->dev;

	struct bdb_general_features *general;

	const struct bdb_general_features *general;





	general = find_section(bdb, BDB_GENERAL_FEATURES);

	general = find_section(bdb, BDB_GENERAL_FEATURES);

	if (general) {

	if (general) {
@@ -430,7 +431,7 @@ static void 
parse_general_definitions(struct drm_i915_private *dev_priv,

parse_general_definitions(struct drm_i915_private *dev_priv,

			  struct bdb_header *bdb)

			  struct bdb_header *bdb)

{

{

	struct bdb_general_definitions *general;

	const struct bdb_general_definitions *general;





	general = find_section(bdb, BDB_GENERAL_DEFINITIONS);

	general = find_section(bdb, BDB_GENERAL_DEFINITIONS);

	if (general) {

	if (general) {
@@ -447,10 +448,10 @@ parse_general_definitions(struct drm_i915_private *dev_priv, 
	}

	}

}

}





static union child_device_config *

static const union child_device_config *

child_device_ptr(struct bdb_general_definitions *p_defs, int i)

child_device_ptr(const struct bdb_general_definitions *p_defs, int i)

{

{

	return (void *) &p_defs->devices[i * p_defs->child_dev_size];

	return (const void *) &p_defs->devices[i * p_defs->child_dev_size];

}

}





static void

static void
@@ -458,8 +459,8 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, 
			  struct bdb_header *bdb)

			  struct bdb_header *bdb)

{

{

	struct sdvo_device_mapping *p_mapping;

	struct sdvo_device_mapping *p_mapping;

	struct bdb_general_definitions *p_defs;

	const struct bdb_general_definitions *p_defs;

	union child_device_config *p_child;

	const union child_device_config *p_child;

	int i, child_device_num, count;

	int i, child_device_num, count;

	u16	block_size;

	u16	block_size;
@@ -547,7 +548,7 @@ static void 
parse_driver_features(struct drm_i915_private *dev_priv,

parse_driver_features(struct drm_i915_private *dev_priv,

		       struct bdb_header *bdb)

		       struct bdb_header *bdb)

{

{

	struct bdb_driver_features *driver;

	const struct bdb_driver_features *driver;





	driver = find_section(bdb, BDB_DRIVER_FEATURES);

	driver = find_section(bdb, BDB_DRIVER_FEATURES);

	if (!driver)

	if (!driver)
@@ -573,9 +574,9 @@ parse_driver_features(struct drm_i915_private *dev_priv, 
static void

static void

parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

{

{

	struct bdb_edp *edp;

	const struct bdb_edp *edp;

	struct edp_power_seq *edp_pps;

	const struct edp_power_seq *edp_pps;

	struct edp_link_params *edp_link_params;

	const struct edp_link_params *edp_link_params;





	edp = find_section(bdb, BDB_EDP);

	edp = find_section(bdb, BDB_EDP);

	if (!edp) {

	if (!edp) {
@@ -685,8 +686,8 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb) 
static void

static void

parse_psr(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

parse_psr(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

{

{

	struct bdb_psr *psr;

	const struct bdb_psr *psr;

	struct psr_table *psr_table;

	const struct psr_table *psr_table;





	psr = find_section(bdb, BDB_PSR);

	psr = find_section(bdb, BDB_PSR);

	if (!psr) {

	if (!psr) {
@@ -796,11 +797,12 @@ static u8 *goto_next_sequence(u8 *data, int *size) 
static void

static void

parse_mipi(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

parse_mipi(struct drm_i915_private *dev_priv, struct bdb_header *bdb)

{

{

	struct bdb_mipi_config *start;

	const struct bdb_mipi_config *start;

	struct bdb_mipi_sequence *sequence;

	const struct bdb_mipi_sequence *sequence;

	struct mipi_config *config;

	const struct mipi_config *config;

	struct mipi_pps_data *pps;

	const struct mipi_pps_data *pps;

	u8 *data, *seq_data;

	u8 *data;

	const u8 *seq_data;

	int i, panel_id, seq_size;

	int i, panel_id, seq_size;

	u16 block_size;

	u16 block_size;
@@ -1068,8 +1070,9 @@ static void 
parse_device_mapping(struct drm_i915_private *dev_priv,

parse_device_mapping(struct drm_i915_private *dev_priv,

		       struct bdb_header *bdb)

		       struct bdb_header *bdb)

{

{

	struct bdb_general_definitions *p_defs;

	const struct bdb_general_definitions *p_defs;

	union child_device_config *p_child, *child_dev_ptr;

	const union child_device_config *p_child;

	union child_device_config *child_dev_ptr;

	int i, child_device_num, count;

	int i, child_device_num, count;

	u16	block_size;

	u16	block_size;
@@ -1126,8 +1129,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv, 




		child_dev_ptr = dev_priv->vbt.child_dev + count;

		child_dev_ptr = dev_priv->vbt.child_dev + count;

		count++;

		count++;

		memcpy((void *)child_dev_ptr, (void *)p_child,

		memcpy(child_dev_ptr, p_child, sizeof(*p_child));

					sizeof(*p_child));

	}

	}

	return;

	return;

}

}