* [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack
@ 2014-11-03 13:40 Daniel Vetter
2014-11-03 13:40 ` [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types Daniel Vetter
2014-11-03 13:49 ` [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Jani Nikula
0 siblings, 2 replies; 6+ messages in thread
From: Daniel Vetter @ 2014-11-03 13:40 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
Checking for lvds/edp is wrong (since we also support dsi panels now)
and not terribly useless. If we want to be more intelligent about all
this then we need to look at the old state to figure out whether the
pfit adjustment is needed. This goes all the way back to the original
fastboot pfit patch:
commit 4d6a3e63bce0cb604864e36585ca8983160a421a
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jun 26 01:38:18 2013 +0300
drm/i915: turn off panel fitting at flip time if needed v2
Spotted while reviewing Ander's patch which changed a lot of the
pipe_has_type checks.
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 5 ++---
drivers/gpu/drm/i915/intel_display.c | 4 +---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index e620a63a1dfe..d41768846f18 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -473,9 +473,8 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc *crtc)
}
}
- if (num_encoders != 1)
- WARN(1, "%d encoders on crtc for pipe %c\n", num_encoders,
- pipe_name(crtc->pipe));
+ WARN(num_encoders != 1, "%d encoders on crtc for pipe %c\n", num_encoders,
+ pipe_name(crtc->pipe));
BUG_ON(ret == NULL);
return ret;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6bd290d902df..5eb12ed11df5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2877,9 +2877,7 @@ static void intel_update_pipe_size(struct intel_crtc *crtc)
I915_WRITE(PIPESRC(crtc->pipe),
((adjusted_mode->crtc_hdisplay - 1) << 16) |
(adjusted_mode->crtc_vdisplay - 1));
- if (!crtc->config.pch_pfit.enabled &&
- (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) ||
- intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) {
+ if (!crtc->config.pch_pfit.enabled) {
I915_WRITE(PF_CTL(crtc->pipe), 0);
I915_WRITE(PF_WIN_POS(crtc->pipe), 0);
I915_WRITE(PF_WIN_SZ(crtc->pipe), 0);
--
2.1.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types
2014-11-03 13:40 [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Daniel Vetter
@ 2014-11-03 13:40 ` Daniel Vetter
2014-11-04 9:35 ` Ander Conselvan de Oliveira
2014-11-03 13:49 ` [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Jani Nikula
1 sibling, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2014-11-03 13:40 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
More concise. Noticed while reviewing Ander's patch which touched a
lot of the pipe_has_type checks.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5eb12ed11df5..f7e751bcccb1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3784,9 +3784,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
intel_fdi_normal_train(crtc);
/* For PCH DP, enable TRANS_DP_CTL */
- if (HAS_PCH_CPT(dev) &&
- (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
- intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_EDP))) {
+ if (HAS_PCH_CPT(dev) && intel_crtc->config.has_dp_encoder) {
u32 bpc = (I915_READ(PIPECONF(pipe)) & PIPECONF_BPC_MASK) >> 5;
reg = TRANS_DP_CTL(pipe);
temp = I915_READ(reg);
@@ -5865,8 +5863,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
0x00d0000f);
- if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP) ||
- intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
+ if (crtc->config.has_dp_encoder) {
/* Use SSC source */
if (pipe == PIPE_A)
vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
@@ -6056,7 +6053,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
if (is_sdvo)
dpll |= DPLL_SDVO_HIGH_SPEED;
- if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
+ if (crtc->config.has_dp_encoder)
dpll |= DPLL_SDVO_HIGH_SPEED;
/* compute bitmask from p1 value */
--
2.1.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types
2014-11-03 13:40 ` [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types Daniel Vetter
@ 2014-11-04 9:35 ` Ander Conselvan de Oliveira
2014-11-04 10:26 ` [PATCH] " Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Ander Conselvan de Oliveira @ 2014-11-04 9:35 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development; +Cc: Daniel Vetter
On 11/03/2014 03:40 PM, Daniel Vetter wrote:
> More concise. Noticed while reviewing Ander's patch which touched a
> lot of the pipe_has_type checks.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 5eb12ed11df5..f7e751bcccb1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3784,9 +3784,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
> intel_fdi_normal_train(crtc);
>
> /* For PCH DP, enable TRANS_DP_CTL */
> - if (HAS_PCH_CPT(dev) &&
> - (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
> - intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_EDP))) {
> + if (HAS_PCH_CPT(dev) && intel_crtc->config.has_dp_encoder) {
> u32 bpc = (I915_READ(PIPECONF(pipe)) & PIPECONF_BPC_MASK) >> 5;
> reg = TRANS_DP_CTL(pipe);
> temp = I915_READ(reg);
> @@ -5865,8 +5863,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
> 0x00d0000f);
>
> - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP) ||
> - intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
> + if (crtc->config.has_dp_encoder) {
> /* Use SSC source */
> if (pipe == PIPE_A)
> vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
> @@ -6056,7 +6053,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
> if (is_sdvo)
> dpll |= DPLL_SDVO_HIGH_SPEED;
>
> - if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
> + if (crtc->config.has_dp_encoder)
crtc->new_config ?
> dpll |= DPLL_SDVO_HIGH_SPEED;
>
> /* compute bitmask from p1 value */
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types
2014-11-04 9:35 ` Ander Conselvan de Oliveira
@ 2014-11-04 10:26 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2014-11-04 10:26 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
More concise. Noticed while reviewing Ander's patch which touched a
lot of the pipe_has_type checks.
v2: Use new_config in one place Ander spotted.
Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5eb12ed11df5..d631df1f98d2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3784,9 +3784,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
intel_fdi_normal_train(crtc);
/* For PCH DP, enable TRANS_DP_CTL */
- if (HAS_PCH_CPT(dev) &&
- (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
- intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_EDP))) {
+ if (HAS_PCH_CPT(dev) && intel_crtc->config.has_dp_encoder) {
u32 bpc = (I915_READ(PIPECONF(pipe)) & PIPECONF_BPC_MASK) >> 5;
reg = TRANS_DP_CTL(pipe);
temp = I915_READ(reg);
@@ -5865,8 +5863,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
0x00d0000f);
- if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP) ||
- intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
+ if (crtc->config.has_dp_encoder) {
/* Use SSC source */
if (pipe == PIPE_A)
vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
@@ -6056,7 +6053,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
if (is_sdvo)
dpll |= DPLL_SDVO_HIGH_SPEED;
- if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
+ if (crtc->new_config.has_dp_encoder)
dpll |= DPLL_SDVO_HIGH_SPEED;
/* compute bitmask from p1 value */
--
2.1.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack
2014-11-03 13:40 [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Daniel Vetter
2014-11-03 13:40 ` [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types Daniel Vetter
@ 2014-11-03 13:49 ` Jani Nikula
2014-11-03 14:45 ` Daniel Vetter
1 sibling, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2014-11-03 13:49 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
On Mon, 03 Nov 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Checking for lvds/edp is wrong (since we also support dsi panels now)
> and not terribly useless. If we want to be more intelligent about all
"wrong ... and not terribly useless"? useful?
BR,
Jani.
> this then we need to look at the old state to figure out whether the
> pfit adjustment is needed. This goes all the way back to the original
> fastboot pfit patch:
>
> commit 4d6a3e63bce0cb604864e36585ca8983160a421a
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date: Wed Jun 26 01:38:18 2013 +0300
>
> drm/i915: turn off panel fitting at flip time if needed v2
>
> Spotted while reviewing Ander's patch which changed a lot of the
> pipe_has_type checks.
>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 5 ++---
> drivers/gpu/drm/i915/intel_display.c | 4 +---
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index e620a63a1dfe..d41768846f18 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -473,9 +473,8 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc *crtc)
> }
> }
>
> - if (num_encoders != 1)
> - WARN(1, "%d encoders on crtc for pipe %c\n", num_encoders,
> - pipe_name(crtc->pipe));
> + WARN(num_encoders != 1, "%d encoders on crtc for pipe %c\n", num_encoders,
> + pipe_name(crtc->pipe));
>
> BUG_ON(ret == NULL);
> return ret;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 6bd290d902df..5eb12ed11df5 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2877,9 +2877,7 @@ static void intel_update_pipe_size(struct intel_crtc *crtc)
> I915_WRITE(PIPESRC(crtc->pipe),
> ((adjusted_mode->crtc_hdisplay - 1) << 16) |
> (adjusted_mode->crtc_vdisplay - 1));
> - if (!crtc->config.pch_pfit.enabled &&
> - (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) ||
> - intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) {
> + if (!crtc->config.pch_pfit.enabled) {
> I915_WRITE(PF_CTL(crtc->pipe), 0);
> I915_WRITE(PF_WIN_POS(crtc->pipe), 0);
> I915_WRITE(PF_WIN_SZ(crtc->pipe), 0);
> --
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-04 10:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-03 13:40 [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Daniel Vetter
2014-11-03 13:40 ` [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types Daniel Vetter
2014-11-04 9:35 ` Ander Conselvan de Oliveira
2014-11-04 10:26 ` [PATCH] " Daniel Vetter
2014-11-03 13:49 ` [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Jani Nikula
2014-11-03 14:45 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox