drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/1 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
Since GLK, some plane configuration settings have moved to the PLANE_COLOR_CTL register. Refactor handling of the register to work like PLANE_CTL. This also allows us to fix the set/read of the plane Alpha Mode for GLK+.
v2: Adjust ordering of platform checks to be newest->oldest, drop redundant comment about alpha blending. (Ville)
v3: Move Alpha Mode bits out of skl_plane_ctl_format into skl_plane_ctl_alpha, and drop glk_plane_ctl_format, drop initialization of state->color_ctl on platforms that don't use it, and drop color_ctl local var. (Ville)
--- drivers/gpu/drm/i915/i915_reg.h | 12 ++++-- drivers/gpu/drm/i915/intel_display.c | 71 +++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 5 +++ drivers/gpu/drm/i915/intel_sprite.c | 11 +++--- 4 files changed, 76 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -4
@@ -6263,7 +6263,7 @@ enum {#define _PLANE_CTL_2_A 0x70280#define _PLANE_CTL_3_A 0x70380#define PLANE_CTL_ENABLE (1 << 31) -#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30) +#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30)/* Pre-GLK */ #define PLANE_CTL_FORMAT_MASK (0xf << 24)#define PLANE_CTL_FORMAT_YUV422 ( 0 << 24)#define PLANE_CTL_FORMAT_NV12 ( 1 << 24)
@@ -6273,7 +6273,7 @@ enum {#define PLANE_CTL_FORMAT_AYUV ( 8 << 24)#define PLANE_CTL_FORMAT_INDEXED ( 12 << 24)#define PLANE_CTL_FORMAT_RGB_565 ( 14 << 24) -#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23) +#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)/* Pre-GLK */ #define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)#define PLANE_CTL_KEY_ENABLE_SOURCE ( 1 << 21)#define PLANE_CTL_KEY_ENABLE_DESTINATION ( 2 << 21)
@@ -6286,13 +6286,13 @@ enum {#define PLANE_CTL_YUV422_VYUY ( 3 << 16)#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15)#define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14) -#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13)/* Pre-GLK */ #define PLANE_CTL_TILED_MASK (0x7 << 10)#define PLANE_CTL_TILED_LINEAR ( 0 << 10)#define PLANE_CTL_TILED_X ( 1 << 10)#define PLANE_CTL_TILED_Y ( 4 << 10)#define PLANE_CTL_TILED_YF ( 5 << 10) -#define PLANE_CTL_ALPHA_MASK (0x3 << 4) +#define PLANE_CTL_ALPHA_MASK (0x3 << 4)/* Pre-GLK */ #define PLANE_CTL_ALPHA_DISABLE ( 0 << 4)#define PLANE_CTL_ALPHA_SW_PREMULTIPLY ( 2 << 4)#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)
@@ -6332,6 +6332,10 @@ enum {#define PLANE_COLOR_PIPE_GAMMA_ENABLE (1 << 30)#define PLANE_COLOR_PIPE_CSC_ENABLE (1 << 23)#define PLANE_COLOR_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_COLOR_ALPHA_MASK (0x3 << 4) +#define PLANE_COLOR_ALPHA_DISABLE (0 << 4) +#define PLANE_COLOR_ALPHA_SW_PREMULTIPLY (2 << 4) +#define PLANE_COLOR_ALPHA_HW_PREMULTIPLY (3 << 4)#define _PLANE_BUF_CFG_1_A 0x7027c#define _PLANE_BUF_CFG_2_A 0x7037c#define _PLANE_NV12_BUF_CFG_1_A 0x70278
drivers/gpu/drm/i915/intel_display.c +58 -13
116 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -425,6 +425,9 @@ struct intel_plane_state {/* plane control register */ u32 ctl; +/* plane color control register */ +u32 color_ctl; +/* * scaler_id * = -1 : not using a scaler
@@ -1504,6 +1507,8 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state)return i915_ggtt_offset (state->vma); } +u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state);u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,
drivers/gpu/drm/i915/intel_sprite.c +5 -6
@@ -263,13 +263,9 @@ skl_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))I915_WRITE_FW (PLANE_COLOR_CTL (pipe, plane_id), -PLANE_COLOR_PIPE_GAMMA_ENABLE | -PLANE_COLOR_PIPE_CSC_ENABLE | -PLANE_COLOR_PLANE_GAMMA_DISABLE ); - } - + plane_state->color_ctl);if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value);I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value);
@@ -978,6 +974,9 @@ intel_check_sprite_plane(struct intel_plane *plane, state->ctl =g4x_sprite_ctl (crtc_state, state); } +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) + state->color_ctl =glk_plane_color_ctl (crtc_state, state); +return 0 ; }
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
In reply to a message not in the archive== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
URL : https://patchwork.freedesktop.org/series/33087/
State : success
== Summary ==
Series 33087v4 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
https://patchwork.freedesktop.org/api/1.0/series/33087/revisions/4/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-gdg-551) fdo#102618
Test kms_frontbuffer_tracking:
Subgroup basic:
fail -> PASS (fi-glk-dsi) fdo#103167fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:452s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:532s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:278s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:502s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:505s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:507s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:491s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:559s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:635s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:581s fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:491s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:429s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:499s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:462s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:574s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:478s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:588s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:573s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:448s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:652s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:527s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:502s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:461s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:572s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:420s
4295e1469b2127d79d2d02ef34d065509bdded97 drm-tip: 2017y-11m-06d-15h-35m-57s UTC integration manifest 19abc54ba37c drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6978/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
In reply to a message not in the archive== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
URL : https://patchwork.freedesktop.org/series/33087/
State : failure
== Summary ==
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
skip -> PASS (shard-hsw)
Test kms_cursor_legacy:
Subgroup all-pipes-torture-bo:
pass -> INCOMPLETE (shard-hsw)
Test kms_flip:
Subgroup plain-flip-ts-check:
fail -> PASS (shard-hsw) fdo#100368fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
shard-hsw total:2500 pass:1406 dwarn:1 dfail:0 fail:10 skip:1082 time:8962s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6978/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
In reply to a message not in the archive== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev4)
URL : https://patchwork.freedesktop.org/series/33087/
State : failure
== Summary ==
Series 33087v4 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
https://patchwork.freedesktop.org/api/1.0/series/33087/revisions/4/mbox/
Test chamelium:
Subgroup hdmi-hpd-fast:
skip -> FAIL (fi-kbl-7500u) fdo#102672
Test core_auth:
Subgroup basic-auth:
dmesg-warn -> PASS (fi-bsw-n3050) fdo#103479 +1
Test gem_ctx_switch:
Subgroup basic-default-heavy:
pass -> FAIL (fi-glk-dsi) fdo#103359
Test gem_mmap_gtt:
Subgroup basic-small-copy-xy:
pass -> FAIL (fi-glk-dsi)
Test gem_sync:
Subgroup basic-store-all:
fail -> PASS (fi-ivb-3520m) fdo#100007fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#103479 https://bugs.freedesktop.org/show_bug.cgi?id=103479
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:387s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:535s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:275s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:506s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:501s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:503s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:491s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:551s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:607s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:432s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:262s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:585s fi-glk-dsi total:289 pass:256 dwarn:0 dfail:0 fail:3 skip:30 time:499s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:434s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:425s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:461s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:1 skip:23 time:497s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:579s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:480s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:589s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:575s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:458s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:594s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:646s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:522s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:494s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:457s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:567s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:425s
fi-bdw-gvtdvm failed to connect after reboot
b911f67a17e5eef16d49a51b83f7da12666e3be6 drm-tip: 2017y-11m-07d-11h-11m-37s UTC integration manifest 2032b3188d59 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6992/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
In reply to a message not in the archiveSince GLK, some plane configuration settings have moved to the PLANE_COLOR_CTL register. Refactor handling of the register to work like PLANE_CTL. This also allows us to fix the set/read of the plane Alpha Mode for GLK+.
v2: Adjust ordering of platform checks to be newest->oldest, drop redundant comment about alpha blending. (Ville)
v3: Move Alpha Mode bits out of skl_plane_ctl_format into skl_plane_ctl_alpha, and drop glk_plane_ctl_format, drop initialization of state->color_ctl on platforms that don't use it, and drop color_ctl local var. (Ville)
--- drivers/gpu/drm/i915/i915_reg.h | 12 ++++-- drivers/gpu/drm/i915/intel_display.c | 71 +++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 5 +++ drivers/gpu/drm/i915/intel_sprite.c | 11 +++--- 4 files changed, 76 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -4
@@ -6263,7 +6263,7 @@ enum {#define _PLANE_CTL_2_A 0x70280#define _PLANE_CTL_3_A 0x70380#define PLANE_CTL_ENABLE (1 << 31) -#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30) +#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30)/* Pre-GLK */ #define PLANE_CTL_FORMAT_MASK (0xf << 24)#define PLANE_CTL_FORMAT_YUV422 ( 0 << 24)#define PLANE_CTL_FORMAT_NV12 ( 1 << 24)
@@ -6273,7 +6273,7 @@ enum {#define PLANE_CTL_FORMAT_AYUV ( 8 << 24)#define PLANE_CTL_FORMAT_INDEXED ( 12 << 24)#define PLANE_CTL_FORMAT_RGB_565 ( 14 << 24) -#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23) +#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)/* Pre-GLK */ #define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)#define PLANE_CTL_KEY_ENABLE_SOURCE ( 1 << 21)#define PLANE_CTL_KEY_ENABLE_DESTINATION ( 2 << 21)
@@ -6286,13 +6286,13 @@ enum {#define PLANE_CTL_YUV422_VYUY ( 3 << 16)#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15)#define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14) -#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13)/* Pre-GLK */ #define PLANE_CTL_TILED_MASK (0x7 << 10)#define PLANE_CTL_TILED_LINEAR ( 0 << 10)#define PLANE_CTL_TILED_X ( 1 << 10)#define PLANE_CTL_TILED_Y ( 4 << 10)#define PLANE_CTL_TILED_YF ( 5 << 10) -#define PLANE_CTL_ALPHA_MASK (0x3 << 4) +#define PLANE_CTL_ALPHA_MASK (0x3 << 4)/* Pre-GLK */ #define PLANE_CTL_ALPHA_DISABLE ( 0 << 4)#define PLANE_CTL_ALPHA_SW_PREMULTIPLY ( 2 << 4)#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)
@@ -6332,6 +6332,10 @@ enum {#define PLANE_COLOR_PIPE_GAMMA_ENABLE (1 << 30)#define PLANE_COLOR_PIPE_CSC_ENABLE (1 << 23)#define PLANE_COLOR_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_COLOR_ALPHA_MASK (0x3 << 4) +#define PLANE_COLOR_ALPHA_DISABLE (0 << 4) +#define PLANE_COLOR_ALPHA_SW_PREMULTIPLY (2 << 4) +#define PLANE_COLOR_ALPHA_HW_PREMULTIPLY (3 << 4)#define _PLANE_BUF_CFG_1_A 0x7027c#define _PLANE_BUF_CFG_2_A 0x7037c#define _PLANE_NV12_BUF_CFG_1_A 0x70278
drivers/gpu/drm/i915/intel_display.c +58 -13
116 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -425,6 +425,9 @@ struct intel_plane_state {/* plane control register */ u32 ctl; +/* plane color control register */ +u32 color_ctl; +/* * scaler_id * = -1 : not using a scaler
@@ -1504,6 +1507,8 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state)return i915_ggtt_offset (state->vma); } +u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state);u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,
drivers/gpu/drm/i915/intel_sprite.c +5 -6
@@ -263,13 +263,9 @@ skl_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))I915_WRITE_FW (PLANE_COLOR_CTL (pipe, plane_id), -PLANE_COLOR_PIPE_GAMMA_ENABLE | -PLANE_COLOR_PIPE_CSC_ENABLE | -PLANE_COLOR_PLANE_GAMMA_DISABLE ); - } - + plane_state->color_ctl);if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value);I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value);
@@ -978,6 +974,9 @@ intel_check_sprite_plane(struct intel_plane *plane, state->ctl =g4x_sprite_ctl (crtc_state, state); } +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) + state->color_ctl =glk_plane_color_ctl (crtc_state, state); +return 0 ; }
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/1 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
In reply to a message not in the archiveSince GLK, some plane configuration settings have moved to the PLANE_COLOR_CTL register. Refactor handling of the register to work like PLANE_CTL. This also allows us to fix the set/read of the plane Alpha Mode for GLK+.
v2: Adjust ordering of platform checks to be newest->oldest, drop redundant comment about alpha blending. (Ville)
v3: Move Alpha Mode bits out of skl_plane_ctl_format into skl_plane_ctl_alpha, and drop glk_plane_ctl_format, drop initialization of state->color_ctl on platforms that don't use it, and drop color_ctl local var. (Ville)
v4: Consolidate skl_plane_ctl_format switch statement on formats that return the same settings. (Ville)
--- drivers/gpu/drm/i915/i915_reg.h | 12 ++++-- drivers/gpu/drm/i915/intel_display.c | 73 ++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 5 +++ drivers/gpu/drm/i915/intel_sprite.c | 11 +++--- 4 files changed, 76 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -4
@@ -6264,7 +6264,7 @@ enum {#define _PLANE_CTL_2_A 0x70280#define _PLANE_CTL_3_A 0x70380#define PLANE_CTL_ENABLE (1 << 31) -#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30) +#define PLANE_CTL_PIPE_GAMMA_ENABLE (1 << 30)/* Pre-GLK */ #define PLANE_CTL_FORMAT_MASK (0xf << 24)#define PLANE_CTL_FORMAT_YUV422 ( 0 << 24)#define PLANE_CTL_FORMAT_NV12 ( 1 << 24)
@@ -6274,7 +6274,7 @@ enum {#define PLANE_CTL_FORMAT_AYUV ( 8 << 24)#define PLANE_CTL_FORMAT_INDEXED ( 12 << 24)#define PLANE_CTL_FORMAT_RGB_565 ( 14 << 24) -#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23) +#define PLANE_CTL_PIPE_CSC_ENABLE (1 << 23)/* Pre-GLK */ #define PLANE_CTL_KEY_ENABLE_MASK (0x3 << 21)#define PLANE_CTL_KEY_ENABLE_SOURCE ( 1 << 21)#define PLANE_CTL_KEY_ENABLE_DESTINATION ( 2 << 21)
@@ -6287,13 +6287,13 @@ enum {#define PLANE_CTL_YUV422_VYUY ( 3 << 16)#define PLANE_CTL_DECOMPRESSION_ENABLE (1 << 15)#define PLANE_CTL_TRICKLE_FEED_DISABLE (1 << 14) -#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_CTL_PLANE_GAMMA_DISABLE (1 << 13)/* Pre-GLK */ #define PLANE_CTL_TILED_MASK (0x7 << 10)#define PLANE_CTL_TILED_LINEAR ( 0 << 10)#define PLANE_CTL_TILED_X ( 1 << 10)#define PLANE_CTL_TILED_Y ( 4 << 10)#define PLANE_CTL_TILED_YF ( 5 << 10) -#define PLANE_CTL_ALPHA_MASK (0x3 << 4) +#define PLANE_CTL_ALPHA_MASK (0x3 << 4)/* Pre-GLK */ #define PLANE_CTL_ALPHA_DISABLE ( 0 << 4)#define PLANE_CTL_ALPHA_SW_PREMULTIPLY ( 2 << 4)#define PLANE_CTL_ALPHA_HW_PREMULTIPLY ( 3 << 4)
@@ -6333,6 +6333,10 @@ enum {#define PLANE_COLOR_PIPE_GAMMA_ENABLE (1 << 30)#define PLANE_COLOR_PIPE_CSC_ENABLE (1 << 23)#define PLANE_COLOR_PLANE_GAMMA_DISABLE (1 << 13) +#define PLANE_COLOR_ALPHA_MASK (0x3 << 4) +#define PLANE_COLOR_ALPHA_DISABLE (0 << 4) +#define PLANE_COLOR_ALPHA_SW_PREMULTIPLY (2 << 4) +#define PLANE_COLOR_ALPHA_HW_PREMULTIPLY (3 << 4)#define _PLANE_BUF_CFG_1_A 0x7027c#define _PLANE_BUF_CFG_2_A 0x7037c#define _PLANE_NV12_BUF_CFG_1_A 0x70278
drivers/gpu/drm/i915/intel_display.c +58 -15
119 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -425,6 +425,9 @@ struct intel_plane_state {/* plane control register */ u32 ctl; +/* plane color control register */ +u32 color_ctl; +/* * scaler_id * = -1 : not using a scaler
@@ -1503,6 +1506,8 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state)return i915_ggtt_offset (state->vma); } +u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state);u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,
drivers/gpu/drm/i915/intel_sprite.c +5 -6
@@ -263,13 +263,9 @@ skl_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))I915_WRITE_FW (PLANE_COLOR_CTL (pipe, plane_id), -PLANE_COLOR_PIPE_GAMMA_ENABLE | -PLANE_COLOR_PIPE_CSC_ENABLE | -PLANE_COLOR_PLANE_GAMMA_DISABLE ); - } - + plane_state->color_ctl);if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value);I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value);
@@ -978,6 +974,9 @@ intel_check_sprite_plane(struct intel_plane *plane, state->ctl =g4x_sprite_ctl (crtc_state, state); } +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) + state->color_ctl =glk_plane_color_ctl (crtc_state, state); +return 0 ; }
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx