diff mbox series

drm/i915: Do not redefine the has_csr parameter.

Message ID 1534527210-16841-1-git-send-email-anusha.srivatsa@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Do not redefine the has_csr parameter. | expand

Commit Message

Srivatsa, Anusha Aug. 17, 2018, 5:33 p.m. UTC
Let us reuse the already defined has_csr check and not
redefine it.

Suggested-by: Imre Deak <imre.deak@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Imre Deak Aug. 17, 2018, 6:04 p.m. UTC | #1
On Fri, Aug 17, 2018 at 10:33:30AM -0700, Anusha Srivatsa wrote:
> Let us reuse the already defined has_csr check and not
> redefine it.

The main difference is that in effect this will flip .has_csr to 1
(via GEN9_FEATURES which GEN11_FEATURES pulls in).

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=107382
> 
> Suggested-by: Imre Deak <imre.deak@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_pci.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index e931b48..d6f7b9f 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -600,7 +600,6 @@ static const struct intel_device_info intel_cannonlake_info = {
>  	GEN10_FEATURES, \
>  	GEN(11), \
>  	.ddb_size = 2048, \
> -	.has_csr = 0, \
>  	.has_logical_ring_elsq = 1
>  
>  static const struct intel_device_info intel_icelake_11_info = {
> -- 
> 2.7.4
>
Rodrigo Vivi Aug. 17, 2018, 6:24 p.m. UTC | #2
On Fri, Aug 17, 2018 at 05:59:59PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Do not redefine the has_csr parameter.
> URL   : https://patchwork.freedesktop.org/series/48408/
> State : success
> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_4686 -> Patchwork_9974 =
> 
> == Summary - WARNING ==
> 
>   Minor unknown changes coming with Patchwork_9974 need to be verified
>   manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_9974, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   External URL: https://patchwork.freedesktop.org/api/1.0/series/48408/revisions/1/mbox/
> 
> == Possible new issues ==
> 
>   Here are the unknown changes that may have been introduced in Patchwork_9974:
> 
>   === IGT changes ===
> 
>     ==== Possible regressions ====
> 
>     igt@pm_rpm@basic-rte:
>       {fi-icl-u}:         PASS -> FAIL

Is this related?

https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9974/fi-icl-u/igt@pm_rpm@basic-rte.html

I don't think so, but just checking before pushing...

> 
>     
>     ==== Warnings ====
> 
>     igt@drv_selftest@live_guc:
>       fi-kbl-7567u:       SKIP -> PASS +1
> 
>     igt@pm_rpm@basic-pci-d3-state:
>       {fi-icl-u}:         PASS -> SKIP
> 
>     
> == Known issues ==
> 
>   Here are the changes found in Patchwork_9974 that come from known issues:
> 
>   === IGT changes ===
> 
>     ==== Issues hit ====
> 
>     igt@drv_selftest@live_hangcheck:
>       fi-kbl-7560u:       PASS -> DMESG-FAIL (fdo#106560, fdo#106947)
> 
>     igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
>       fi-snb-2520m:       PASS -> INCOMPLETE (fdo#103713)
> 
>     igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
>       fi-bxt-dsi:         PASS -> INCOMPLETE (fdo#103927)
> 
>     
>     ==== Possible fixes ====
> 
>     igt@drv_selftest@live_hangcheck:
>       fi-kbl-7567u:       DMESG-FAIL (fdo#106560, fdo#106947) -> PASS
> 
>     igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
>       {fi-byt-clapper}:   FAIL (fdo#107362, fdo#103191) -> PASS
> 
>     {igt@kms_psr@primary_mmap_gtt}:
>       fi-cnl-psr:         DMESG-WARN (fdo#107372) -> PASS
> 
>     {igt@pm_rpm@module-reload}:
>       {fi-icl-u}:         WARN (fdo#107602) -> SKIP
> 
>     
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
>   fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
>   fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
>   fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
>   fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
>   fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
>   fdo#107602 https://bugs.freedesktop.org/show_bug.cgi?id=107602
> 
> 
> == Participating hosts (54 -> 49) ==
> 
>   Missing    (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u 
> 
> 
> == Build changes ==
> 
>     * Linux: CI_DRM_4686 -> Patchwork_9974
> 
>   CI_DRM_4686: d8f9d99f574c7d0b6918d888071bc2f3f899b18b @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4606: 38a44003774e35c587c67c8766b35e75dbb993b8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_9974: 74b11d9282c9471c3c0bf63de309b482bb89768e @ git://anongit.freedesktop.org/gfx-ci/linux
> 
> 
> == Linux commits ==
> 
> 74b11d9282c9 drm/i915: Do not redefine the has_csr parameter.
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9974/issues.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson Aug. 17, 2018, 6:40 p.m. UTC | #3
Quoting Rodrigo Vivi (2018-08-17 19:24:14)
> On Fri, Aug 17, 2018 at 05:59:59PM -0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: drm/i915: Do not redefine the has_csr parameter.
> > URL   : https://patchwork.freedesktop.org/series/48408/
> > State : success
> > 
> > == Summary ==
> > 
> > = CI Bug Log - changes from CI_DRM_4686 -> Patchwork_9974 =
> > 
> > == Summary - WARNING ==
> > 
> >   Minor unknown changes coming with Patchwork_9974 need to be verified
> >   manually.
> >   
> >   If you think the reported changes have nothing to do with the changes
> >   introduced in Patchwork_9974, please notify your bug team to allow them
> >   to document this new failure mode, which will reduce false positives in CI.
> > 
> >   External URL: https://patchwork.freedesktop.org/api/1.0/series/48408/revisions/1/mbox/
> > 
> > == Possible new issues ==
> > 
> >   Here are the unknown changes that may have been introduced in Patchwork_9974:
> > 
> >   === IGT changes ===
> > 
> >     ==== Possible regressions ====
> > 
> >     igt@pm_rpm@basic-rte:
> >       {fi-icl-u}:         PASS -> FAIL
> 
> Is this related?

Yes. The platform now HAS_CSR but no DMC firmware so runtime-pm has to
be disabled. Allowing the platform to enter runtime suspend with
programming the dmc as before the patch is an undefined hazard.
-Chris
Imre Deak Aug. 17, 2018, 7:17 p.m. UTC | #4
On Fri, Aug 17, 2018 at 07:40:11PM +0100, Chris Wilson wrote:
> Quoting Rodrigo Vivi (2018-08-17 19:24:14)
> > On Fri, Aug 17, 2018 at 05:59:59PM -0000, Patchwork wrote:
> > > == Series Details ==
> > > 
> > > Series: drm/i915: Do not redefine the has_csr parameter.
> > > URL   : https://patchwork.freedesktop.org/series/48408/
> > > State : success
> > > 
> > > == Summary ==
> > > 
> > > = CI Bug Log - changes from CI_DRM_4686 -> Patchwork_9974 =
> > > 
> > > == Summary - WARNING ==
> > > 
> > >   Minor unknown changes coming with Patchwork_9974 need to be verified
> > >   manually.
> > >   
> > >   If you think the reported changes have nothing to do with the changes
> > >   introduced in Patchwork_9974, please notify your bug team to allow them
> > >   to document this new failure mode, which will reduce false positives in CI.
> > > 
> > >   External URL: https://patchwork.freedesktop.org/api/1.0/series/48408/revisions/1/mbox/
> > > 
> > > == Possible new issues ==
> > > 
> > >   Here are the unknown changes that may have been introduced in Patchwork_9974:
> > > 
> > >   === IGT changes ===
> > > 
> > >     ==== Possible regressions ====
> > > 
> > >     igt@pm_rpm@basic-rte:
> > >       {fi-icl-u}:         PASS -> FAIL
> > 
> > Is this related?
> 
> Yes. The platform now HAS_CSR but no DMC firmware so runtime-pm has to
> be disabled. Allowing the platform to enter runtime suspend with
> programming the dmc as before the patch is an undefined hazard.

Right. We could convert the result to be skip in this case, not sure if
it's worth the effort.

In any case the patch is good to be merged.

> -Chris
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi Aug. 17, 2018, 8:56 p.m. UTC | #5
On Fri, Aug 17, 2018 at 09:04:24PM +0300, Imre Deak wrote:
> On Fri, Aug 17, 2018 at 10:33:30AM -0700, Anusha Srivatsa wrote:
> > Let us reuse the already defined has_csr check and not
> > redefine it.
> 
> The main difference is that in effect this will flip .has_csr to 1
> (via GEN9_FEATURES which GEN11_FEATURES pulls in).

amended when pushing

> 
> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=107382
> > 
> > Suggested-by: Imre Deak <imre.deak@intel.com>
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> 
> Reviewed-by: Imre Deak <imre.deak@intel.com>

pushed to dinq. thanks for patch and review

> 
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index e931b48..d6f7b9f 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -600,7 +600,6 @@ static const struct intel_device_info intel_cannonlake_info = {
> >  	GEN10_FEATURES, \
> >  	GEN(11), \
> >  	.ddb_size = 2048, \
> > -	.has_csr = 0, \
> >  	.has_logical_ring_elsq = 1
> >  
> >  static const struct intel_device_info intel_icelake_11_info = {
> > -- 
> > 2.7.4
> > 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index e931b48..d6f7b9f 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -600,7 +600,6 @@  static const struct intel_device_info intel_cannonlake_info = {
 	GEN10_FEATURES, \
 	GEN(11), \
 	.ddb_size = 2048, \
-	.has_csr = 0, \
 	.has_logical_ring_elsq = 1
 
 static const struct intel_device_info intel_icelake_11_info = {