Message ID | fe50064032b7c510a45a9570db5e1bbeaad73fc7.1452541881.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 2016-01-11 at 21:54 +0200, Jani Nikula wrote: > Hide knowledge about VBT child devices in intel_bios.c. > Tested-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_bios.c | 33 +++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_dp.c | 21 +-------------------- > 3 files changed, 35 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 5f0d44b380aa..6ae828f984de 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3349,6 +3349,7 @@ 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); > bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin); > +bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port); > > /* intel_opregion.c */ > #ifdef CONFIG_ACPI > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 099f3f0002a2..a7491a450cc8 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -1503,3 +1503,36 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin) > > return false; > } > + > +/** > + * intel_bios_is_port_edp - is the device in given port eDP > + * @dev_priv: i915 device instance > + * @port: port to check > + * > + * Return true if the device in %port is eDP. > + */ > +bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port) > +{ > + union child_device_config *p_child; > + static const short port_mapping[] = { > + [PORT_B] = DVO_PORT_DPB, > + [PORT_C] = DVO_PORT_DPC, > + [PORT_D] = DVO_PORT_DPD, > + [PORT_E] = DVO_PORT_DPE, > + }; > + int i; > + > + if (!dev_priv->vbt.child_dev_num) > + return false; > + > + for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > + p_child = dev_priv->vbt.child_dev + i; > + > + if (p_child->common.dvo_port == port_mapping[port] && > + (p_child->common.device_type & DEVICE_TYPE_eDP_BITS) == > + (DEVICE_TYPE_eDP & DEVICE_TYPE_eDP_BITS)) > + return true; > + } > + > + return false; > +} > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 796e3d313cb9..02cb4e9bf5ea 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -5068,14 +5068,6 @@ put_power: > bool intel_dp_is_edp(struct drm_device *dev, enum port port) > { > struct drm_i915_private *dev_priv = dev->dev_private; > - union child_device_config *p_child; > - int i; > - static const short port_mapping[] = { > - [PORT_B] = DVO_PORT_DPB, > - [PORT_C] = DVO_PORT_DPC, > - [PORT_D] = DVO_PORT_DPD, > - [PORT_E] = DVO_PORT_DPE, > - }; > > /* > * eDP not supported on g4x. so bail out early just > @@ -5087,18 +5079,7 @@ bool intel_dp_is_edp(struct drm_device *dev, enum port port) > if (port == PORT_A) > return true; > > - if (!dev_priv->vbt.child_dev_num) > - return false; > - > - for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > - p_child = dev_priv->vbt.child_dev + i; > - > - if (p_child->common.dvo_port == port_mapping[port] && > - (p_child->common.device_type & DEVICE_TYPE_eDP_BITS) == > - (DEVICE_TYPE_eDP & DEVICE_TYPE_eDP_BITS)) > - return true; > - } > - return false; > + return intel_bios_is_port_edp(dev_priv, port); > } > > void
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5f0d44b380aa..6ae828f984de 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3349,6 +3349,7 @@ 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); bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin); +bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port); /* intel_opregion.c */ #ifdef CONFIG_ACPI diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 099f3f0002a2..a7491a450cc8 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1503,3 +1503,36 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin) return false; } + +/** + * intel_bios_is_port_edp - is the device in given port eDP + * @dev_priv: i915 device instance + * @port: port to check + * + * Return true if the device in %port is eDP. + */ +bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port) +{ + union child_device_config *p_child; + static const short port_mapping[] = { + [PORT_B] = DVO_PORT_DPB, + [PORT_C] = DVO_PORT_DPC, + [PORT_D] = DVO_PORT_DPD, + [PORT_E] = DVO_PORT_DPE, + }; + int i; + + if (!dev_priv->vbt.child_dev_num) + return false; + + for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { + p_child = dev_priv->vbt.child_dev + i; + + if (p_child->common.dvo_port == port_mapping[port] && + (p_child->common.device_type & DEVICE_TYPE_eDP_BITS) == + (DEVICE_TYPE_eDP & DEVICE_TYPE_eDP_BITS)) + return true; + } + + return false; +} diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 796e3d313cb9..02cb4e9bf5ea 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -5068,14 +5068,6 @@ put_power: bool intel_dp_is_edp(struct drm_device *dev, enum port port) { struct drm_i915_private *dev_priv = dev->dev_private; - union child_device_config *p_child; - int i; - static const short port_mapping[] = { - [PORT_B] = DVO_PORT_DPB, - [PORT_C] = DVO_PORT_DPC, - [PORT_D] = DVO_PORT_DPD, - [PORT_E] = DVO_PORT_DPE, - }; /* * eDP not supported on g4x. so bail out early just @@ -5087,18 +5079,7 @@ bool intel_dp_is_edp(struct drm_device *dev, enum port port) if (port == PORT_A) return true; - if (!dev_priv->vbt.child_dev_num) - return false; - - for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { - p_child = dev_priv->vbt.child_dev + i; - - if (p_child->common.dvo_port == port_mapping[port] && - (p_child->common.device_type & DEVICE_TYPE_eDP_BITS) == - (DEVICE_TYPE_eDP & DEVICE_TYPE_eDP_BITS)) - return true; - } - return false; + return intel_bios_is_port_edp(dev_priv, port); } void
Hide knowledge about VBT child devices in intel_bios.c. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_bios.c | 33 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 21 +-------------------- 3 files changed, 35 insertions(+), 20 deletions(-)