* Re: [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state
2015-01-30 9:50 [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state Ander Conselvan de Oliveira
@ 2015-01-30 10:15 ` Jani Nikula
2015-01-30 10:23 ` Ander Conselvan De Oliveira
2015-01-30 10:17 ` [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder " Ander Conselvan de Oliveira
2015-02-01 6:12 ` [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst " shuang.he
2 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2015-01-30 10:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira
On Fri, 30 Jan 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> On the hardware state readout path, using crtc->config happens to work
> since the proper value is written to it before encoder->get_config() is
> called. However, in the check_crtc() path, the state will be read from
> the cpu_transcoder in the software tracking, instead of the one just
> read out from hw. Using the field in the supplied intel_crtc_state
> should do the right thing in both cases.
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>
> I noticed this while reading the code. Patch is only compiled tested.
There might be a bug for this.
BR,
Jani.
>
> ---
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 2856b0b..9f67a37 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -226,7 +226,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
> + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> u32 temp, flags = 0;
>
> pipe_config->has_dp_encoder = true;
> --
> 2.1.0
>
> _______________________________________________
> 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] 7+ messages in thread
* Re: [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state
2015-01-30 10:15 ` Jani Nikula
@ 2015-01-30 10:23 ` Ander Conselvan De Oliveira
0 siblings, 0 replies; 7+ messages in thread
From: Ander Conselvan De Oliveira @ 2015-01-30 10:23 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On pe, 2015-01-30 at 12:15 +0200, Jani Nikula wrote:
> On Fri, 30 Jan 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> > On the hardware state readout path, using crtc->config happens to work
> > since the proper value is written to it before encoder->get_config() is
> > called. However, in the check_crtc() path, the state will be read from
> > the cpu_transcoder in the software tracking, instead of the one just
> > read out from hw. Using the field in the supplied intel_crtc_state
> > should do the right thing in both cases.
> >
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > ---
> >
> > I noticed this while reading the code. Patch is only compiled tested.
I did a quick search, but I didn't find anything that seems related.
This shouldn't fix anything but a hypothetical WARN() after modeset, due
to the state tracked in software being different from what is read out
off the hardware.
Ander
>
> There might be a bug for this.
>
> BR,
> Jani.
>
> >
> > ---
> > drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> > index 2856b0b..9f67a37 100644
> > --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> > @@ -226,7 +226,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
> > struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> > struct drm_device *dev = encoder->base.dev;
> > struct drm_i915_private *dev_priv = dev->dev_private;
> > - enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
> > + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> > u32 temp, flags = 0;
> >
> > pipe_config->has_dp_encoder = true;
> > --
> > 2.1.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder hw state
2015-01-30 9:50 [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state Ander Conselvan de Oliveira
2015-01-30 10:15 ` Jani Nikula
@ 2015-01-30 10:17 ` Ander Conselvan de Oliveira
2015-01-30 16:38 ` Daniel Vetter
2015-02-01 20:45 ` shuang.he
2015-02-01 6:12 ` [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst " shuang.he
2 siblings, 2 replies; 7+ messages in thread
From: Ander Conselvan de Oliveira @ 2015-01-30 10:17 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira
The get_config() functions for ddi and dp_mst, used to read the value
of cpu_transcoder from the crtc->config instead of the state passed as
an argument. On the hardware state readout path, that happens to work
since the proper value is written to it before encoder->get_config() is
called. However, in the check_crtc() path, the state will be read from
the cpu_transcoder in the software tracking, instead of the one just
read out from hw. Using the field in the supplied intel_crtc_state
should do the right thing in both cases.
v2: Fix intel_ddi_get_config() too. (Ander)
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index ff2197c..7dc930f 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2046,7 +2046,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
{
struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
- enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
+ enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
struct intel_hdmi *intel_hdmi;
u32 temp, flags = 0;
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 2856b0b..9f67a37 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -226,7 +226,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
struct drm_device *dev = encoder->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
+ enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
u32 temp, flags = 0;
pipe_config->has_dp_encoder = true;
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder hw state
2015-01-30 10:17 ` [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder " Ander Conselvan de Oliveira
@ 2015-01-30 16:38 ` Daniel Vetter
2015-02-01 20:45 ` shuang.he
1 sibling, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2015-01-30 16:38 UTC (permalink / raw)
To: Ander Conselvan de Oliveira; +Cc: intel-gfx
On Fri, Jan 30, 2015 at 12:17:23PM +0200, Ander Conselvan de Oliveira wrote:
> The get_config() functions for ddi and dp_mst, used to read the value
> of cpu_transcoder from the crtc->config instead of the state passed as
> an argument. On the hardware state readout path, that happens to work
> since the proper value is written to it before encoder->get_config() is
> called. However, in the check_crtc() path, the state will be read from
> the cpu_transcoder in the software tracking, instead of the one just
> read out from hw. Using the field in the supplied intel_crtc_state
> should do the right thing in both cases.
Presuming no bugs (big if, I know ...) the hw state and the crtc->config
state should match. So I don't think there's any impact here, just
consitency, so -next material.
> v2: Fix intel_ddi_get_config() too. (Ander)
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 2 +-
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index ff2197c..7dc930f 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2046,7 +2046,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
> {
> struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
> - enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
> + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> struct intel_hdmi *intel_hdmi;
> u32 temp, flags = 0;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 2856b0b..9f67a37 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -226,7 +226,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
> + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> u32 temp, flags = 0;
>
> pipe_config->has_dp_encoder = true;
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder hw state
2015-01-30 10:17 ` [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder " Ander Conselvan de Oliveira
2015-01-30 16:38 ` Daniel Vetter
@ 2015-02-01 20:45 ` shuang.he
1 sibling, 0 replies; 7+ messages in thread
From: shuang.he @ 2015-02-01 20:45 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, ander.conselvan.de.oliveira
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5688
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 353/353 353/353
ILK 200/200 200/200
SNB -1 400/422 399/422
IVB +2 485/487 487/487
BYT 296/296 296/296
HSW +1 507/508 508/508
BDW -2 401/402 399/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt_kms_flip_nonexisting-fb PASS(2, M35M22) NSPT(1, M22)
IVB igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance DMESG_WARN(6, M34M21)PASS(9, M4M34) PASS(1, M21)
IVB igt_gem_storedw_batches_loop_normal DMESG_WARN(6, M34M4)PASS(16, M34M4M21) PASS(1, M21)
HSW igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance DMESG_WARN(1, M40)PASS(20, M40M20) PASS(1, M20)
BDW igt_gem_pwrite_pread_display-pwrite-blt-gtt_mmap-performance DMESG_WARN(5, M28)PASS(2, M30) DMESG_WARN(1, M28)
*BDW igt_gem_pwrite_pread_uncached-pwrite-blt-gtt_mmap-performance PASS(7, M30M28) DMESG_WARN(1, M28)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state
2015-01-30 9:50 [PATCH] drm/i915: Use pipe_config's cpu_transcoder for reading dp_mst hw state Ander Conselvan de Oliveira
2015-01-30 10:15 ` Jani Nikula
2015-01-30 10:17 ` [PATCH v2] drm/i915: Use pipe_config's cpu_transcoder for reading encoder " Ander Conselvan de Oliveira
@ 2015-02-01 6:12 ` shuang.he
2 siblings, 0 replies; 7+ messages in thread
From: shuang.he @ 2015-02-01 6:12 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, ander.conselvan.de.oliveira
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5687
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 353/353 353/353
ILK -1 353/353 352/353
SNB 400/422 400/422
IVB +2-1 485/487 486/487
BYT 296/296 296/296
HSW +1-1 507/508 507/508
BDW 401/402 401/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt_gem_unfence_active_buffers PASS(2, M26) DMESG_WARN(1, M26)
IVB igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance DMESG_WARN(6, M34M21)PASS(8, M4M34) PASS(1, M34)
IVB igt_gem_storedw_batches_loop_normal DMESG_WARN(5, M34M4)PASS(15, M34M4M21) PASS(1, M34)
IVB igt_gem_storedw_batches_loop_secure-dispatch DMESG_WARN(1, M34)PASS(6, M34M4) DMESG_WARN(1, M34)
*HSW igt_gem_pwrite_pread_display-copy-performance PASS(5, M40M20) DMESG_WARN(1, M40)
HSW igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance DMESG_WARN(1, M40)PASS(19, M40M20) PASS(1, M40)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread