drm/i915/dp: Introduce is_cpu_edp()
The obvious counterpart to is_pch_edp(). Convert existing instances of the idiom to the new routine. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
260052100e
commit
1c95822afe
1 changed files with 13 additions and 2 deletions
|
@ -95,6 +95,17 @@ static bool is_pch_edp(struct intel_dp *intel_dp)
|
||||||
return intel_dp->is_pch_edp;
|
return intel_dp->is_pch_edp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* is_cpu_edp - is the port on the CPU and attached to an eDP panel?
|
||||||
|
* @intel_dp: DP struct
|
||||||
|
*
|
||||||
|
* Returns true if the given DP struct corresponds to a CPU eDP port.
|
||||||
|
*/
|
||||||
|
static bool is_cpu_edp(struct intel_dp *intel_dp)
|
||||||
|
{
|
||||||
|
return is_edp(intel_dp) && !is_pch_edp(intel_dp);
|
||||||
|
}
|
||||||
|
|
||||||
static struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
|
static struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
return container_of(encoder, struct intel_dp, base.base);
|
return container_of(encoder, struct intel_dp, base.base);
|
||||||
|
@ -355,7 +366,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
|
||||||
* Note that PCH attached eDP panels should use a 125MHz input
|
* Note that PCH attached eDP panels should use a 125MHz input
|
||||||
* clock divider.
|
* clock divider.
|
||||||
*/
|
*/
|
||||||
if (is_edp(intel_dp) && !is_pch_edp(intel_dp)) {
|
if (is_cpu_edp(intel_dp)) {
|
||||||
if (IS_GEN6(dev))
|
if (IS_GEN6(dev))
|
||||||
aux_clock_divider = 200; /* SNB eDP input clock at 400Mhz */
|
aux_clock_divider = 200; /* SNB eDP input clock at 400Mhz */
|
||||||
else
|
else
|
||||||
|
@ -859,7 +870,7 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
|
||||||
if (intel_crtc->pipe == 1 && !HAS_PCH_CPT(dev))
|
if (intel_crtc->pipe == 1 && !HAS_PCH_CPT(dev))
|
||||||
intel_dp->DP |= DP_PIPEB_SELECT;
|
intel_dp->DP |= DP_PIPEB_SELECT;
|
||||||
|
|
||||||
if (is_edp(intel_dp) && !is_pch_edp(intel_dp)) {
|
if (is_cpu_edp(intel_dp)) {
|
||||||
/* don't miss out required setting for eDP */
|
/* don't miss out required setting for eDP */
|
||||||
intel_dp->DP |= DP_PLL_ENABLE;
|
intel_dp->DP |= DP_PLL_ENABLE;
|
||||||
if (adjusted_mode->clock < 200000)
|
if (adjusted_mode->clock < 200000)
|
||||||
|
|
Loading…
Reference in a new issue