All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs
@ 2020-10-20 19:43 Ville Syrjala
  2020-10-20 19:43 ` [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb Ville Syrjala
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Ville Syrjala @ 2020-10-20 19:43 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We don't currently handle the initial fb readout correctly
for 90/270 degree rotated scanout. Reject it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 60bacdbe7f92..fd0103f6cc95 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10696,6 +10696,10 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
 	    val & PLANE_CTL_FLIP_HORIZONTAL)
 		plane_config->rotation |= DRM_MODE_REFLECT_X;
 
+	/* 90/270 degree rotation would require extra work */
+	if (drm_rotation_90_or_270(plane_config->rotation))
+		goto error;
+
 	base = intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xfffff000;
 	plane_config->base = base;
 
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb
  2020-10-20 19:43 [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs Ville Syrjala
@ 2020-10-20 19:43 ` Ville Syrjala
  2020-10-20 21:12   ` Chris Wilson
  2020-10-20 20:18 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs Patchwork
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjala @ 2020-10-20 19:43 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Do the fb size readout correctly for the 90/270 degree rotated
cases. Not sure if we're missing something else as well.

Also no idea whether the BIOS would ever do this.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index fd0103f6cc95..183f5d3cd106 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10604,7 +10604,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
 	enum pipe pipe;
 	u32 val, base, offset, stride_mult, tiling, alpha;
 	int fourcc, pixel_format;
-	unsigned int aligned_height;
+	unsigned int aligned_height, stride;
 	struct drm_framebuffer *fb;
 	struct intel_framebuffer *intel_fb;
 
@@ -10696,10 +10696,6 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
 	    val & PLANE_CTL_FLIP_HORIZONTAL)
 		plane_config->rotation |= DRM_MODE_REFLECT_X;
 
-	/* 90/270 degree rotation would require extra work */
-	if (drm_rotation_90_or_270(plane_config->rotation))
-		goto error;
-
 	base = intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xfffff000;
 	plane_config->base = base;
 
@@ -10710,10 +10706,18 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
 	fb->width = ((val >> 0) & 0xffff) + 1;
 
 	val = intel_de_read(dev_priv, PLANE_STRIDE(pipe, plane_id));
-	stride_mult = skl_plane_stride_mult(fb, 0, DRM_MODE_ROTATE_0);
-	fb->pitches[0] = (val & 0x3ff) * stride_mult;
-
-	aligned_height = intel_fb_align_height(fb, 0, fb->height);
+	stride_mult = skl_plane_stride_mult(fb, 0, plane_config->rotation);
+	stride = (val & 0x3ff) * stride_mult;
+
+	if (drm_rotation_90_or_270(plane_config->rotation)) {
+		swap(fb->width, fb->height);
+		fb->pitches[0] = ALIGN(fb->width * fb->format->cpp[0],
+				       intel_fb_stride_alignment(fb, 0));
+		aligned_height = stride;
+	} else {
+		fb->pitches[0] = stride;
+		aligned_height = intel_fb_align_height(fb, 0, fb->height);
+	}
 
 	plane_config->size = fb->pitches[0] * aligned_height;
 
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs
  2020-10-20 19:43 [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs Ville Syrjala
  2020-10-20 19:43 ` [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb Ville Syrjala
@ 2020-10-20 20:18 ` Patchwork
  2020-10-20 21:09 ` [Intel-gfx] [PATCH 1/2] " Chris Wilson
  2020-10-20 23:17 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] " Patchwork
  3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2020-10-20 20:18 UTC (permalink / raw)
  To: Ville Syrjala; +Cc: intel-gfx


[-- Attachment #1.1: Type: text/plain, Size: 2581 bytes --]

== Series Details ==

Series: series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs
URL   : https://patchwork.freedesktop.org/series/82878/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9171 -> Patchwork_18747
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/index.html

Known issues
------------

  Here are the changes found in Patchwork_18747 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@blt:
    - fi-snb-2600:        [PASS][1] -> [DMESG-FAIL][2] ([i915#1409])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/fi-snb-2600/igt@i915_selftest@live@blt.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/fi-snb-2600/igt@i915_selftest@live@blt.html

  * igt@kms_busy@basic@flip:
    - fi-kbl-soraka:      [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/fi-kbl-soraka/igt@kms_busy@basic@flip.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/fi-kbl-soraka/igt@kms_busy@basic@flip.html

  
#### Possible fixes ####

  * igt@i915_module_load@reload:
    - fi-byt-j1900:       [DMESG-WARN][5] ([i915#1982]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/fi-byt-j1900/igt@i915_module_load@reload.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/fi-byt-j1900/igt@i915_module_load@reload.html

  
  [i915#1409]: https://gitlab.freedesktop.org/drm/intel/issues/1409
  [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982


Participating hosts (43 -> 38)
------------------------------

  Additional (1): fi-cfl-guc 
  Missing    (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_9171 -> Patchwork_18747

  CI-20190529: 20190529
  CI_DRM_9171: 1557238767eb2d87edd9ae8f888c37272ee015cd @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_18747: a49821b46b40078e6e0345a540d02d096eb43c94 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

a49821b46b40 drm/i915: Try to handle 90/270 degree rotated initial fb
77ca30d627b1 drm/i915: Reject 90/270 degree rotated initial fbs

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/index.html

[-- Attachment #1.2: Type: text/html, Size: 3317 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs
  2020-10-20 19:43 [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs Ville Syrjala
  2020-10-20 19:43 ` [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb Ville Syrjala
  2020-10-20 20:18 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs Patchwork
@ 2020-10-20 21:09 ` Chris Wilson
  2020-10-20 23:17 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] " Patchwork
  3 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2020-10-20 21:09 UTC (permalink / raw)
  To: Ville Syrjala, intel-gfx

Quoting Ville Syrjala (2020-10-20 20:43:29)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> We don't currently handle the initial fb readout correctly
> for 90/270 degree rotated scanout. Reject it.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 60bacdbe7f92..fd0103f6cc95 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10696,6 +10696,10 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>             val & PLANE_CTL_FLIP_HORIZONTAL)
>                 plane_config->rotation |= DRM_MODE_REFLECT_X;
>  
> +       /* 90/270 degree rotation would require extra work */
> +       if (drm_rotation_90_or_270(plane_config->rotation))
> +               goto error;

Only skl+ have 90/270 rotation so i9xx_get_initial_plane_config() does
not require the check.
error: seems valid

And as evidenced by the next patch, plenty needs to be done to handle
90/270.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

I expect you intend cc:stable for sanity?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb
  2020-10-20 19:43 ` [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb Ville Syrjala
@ 2020-10-20 21:12   ` Chris Wilson
  2020-10-21 13:22     ` Ville Syrjälä
  0 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2020-10-20 21:12 UTC (permalink / raw)
  To: Ville Syrjala, intel-gfx

Quoting Ville Syrjala (2020-10-20 20:43:30)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Do the fb size readout correctly for the 90/270 degree rotated
> cases. Not sure if we're missing something else as well.
> 
> Also no idea whether the BIOS would ever do this.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++++--------
>  1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index fd0103f6cc95..183f5d3cd106 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10604,7 +10604,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>         enum pipe pipe;
>         u32 val, base, offset, stride_mult, tiling, alpha;
>         int fourcc, pixel_format;
> -       unsigned int aligned_height;
> +       unsigned int aligned_height, stride;
>         struct drm_framebuffer *fb;
>         struct intel_framebuffer *intel_fb;
>  
> @@ -10696,10 +10696,6 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>             val & PLANE_CTL_FLIP_HORIZONTAL)
>                 plane_config->rotation |= DRM_MODE_REFLECT_X;
>  
> -       /* 90/270 degree rotation would require extra work */
> -       if (drm_rotation_90_or_270(plane_config->rotation))
> -               goto error;
> -
>         base = intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xfffff000;
>         plane_config->base = base;
>  
> @@ -10710,10 +10706,18 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>         fb->width = ((val >> 0) & 0xffff) + 1;
>  
>         val = intel_de_read(dev_priv, PLANE_STRIDE(pipe, plane_id));
> -       stride_mult = skl_plane_stride_mult(fb, 0, DRM_MODE_ROTATE_0);
> -       fb->pitches[0] = (val & 0x3ff) * stride_mult;
> -
> -       aligned_height = intel_fb_align_height(fb, 0, fb->height);
> +       stride_mult = skl_plane_stride_mult(fb, 0, plane_config->rotation);
> +       stride = (val & 0x3ff) * stride_mult;
> +
> +       if (drm_rotation_90_or_270(plane_config->rotation)) {
> +               swap(fb->width, fb->height);
> +               fb->pitches[0] = ALIGN(fb->width * fb->format->cpp[0],
> +                                      intel_fb_stride_alignment(fb, 0));
> +               aligned_height = stride;
> +       } else {
> +               fb->pitches[0] = stride;
> +               aligned_height = intel_fb_align_height(fb, 0, fb->height);
> +       }

Cross check with tiling-y to rule out garbage?

We could also check the stride is suitable for tiling. How much do you
trust that the registers light up a plane?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs
  2020-10-20 19:43 [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs Ville Syrjala
                   ` (2 preceding siblings ...)
  2020-10-20 21:09 ` [Intel-gfx] [PATCH 1/2] " Chris Wilson
@ 2020-10-20 23:17 ` Patchwork
  3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2020-10-20 23:17 UTC (permalink / raw)
  To: Ville Syrjala; +Cc: intel-gfx


[-- Attachment #1.1: Type: text/plain, Size: 15784 bytes --]

== Series Details ==

Series: series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs
URL   : https://patchwork.freedesktop.org/series/82878/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9171_full -> Patchwork_18747_full
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_18747_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_18747_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_18747_full:

### IGT changes ###

#### Possible regressions ####

  * igt@gem_wait@await@vcs0:
    - shard-snb:          [PASS][1] -> [FAIL][2] +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-snb2/igt@gem_wait@await@vcs0.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-snb4/igt@gem_wait@await@vcs0.html

  
Known issues
------------

  Here are the changes found in Patchwork_18747_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@feature_discovery@psr2:
    - shard-iclb:         [PASS][3] -> [SKIP][4] ([i915#658])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb2/igt@feature_discovery@psr2.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb7/igt@feature_discovery@psr2.html

  * igt@gem_exec_reloc@basic-many-active@rcs0:
    - shard-hsw:          [PASS][5] -> [FAIL][6] ([i915#2389])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-hsw8/igt@gem_exec_reloc@basic-many-active@rcs0.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-hsw8/igt@gem_exec_reloc@basic-many-active@rcs0.html

  * igt@gem_exec_reloc@basic-many-active@vecs0:
    - shard-glk:          [PASS][7] -> [FAIL][8] ([i915#2389]) +1 similar issue
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-glk6/igt@gem_exec_reloc@basic-many-active@vecs0.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-glk6/igt@gem_exec_reloc@basic-many-active@vecs0.html

  * igt@gem_exec_whisper@basic-fds-all:
    - shard-glk:          [PASS][9] -> [DMESG-WARN][10] ([i915#118] / [i915#95])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-glk9/igt@gem_exec_whisper@basic-fds-all.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-glk8/igt@gem_exec_whisper@basic-fds-all.html

  * igt@gem_wait@await@bcs0:
    - shard-snb:          [PASS][11] -> [FAIL][12] ([i915#2256])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-snb2/igt@gem_wait@await@bcs0.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-snb4/igt@gem_wait@await@bcs0.html

  * igt@kms_big_fb@y-tiled-8bpp-rotate-180:
    - shard-kbl:          [PASS][13] -> [DMESG-WARN][14] ([i915#1982])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-kbl4/igt@kms_big_fb@y-tiled-8bpp-rotate-180.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-kbl6/igt@kms_big_fb@y-tiled-8bpp-rotate-180.html

  * igt@kms_flip@flip-vs-expired-vblank@a-edp1:
    - shard-skl:          [PASS][15] -> [FAIL][16] ([i915#79]) +1 similar issue
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl2/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl3/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html

  * igt@kms_flip@flip-vs-suspend@b-edp1:
    - shard-skl:          [PASS][17] -> [INCOMPLETE][18] ([i915#198])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl9/igt@kms_flip@flip-vs-suspend@b-edp1.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl3/igt@kms_flip@flip-vs-suspend@b-edp1.html

  * igt@kms_flip@plain-flip-ts-check@a-edp1:
    - shard-skl:          [PASS][19] -> [FAIL][20] ([i915#2122])
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl10/igt@kms_flip@plain-flip-ts-check@a-edp1.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl1/igt@kms_flip@plain-flip-ts-check@a-edp1.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
    - shard-tglb:         [PASS][21] -> [DMESG-WARN][22] ([i915#1982]) +1 similar issue
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html

  * igt@kms_plane_scaling@pipe-c-plane-scaling:
    - shard-skl:          [PASS][23] -> [DMESG-WARN][24] ([i915#1982]) +7 similar issues
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl6/igt@kms_plane_scaling@pipe-c-plane-scaling.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl9/igt@kms_plane_scaling@pipe-c-plane-scaling.html

  * igt@kms_psr@psr2_cursor_render:
    - shard-iclb:         [PASS][25] -> [SKIP][26] ([fdo#109441]) +1 similar issue
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb1/igt@kms_psr@psr2_cursor_render.html

  * igt@kms_universal_plane@universal-plane-gen9-features-pipe-a:
    - shard-apl:          [PASS][27] -> [DMESG-WARN][28] ([i915#1635] / [i915#1982])
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-apl7/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-apl2/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html

  * igt@syncobj_basic@bad-flags-fd-to-handle:
    - shard-iclb:         [PASS][29] -> [DMESG-WARN][30] ([i915#1982])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb2/igt@syncobj_basic@bad-flags-fd-to-handle.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb7/igt@syncobj_basic@bad-flags-fd-to-handle.html

  
#### Possible fixes ####

  * igt@gem_exec_reloc@basic-many-active@rcs0:
    - shard-snb:          [FAIL][31] ([i915#2389]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-snb7/igt@gem_exec_reloc@basic-many-active@rcs0.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-snb7/igt@gem_exec_reloc@basic-many-active@rcs0.html

  * igt@gem_exec_whisper@basic-fds-forked:
    - shard-iclb:         [INCOMPLETE][33] -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb5/igt@gem_exec_whisper@basic-fds-forked.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb6/igt@gem_exec_whisper@basic-fds-forked.html

  * igt@i915_selftest@live@execlists:
    - shard-skl:          [INCOMPLETE][35] ([CI#80]) -> [PASS][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl6/igt@i915_selftest@live@execlists.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl9/igt@i915_selftest@live@execlists.html

  * {igt@kms_async_flips@alternate-sync-async-flip}:
    - shard-kbl:          [FAIL][37] ([i915#2521]) -> [PASS][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-kbl1/igt@kms_async_flips@alternate-sync-async-flip.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-kbl4/igt@kms_async_flips@alternate-sync-async-flip.html

  * {igt@kms_async_flips@async-flip-with-page-flip-events}:
    - shard-apl:          [FAIL][39] ([i915#1635] / [i915#2521]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-apl3/igt@kms_async_flips@async-flip-with-page-flip-events.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-apl6/igt@kms_async_flips@async-flip-with-page-flip-events.html

  * igt@kms_cursor_crc@pipe-c-cursor-128x128-onscreen:
    - shard-skl:          [FAIL][41] ([i915#54]) -> [PASS][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-128x128-onscreen.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl5/igt@kms_cursor_crc@pipe-c-cursor-128x128-onscreen.html

  * igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled:
    - shard-apl:          [DMESG-WARN][43] ([i915#1635] / [i915#1982]) -> [PASS][44] +1 similar issue
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-apl8/igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-apl3/igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled.html

  * igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled:
    - shard-snb:          [FAIL][45] ([i915#54]) -> [PASS][46] +1 similar issue
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-snb2/igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-snb4/igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled.html

  * igt@kms_flip@flip-vs-absolute-wf_vblank@a-hdmi-a1:
    - shard-hsw:          [INCOMPLETE][47] -> [PASS][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-hsw2/igt@kms_flip@flip-vs-absolute-wf_vblank@a-hdmi-a1.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-hsw8/igt@kms_flip@flip-vs-absolute-wf_vblank@a-hdmi-a1.html

  * igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
    - shard-glk:          [FAIL][49] ([i915#79]) -> [PASS][50]
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-glk8/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-glk4/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html

  * igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
    - shard-skl:          [FAIL][51] ([i915#2122]) -> [PASS][52] +2 similar issues
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl10/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl2/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html

  * igt@kms_frontbuffer_tracking@fbc-stridechange:
    - shard-glk:          [DMESG-WARN][53] ([i915#1982]) -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-glk7/igt@kms_frontbuffer_tracking@fbc-stridechange.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-glk3/igt@kms_frontbuffer_tracking@fbc-stridechange.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
    - shard-skl:          [DMESG-WARN][55] ([i915#1982]) -> [PASS][56] +2 similar issues
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html

  * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
    - shard-skl:          [FAIL][57] ([fdo#108145] / [i915#265]) -> [PASS][58]
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html

  * igt@kms_psr2_su@page_flip:
    - shard-iclb:         [SKIP][59] ([fdo#109642] / [fdo#111068]) -> [PASS][60]
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb3/igt@kms_psr2_su@page_flip.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb2/igt@kms_psr2_su@page_flip.html

  * igt@kms_psr@psr2_primary_page_flip:
    - shard-iclb:         [SKIP][61] ([fdo#109441]) -> [PASS][62] +1 similar issue
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html

  * igt@perf@polling-parameterized:
    - shard-skl:          [FAIL][63] ([i915#1542]) -> [PASS][64]
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl7/igt@perf@polling-parameterized.html
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl7/igt@perf@polling-parameterized.html

  
#### Warnings ####

  * igt@kms_cursor_legacy@flip-vs-cursor-atomic:
    - shard-skl:          [DMESG-WARN][65] ([i915#1982]) -> [DMESG-FAIL][66] ([i915#1982])
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html

  * igt@kms_setmode@basic:
    - shard-skl:          [FAIL][67] ([i915#31]) -> [DMESG-WARN][68] ([i915#1982])
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9171/shard-skl4/igt@kms_setmode@basic.html
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/shard-skl10/igt@kms_setmode@basic.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [CI#80]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/80
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
  [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
  [i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
  [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
  [i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
  [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
  [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
  [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
  [i915#2256]: https://gitlab.freedesktop.org/drm/intel/issues/2256
  [i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
  [i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
  [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
  [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
  [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
  [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
  [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
  [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95


Participating hosts (11 -> 11)
------------------------------

  No changes in participating hosts


Build changes
-------------

  * Linux: CI_DRM_9171 -> Patchwork_18747

  CI-20190529: 20190529
  CI_DRM_9171: 1557238767eb2d87edd9ae8f888c37272ee015cd @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_18747: a49821b46b40078e6e0345a540d02d096eb43c94 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18747/index.html

[-- Attachment #1.2: Type: text/html, Size: 18526 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb
  2020-10-20 21:12   ` Chris Wilson
@ 2020-10-21 13:22     ` Ville Syrjälä
  0 siblings, 0 replies; 7+ messages in thread
From: Ville Syrjälä @ 2020-10-21 13:22 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

On Tue, Oct 20, 2020 at 10:12:27PM +0100, Chris Wilson wrote:
> Quoting Ville Syrjala (2020-10-20 20:43:30)
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Do the fb size readout correctly for the 90/270 degree rotated
> > cases. Not sure if we're missing something else as well.
> > 
> > Also no idea whether the BIOS would ever do this.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++++--------
> >  1 file changed, 13 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > index fd0103f6cc95..183f5d3cd106 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -10604,7 +10604,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> >         enum pipe pipe;
> >         u32 val, base, offset, stride_mult, tiling, alpha;
> >         int fourcc, pixel_format;
> > -       unsigned int aligned_height;
> > +       unsigned int aligned_height, stride;
> >         struct drm_framebuffer *fb;
> >         struct intel_framebuffer *intel_fb;
> >  
> > @@ -10696,10 +10696,6 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> >             val & PLANE_CTL_FLIP_HORIZONTAL)
> >                 plane_config->rotation |= DRM_MODE_REFLECT_X;
> >  
> > -       /* 90/270 degree rotation would require extra work */
> > -       if (drm_rotation_90_or_270(plane_config->rotation))
> > -               goto error;
> > -
> >         base = intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xfffff000;
> >         plane_config->base = base;
> >  
> > @@ -10710,10 +10706,18 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> >         fb->width = ((val >> 0) & 0xffff) + 1;
> >  
> >         val = intel_de_read(dev_priv, PLANE_STRIDE(pipe, plane_id));
> > -       stride_mult = skl_plane_stride_mult(fb, 0, DRM_MODE_ROTATE_0);
> > -       fb->pitches[0] = (val & 0x3ff) * stride_mult;
> > -
> > -       aligned_height = intel_fb_align_height(fb, 0, fb->height);
> > +       stride_mult = skl_plane_stride_mult(fb, 0, plane_config->rotation);
> > +       stride = (val & 0x3ff) * stride_mult;
> > +
> > +       if (drm_rotation_90_or_270(plane_config->rotation)) {
> > +               swap(fb->width, fb->height);
> > +               fb->pitches[0] = ALIGN(fb->width * fb->format->cpp[0],
> > +                                      intel_fb_stride_alignment(fb, 0));
> > +               aligned_height = stride;
> > +       } else {
> > +               fb->pitches[0] = stride;
> > +               aligned_height = intel_fb_align_height(fb, 0, fb->height);
> > +       }
> 
> Cross check with tiling-y to rule out garbage?

I guess we could do that. Hmm, and we should probably reject Yf because
it has no fence and so seems like it should not even be possible.

> 
> We could also check the stride is suitable for tiling. How much do you
> trust that the registers light up a plane?

The hw stride is specified in tile units (hence the stride_mult).

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-10-21 13:22 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 19:43 [Intel-gfx] [PATCH 1/2] drm/i915: Reject 90/270 degree rotated initial fbs Ville Syrjala
2020-10-20 19:43 ` [Intel-gfx] [PATCH 2/2] drm/i915: Try to handle 90/270 degree rotated initial fb Ville Syrjala
2020-10-20 21:12   ` Chris Wilson
2020-10-21 13:22     ` Ville Syrjälä
2020-10-20 20:18 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Reject 90/270 degree rotated initial fbs Patchwork
2020-10-20 21:09 ` [Intel-gfx] [PATCH 1/2] " Chris Wilson
2020-10-20 23:17 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.