drm/i915: Don't pass plane to .check_plane()
Subsystems (2)
PATCH 1/2 drm/i915: Don't pass plane to .check_plane()
From: Ville Syrjälä <[email protected]>
.check_plane() already gets the plane state, so we can dig out the plane from there if needed. No need in passing it separately.
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 11 +++++------ drivers/gpu/drm/i915/intel_drv.h | 5 ++--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +1 -1
@@ -159,7 +159,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ } intel_state->base.visible = false; - ret = intel_plane->check_plane (intel_plane, crtc_state, intel_state); + ret = intel_plane->check_plane (crtc_state, intel_state);if (ret)return ret;
drivers/gpu/drm/i915/intel_display.c +5 -6
@@ -9694,8 +9694,7 @@ static bool i845_cursor_size_ok(const struct intel_plane_state *plane_state)return intel_cursor_size_ok (plane_state) &&IS_ALIGNED (width,64 ); } -static int i845_check_cursor (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +static int i845_check_cursor (struct intel_crtc_state *crtc_state,struct intel_plane_state *plane_state) {const struct drm_framebuffer *fb = plane_state->base.fb;
@@ -9885,10 +9884,10 @@ static bool i9xx_cursor_size_ok(const struct intel_plane_state *plane_state)return true; } -static int i9xx_check_cursor (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +static int i9xx_check_cursor (struct intel_crtc_state *crtc_state,struct intel_plane_state *plane_state) { +struct intel_plane *plane =to_intel_plane (plane_state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);const struct drm_framebuffer *fb = plane_state->base.fb;enum pipe pipe = plane->pipe;
@@ -13192,10 +13191,10 @@ skl_max_scale(struct intel_crtc *intel_crtc, }static int -intel_check_primary_plane (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +intel_check_primary_plane (struct intel_crtc_state *crtc_state,struct intel_plane_state *state) { +struct intel_plane *plane =to_intel_plane (state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);struct drm_crtc *crtc = state->base.crtc;int min_scale =DRM_PLANE_HELPER_NO_SCALING ;
drivers/gpu/drm/i915/intel_drv.h +2 -3
@@ -972,9 +972,8 @@ struct intel_plane {void (*disable_plane)(struct intel_plane *plane,struct intel_crtc *crtc);bool (*get_hw_state)(struct intel_plane *plane,enum pipe *pipe); -int (*check_plane)(struct intel_plane *plane, -struct intel_crtc_state *crtc_state, -struct intel_plane_state *state); +int (*check_plane)(struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state); };struct intel_watermark_params {
drivers/gpu/drm/i915/intel_sprite.c +2 -2
@@ -959,10 +959,10 @@ g4x_plane_get_hw_state(struct intel_plane *plane, }static int -intel_check_sprite_plane (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +intel_check_sprite_plane (struct intel_crtc_state *crtc_state,struct intel_plane_state *state) { +struct intel_plane *plane =to_intel_plane (state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_framebuffer *fb = state->base.fb;
Signature · 6 lines
2.16.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Reject compressed Y/Yf with interlaced modes
From: Ville Syrjälä <[email protected]>
Y/Yf tiling can't be used with IF-ID. We already reject uncompressed Y/Yf but we should also reject them when compressed.
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +3 -1
@@ -170,7 +170,9 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_if (state->fb &&INTEL_GEN (dev_priv) >=9 && crtc_state->base.enable && adjusted_mode->flags &DRM_MODE_FLAG_INTERLACE ) {if (state->fb->modifier ==I915_FORMAT_MOD_Y_TILED || - state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) { + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED || + state->fb->modifier ==I915_FORMAT_MOD_Y_TILED_CCS || + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS) {DRM_DEBUG_KMS ("Y/Yf tiling not supported in IF-ID mode\n" );return -EINVAL ; }
Signature · 6 lines
2.16.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Reject compressed Y/Yf with interlaced modes
Hi,
Quoted 17 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Y/Yf tiling can't be used with IF-ID. We already reject uncompressed Y/Yf but we should also reject them when compressed.
Cc José Roberto de Souza <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0
drivers/gpu/drm/i915/intel_atomic_plane.c int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ · line 175
Quoted 7 lines
drivers/gpu/drm/i915/intel_atomic_plane.c +3
-1@@ -170,7 +170,9 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_if (state->fb &&INTEL_GEN (dev_priv) >=9 && crtc_state->base.enable && adjusted_mode->flags &DRM_MODE_FLAG_INTERLACE ) {if (state->fb->modifier ==I915_FORMAT_MOD_Y_TILED || - state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) { + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED || + state->fb->modifier ==I915_FORMAT_MOD_Y_TILED_CCS || + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS) {
LGTM...
-Mahesh
Quoted 10 lines
drivers/gpu/drm/i915/intel_atomic_plane.c +0
-1DRM_DEBUG_KMS ("Y/Yf tiling not supported in IF-ID mode\n" );return -EINVAL ; } --2.16.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Reject compressed Y/Yf with interlaced modes
In reply to Ville SyrjalaQuoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Y/Yf tiling can't be used with IF-ID. We already reject uncompressed Y/Yf but we should also reject them when compressed.
Quoted 25 lines
Cc José Roberto de Souza <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0@@ -170,7 +170,9 @@ int intel_plane_atomic_check_with_state(conststruct
intel_crtc_state*old_crtc_
if (state->fb&&INTEL_GEN(dev_priv)>= 9 && crtc_state-Quoted 1 line
base.enable &&
drivers/gpu/drm/i915/intel_atomic_plane.c +2
-1adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {if (state->fb->modifier ==I915_FORMAT_MOD_Y_TILED || - state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) { + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED || + state->fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS||
drivers/gpu/drm/i915/intel_atomic_plane.c +1
-0+ state->fb->modifier ==
I915_FORMAT_MOD_Yf_TILED_CCS) {
DRM_DEBUG_KMS("Y/Yf tiling not supported in IF-
ID mode\n");
drivers/gpu/drm/i915/intel_atomic_plane.c int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ · line 178
Quoted 2 lines
drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0return -EINVAL ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Reject compressed Y/Yf with interlaced modes
Quoted 8 lines · Jose
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Y/Yf tiling can't be used with IF-ID. We already reject uncompressed Y/Yf but we should also reject them when compressed.
Reviewed-by José Roberto de Souza <[email protected]>
Thanks for the reviews. Series pushed to dinq.
Quoted 28 lines
Quoted 28 lines
Cc José Roberto de Souza <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0@@ -170,7 +170,9 @@ int intel_plane_atomic_check_with_state(conststruct
intel_crtc_state*old_crtc_
if (state->fb&&INTEL_GEN(dev_priv)>= 9 && crtc_state-Quoted 1 line
base.enable &&
drivers/gpu/drm/i915/intel_atomic_plane.c +2
-1adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {if (state->fb->modifier ==I915_FORMAT_MOD_Y_TILED || - state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) { + state->fb->modifier == I915_FORMAT_MOD_Yf_TILED || + state->fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS||
drivers/gpu/drm/i915/intel_atomic_plane.c +1
-0+ state->fb->modifier ==
I915_FORMAT_MOD_Yf_TILED_CCS) {
DRM_DEBUG_KMS("Y/Yf tiling not supported in IF-
ID mode\n");drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0return -EINVAL ; }
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Don't pass plane to .check_plane()
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Don't pass plane to .check_plane()
URL : https://patchwork.freedesktop.org/series/48802/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4717 -> Patchwork_10030 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/48802/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10030 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: NOTRUN -> INCOMPLETE (fdo#107718)
igt@drv_selftest@live_sanitycheck:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#107726)
igt@gem_mmap_gtt@basic:
fi-glk-dsi: PASS -> INCOMPLETE (fdo#103359, k.org#198133)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
{fi-byt-clapper}: PASS -> FAIL (fdo#107362)
==== Possible fixes ====
igt@drv_module_reload@basic-reload:
fi-glk-j4005: DMESG-WARN (fdo#106725, fdo#106248) -> PASS
igt@gem_exec_suspend@basic-s4-devices:
fi-blb-e6850: INCOMPLETE (fdo#107718) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b:
{fi-byt-clapper}: FAIL (fdo#107362) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#106248 https://bugs.freedesktop.org/show_bug.cgi?id=106248
fdo#106725 https://bugs.freedesktop.org/show_bug.cgi?id=106725
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107726 https://bugs.freedesktop.org/show_bug.cgi?id=107726
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== 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_4717 -> Patchwork_10030
CI_DRM_4717: da6b28b4006e809b28f28dc3b94d9138118a5824 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4611: b966dd93a30f41581fe1dbf9bc1c4a29b552ca05 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10030: 7bd054cf898baf5ad96b557beca109fa0c6700c0 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7bd054cf898b drm/i915: Reject compressed Y/Yf with interlaced modes ef08ebc92fd6 drm/i915: Don't pass plane to .check_plane()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10030/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
.check_plane() already gets the plane state, so we can dig out the plane
from there if needed. No need in passing it separately.
Quoted 107 lines
Cc José Roberto de Souza <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 11 +++++------ drivers/gpu/drm/i915/intel_drv.h | 5 ++--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_atomic_plane.c +0
-0@@ -159,7 +159,7 @@ int intel_plane_atomic_check_with_state(conststruct
intel_crtc_state*old_crtc_drivers/gpu/drm/i915/intel_atomic_plane.c +0
-1} intel_state->base.visible = false; - ret = intel_plane->check_plane(intel_plane, crtc_state,
intel_state);drivers/gpu/drm/i915/intel_atomic_plane.c +1
-0+ ret = intel_plane->check_plane (crtc_state, intel_state);if (ret)return ret;drivers/gpu/drm/i915/intel_display.c +1
-2@@ -9694,8 +9694,7 @@ static bool i845_cursor_size_ok(const struct intel_plane_state *plane_state)return intel_cursor_size_ok (plane_state) &&IS_ALIGNED (width,64 ); } -static int i845_check_cursor (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +static int i845_check_cursor (struct intel_crtc_state *crtc_state,struct intel_plane_state *plane_state){
drivers/gpu/drm/i915/intel_display.c +2
-2const struct drm_framebuffer *fb = plane_state->base.fb;@@ -9885,10 +9884,10 @@ static bool i9xx_cursor_size_ok(const struct intel_plane_state *plane_state)return true; } -static int i9xx_check_cursor (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +static int i9xx_check_cursor (struct intel_crtc_state *crtc_state,struct intel_plane_state *plane_state) { +struct intel_plane *plane =to_intel_plane (plane_state- >base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);drivers/gpu/drm/i915/intel_display.c +2
-2const struct drm_framebuffer *fb = plane_state->base.fb;enum pipe pipe = plane->pipe;@@ -13192,10 +13191,10 @@ skl_max_scale(struct intel_crtc *intel_crtc, }static int -intel_check_primary_plane (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +intel_check_primary_plane (struct intel_crtc_state *crtc_state,struct intel_plane_state *state) { +struct intel_plane *plane =to_intel_plane (state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);struct drm_crtc *crtc = state->base.crtc;drivers/gpu/drm/i915/intel_display.c +0
-0int min_scale =DRM_PLANE_HELPER_NO_SCALING ;drivers/gpu/drm/i915/intel_drv.h +2
-3@@ -972,9 +972,8 @@ struct intel_plane {void (*disable_plane)(struct intel_plane *plane,struct intel_crtc *crtc);bool (*get_hw_state)(struct intel_plane *plane,enum pipe *pipe); -int (*check_plane)(struct intel_plane *plane, -struct intel_crtc_state *crtc_state, -struct intel_plane_state *state); +int (*check_plane)(struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state); };struct
intel_watermark_params{drivers/gpu/drm/i915/intel_sprite.c +2
-2@@ -959,10 +959,10 @@ g4x_plane_get_hw_state(struct intel_plane *plane, }static int -intel_check_sprite_plane (struct intel_plane *plane, -struct intel_crtc_state *crtc_state, +intel_check_sprite_plane (struct intel_crtc_state *crtc_state,struct intel_plane_state *state) { +struct intel_plane *plane =to_intel_plane (state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);
Quoted 1 line
struct
drm_framebuffer*fb =state->base.fb;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Don't pass plane to .check_plane()
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Don't pass plane to .check_plane()
URL : https://patchwork.freedesktop.org/series/48802/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4717_full -> Patchwork_10030_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10030_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10030_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_10030_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_10030_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_await@wide-contexts:
shard-apl: PASS -> FAIL (fdo#106680, fdo#105900)
igt@gem_exec_big:
shard-hsw: PASS -> INCOMPLETE (fdo#103540)
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#105363)
igt@kms_plane_lowres@pipe-c-tiling-yf:
shard-kbl: PASS -> DMESG-WARN (fdo#105602, fdo#103558) +27
igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping:
shard-kbl: PASS -> DMESG-WARN (fdo#105604)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@kms_flip@modeset-vs-vblank-race:
shard-hsw: FAIL (fdo#103060) -> PASS fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105604 https://bugs.freedesktop.org/show_bug.cgi?id=105604
fdo#105900 https://bugs.freedesktop.org/show_bug.cgi?id=105900
fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4717 -> Patchwork_10030
CI_DRM_4717: da6b28b4006e809b28f28dc3b94d9138118a5824 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4611: b966dd93a30f41581fe1dbf9bc1c4a29b552ca05 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10030: 7bd054cf898baf5ad96b557beca109fa0c6700c0 @ 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_10030/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx