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

Commit a87145ca authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: refactor parse general definitions 



Early return on failures. Rename the variable for later merging with
parse_device_mappings().

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/785abb904a572752fec68d90d34efeb67774dc1f.1506586821.git.jani.nikula@intel.com
parent 348e4058

drivers/gpu/drm/i915/intel_bios.c

+20 −14
Original line number Diff line number Diff line
@@ -435,21 +435,27 @@ static void 
parse_general_definitions(struct drm_i915_private *dev_priv,

			  const struct bdb_header *bdb)

{

	const struct bdb_general_definitions *general;

	const struct bdb_general_definitions *defs;

	u16 block_size;

	int bus_pin;



	defs = find_section(bdb, BDB_GENERAL_DEFINITIONS);

	if (!defs) {

		DRM_DEBUG_KMS("General definitions block not found\n");

		return;

	}



	block_size = get_blocksize(defs);

	if (block_size < sizeof(*defs)) {

		DRM_DEBUG_KMS("General definitions block too small (%u)\n",

			      block_size);

		return;

	}



	general = find_section(bdb, BDB_GENERAL_DEFINITIONS);

	if (general) {

		u16 block_size = get_blocksize(general);

		if (block_size >= sizeof(*general)) {

			int bus_pin = general->crt_ddc_gmbus_pin;

	bus_pin = defs->crt_ddc_gmbus_pin;

	DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin);

	if (intel_gmbus_is_valid_pin(dev_priv, bus_pin))

		dev_priv->vbt.crt_ddc_pin = bus_pin;

		} else {

			DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n",

				      block_size);

		}

	}

}



static const struct child_device_config *