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

Commit 3bdd14d5 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move VBT based TV presence check to intel_bios.c 



Hide knowledge about VBT child devices in intel_bios.c.

v2: also move int_tv_support check to intel_bios.c (Sivakumar)

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458125015-7931-1-git-send-email-jani.nikula@intel.com
parent 6b93e9c8

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -3353,6 +3353,7 @@ extern void intel_i2c_reset(struct drm_device *dev); 
/* intel_bios.c */

int intel_bios_init(struct drm_i915_private *dev_priv);

bool intel_bios_is_valid_vbt(const void *buf, size_t size);

bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);



/* intel_opregion.c */

#ifdef CONFIG_ACPI

drivers/gpu/drm/i915/intel_bios.c

+41 −0
Original line number Diff line number Diff line
@@ -1431,3 +1431,44 @@ intel_bios_init(struct drm_i915_private *dev_priv) 


	return 0;

}



/**

 * intel_bios_is_tv_present - is integrated TV present in VBT

 * @dev_priv:	i915 device instance

 *

 * Return true if TV is present. If no child devices were parsed from VBT,

 * assume TV is present.

 */

bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv)

{

	union child_device_config *p_child;

	int i;



	if (!dev_priv->vbt.int_tv_support)

		return false;



	if (!dev_priv->vbt.child_dev_num)

		return true;



	for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {

		p_child = dev_priv->vbt.child_dev + i;

		/*

		 * If the device type is not TV, continue.

		 */

		switch (p_child->old.device_type) {

		case DEVICE_TYPE_INT_TV:

		case DEVICE_TYPE_TV:

		case DEVICE_TYPE_TV_SVIDEO_COMPOSITE:

			break;

		default:

			continue;

		}

		/* Only when the addin_offset is non-zero, it is regarded

		 * as present.

		 */

		if (p_child->old.addin_offset)

			return true;

	}



	return false;

}

drivers/gpu/drm/i915/intel_tv.c

+1 −45
Original line number Diff line number Diff line
@@ -1519,47 +1519,6 @@ static const struct drm_encoder_funcs intel_tv_enc_funcs = { 
	.destroy = intel_encoder_destroy,

};



/*

 * Enumerate the child dev array parsed from VBT to check whether

 * the integrated TV is present.

 * If it is present, return 1.

 * If it is not present, return false.

 * If no child dev is parsed from VBT, it assumes that the TV is present.

 */

static int tv_is_present_in_vbt(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	union child_device_config *p_child;

	int i, ret;



	if (!dev_priv->vbt.child_dev_num)

		return 1;



	ret = 0;

	for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {

		p_child = dev_priv->vbt.child_dev + i;

		/*

		 * If the device type is not TV, continue.

		 */

		switch (p_child->old.device_type) {

		case DEVICE_TYPE_INT_TV:

		case DEVICE_TYPE_TV:

		case DEVICE_TYPE_TV_SVIDEO_COMPOSITE:

			break;

		default:

			continue;

		}

		/* Only when the addin_offset is non-zero, it is regarded

		 * as present.

		 */

		if (p_child->old.addin_offset) {

			ret = 1;

			break;

		}

	}

	return ret;

}



void

intel_tv_init(struct drm_device *dev)

{
@@ -1575,13 +1534,10 @@ intel_tv_init(struct drm_device *dev) 
	if ((I915_READ(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED)

		return;



	if (!tv_is_present_in_vbt(dev)) {

	if (!intel_bios_is_tv_present(dev_priv)) {

		DRM_DEBUG_KMS("Integrated TV is not present.\n");

		return;

	}

	/* Even if we have an encoder we may not have a connector */

	if (!dev_priv->vbt.int_tv_support)

		return;



	/*

	 * Sanity check the TV output by checking to see if the