drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
Subsystems (2)
PATCH v4 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)
v4: Consolidate skl_plane_ctl_format switch statement on formats that return the same settings. (Ville)
---
NOTE: Resending without the --in-reply-to, as it seems I managed to confuse the CI system, so v4 didn't get properly picked up for testing
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
@@ -6295,7 +6295,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)
@@ -6305,7 +6305,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)
@@ -6318,13 +6318,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)
@@ -6364,6 +6364,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
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev5)
== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev5)
URL : https://patchwork.freedesktop.org/series/33087/
State : warning
== Summary ==
Series 33087v5 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
https://patchwork.freedesktop.org/api/1.0/series/33087/revisions/5/mbox/
Test chamelium:
Subgroup dp-crc-fast:
dmesg-fail -> PASS (fi-kbl-7500u) fdo#102514
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (fi-snb-2600) fdo#102365
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> SKIP (fi-hsw-4770r)
Test vgem_basic:
Subgroup dmabuf-export:
pass -> INCOMPLETE (fi-bxt-j4205) fdo#103706 +1
Subgroup unload:
notrun -> INCOMPLETE (fi-glk-1) fdo#103702fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103706 https://bugs.freedesktop.org/show_bug.cgi?id=103706
fdo#103702 https://bugs.freedesktop.org/show_bug.cgi?id=103702
fi-bdw-5557u total:285 pass:263 dwarn:0 dfail:1 fail:0 skip:20 fi-bdw-gvtdvm total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-blb-e6850 total:285 pass:218 dwarn:1 dfail:1 fail:0 skip:64 fi-bsw-n3050 total:285 pass:238 dwarn:0 dfail:1 fail:0 skip:45 fi-bwr-2160 total:285 pass:178 dwarn:0 dfail:1 fail:0 skip:105 fi-bxt-dsi total:285 pass:254 dwarn:0 dfail:1 fail:0 skip:29 fi-bxt-j4205 total:278 pass:248 dwarn:0 dfail:1 fail:0 skip:28 fi-byt-j1900 total:285 pass:249 dwarn:0 dfail:1 fail:0 skip:34 fi-byt-n2820 total:278 pass:238 dwarn:0 dfail:1 fail:0 skip:38 fi-elk-e7500 total:285 pass:224 dwarn:0 dfail:1 fail:0 skip:59 fi-gdg-551 total:285 pass:174 dwarn:0 dfail:1 fail:1 skip:108 fi-glk-1 total:285 pass:256 dwarn:0 dfail:1 fail:0 skip:27 fi-hsw-4770 total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-hsw-4770r total:285 pass:256 dwarn:0 dfail:1 fail:0 skip:27 fi-ilk-650 total:285 pass:223 dwarn:0 dfail:1 fail:0 skip:60 fi-ivb-3520m total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-ivb-3770 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-kbl-7500u total:285 pass:259 dwarn:1 dfail:1 fail:0 skip:23 fi-kbl-7560u total:285 pass:265 dwarn:0 dfail:1 fail:0 skip:18 fi-kbl-7567u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-kbl-r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-pnv-d510 total:285 pass:217 dwarn:1 dfail:1 fail:0 skip:65 fi-skl-6260u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-6600u total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-skl-6700hq total:285 pass:258 dwarn:0 dfail:1 fail:0 skip:25 fi-skl-6700k total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-skl-6770hq total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-gvtdvm total:285 pass:261 dwarn:0 dfail:1 fail:0 skip:22 fi-snb-2520m total:285 pass:245 dwarn:0 dfail:1 fail:0 skip:38 fi-snb-2600 total:285 pass:243 dwarn:1 dfail:1 fail:0 skip:39
Blacklisted hosts:
fi-cfl-s total:285 pass:252 dwarn:0 dfail:1 fail:0 skip:31
fi-cnl-y failed to connect after reboot
9891b4090c6e6a5299a4134f7bd6c463fb2cd485 drm-tip: 2017y-11m-13d-16h-04m-46s UTC integration manifest 1f25ae97157a 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_7100/
_______________________________________________
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+ (rev5)
In reply to James Ausmus== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev5)
URL : https://patchwork.freedesktop.org/series/33087/
State : success
== Summary ==
Series 33087v5 drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+
https://patchwork.freedesktop.org/api/1.0/series/33087/revisions/5/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_busy:
Subgroup basic-flip-b:
pass -> FAIL (fi-gdg-551) fdo#102654
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-gdg-551) fdo#102618
Test vgem_basic:
Subgroup dmabuf-export:
incomplete -> PASS (fi-bxt-j4205) fdo#103706
Subgroup unload:
notrun -> INCOMPLETE (fi-bxt-j4205) fdo#103702fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102654 https://bugs.freedesktop.org/show_bug.cgi?id=102654
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fdo#103706 https://bugs.freedesktop.org/show_bug.cgi?id=103706
fdo#103702 https://bugs.freedesktop.org/show_bug.cgi?id=103702
fi-bdw-5557u total:285 pass:263 dwarn:0 dfail:1 fail:0 skip:20 fi-bdw-gvtdvm total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-blb-e6850 total:285 pass:218 dwarn:1 dfail:1 fail:0 skip:64 fi-bsw-n3050 total:285 pass:238 dwarn:0 dfail:1 fail:0 skip:45 fi-bwr-2160 total:285 pass:178 dwarn:0 dfail:1 fail:0 skip:105 fi-bxt-dsi total:285 pass:254 dwarn:0 dfail:1 fail:0 skip:29 fi-bxt-j4205 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-byt-j1900 total:285 pass:249 dwarn:0 dfail:1 fail:0 skip:34 fi-byt-n2820 total:285 pass:245 dwarn:0 dfail:1 fail:0 skip:38 fi-elk-e7500 total:285 pass:224 dwarn:0 dfail:1 fail:0 skip:59 fi-gdg-551 total:285 pass:172 dwarn:0 dfail:1 fail:3 skip:108 fi-glk-1 total:278 pass:249 dwarn:0 dfail:1 fail:0 skip:27 fi-hsw-4770 total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-hsw-4770r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-ilk-650 total:285 pass:223 dwarn:0 dfail:1 fail:0 skip:60 fi-ivb-3520m total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-ivb-3770 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-kbl-7500u total:285 pass:259 dwarn:1 dfail:1 fail:0 skip:23 fi-kbl-7560u total:285 pass:265 dwarn:0 dfail:1 fail:0 skip:18 fi-kbl-7567u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-kbl-r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-pnv-d510 total:285 pass:217 dwarn:1 dfail:1 fail:0 skip:65 fi-skl-6260u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-6600u total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-skl-6700hq total:285 pass:258 dwarn:0 dfail:1 fail:0 skip:25 fi-skl-6700k total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-skl-6770hq total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-gvtdvm total:285 pass:261 dwarn:0 dfail:1 fail:0 skip:22 fi-snb-2520m total:285 pass:245 dwarn:0 dfail:1 fail:0 skip:38 fi-snb-2600 total:285 pass:244 dwarn:0 dfail:1 fail:0 skip:39
Blacklisted hosts:
fi-cfl-s total:285 pass:252 dwarn:0 dfail:1 fail:0 skip:31
0ae838346d57d7767dec9e25f9d534faaa59ea7f drm-tip: 2017y-11m-13d-20h-43m-56s UTC integration manifest 4bbfc462f17b 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_7102/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev5)
In reply to James Ausmus== Series Details ==
== Series Details ==
Series: drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ (rev5)
URL : https://patchwork.freedesktop.org/series/33087/
State : success
== Summary ==
Test kms_flip:
Subgroup plain-flip-ts-check-interruptible:
fail -> PASS (shard-hsw) fdo#100368
Test kms_busy:
Subgroup extended-modeset-hang-oldfb-with-reset-render-a:
pass -> DMESG-WARN (shard-hsw) fdo#102249
Test vgem_basic:
Subgroup debugfs:
incomplete -> DMESG-FAIL (shard-hsw) fdo#103703
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#103703 https://bugs.freedesktop.org/show_bug.cgi?id=103703
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2584 pass:1471 dwarn:2 dfail:2 fail:10 skip:1099 time:9477s
Blacklisted hosts:
shard-apl total:2565 pass:1602 dwarn:1 dfail:1 fail:24 skip:936 time:12855s shard-kbl total:2544 pass:1690 dwarn:4 dfail:2 fail:22 skip:824 time:10227s shard-snb total:2584 pass:1206 dwarn:2 dfail:2 fail:12 skip:1362 time:7716s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7102/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · James Ausmus
Since GLK, some plane configuration settings have moved to the
PLANE_COLOR_CTLregister. Refactor handling of the register to work likePLANE_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_formatintoskl_plane_ctl_alpha, and dropglk_plane_ctl_format, drop initialization ofstate->color_ctlon platforms that don't use it, and dropcolor_ctllocal var. (Ville)v4: Consolidate
skl_plane_ctl_formatswitch statement on formats that return the same settings. (Ville)
Quoted 8 lines
Signed-off-by James Ausmus <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>---
NOTE: Resending without the --in-reply-to, as it seems I managed to confuse the CI system, so v4 didn't get properly picked up for testing
Passed now, so pushed to dinq. Thanks for the patch.
Quoted 241 lines
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@@ -6295,7 +6295,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)@@ -6305,7 +6305,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)@@ -6318,13 +6318,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)@@ -6364,6 +6364,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 0x70278drivers/gpu/drm/i915/intel_display.c +58
-15@@ -3432,20 +3432,11 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)case DRM_FORMAT_RGB565 :return PLANE_CTL_FORMAT_RGB_565 ;case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ABGR8888 :return PLANE_CTL_FORMAT_XRGB_8888 |PLANE_CTL_ORDER_RGBX ;case DRM_FORMAT_XRGB8888 : -return PLANE_CTL_FORMAT_XRGB_8888 ; -/* -* XXX: For ARBG/ABGR formats we default to expecting scanout buffers -* to be already pre-multiplied. We need to add a knob (or a different -* DRM_FORMAT) for user-space to configure that. -*/ -case DRM_FORMAT_ABGR8888 : -return PLANE_CTL_FORMAT_XRGB_8888 |PLANE_CTL_ORDER_RGBX | -PLANE_CTL_ALPHA_SW_PREMULTIPLY ;case DRM_FORMAT_ARGB8888 : -return PLANE_CTL_FORMAT_XRGB_8888 | -PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +return PLANE_CTL_FORMAT_XRGB_8888 ;case DRM_FORMAT_XRGB2101010 :return PLANE_CTL_FORMAT_XRGB_2101010 ;case DRM_FORMAT_XBGR2101010 :@@ -3465,6 +3456,33 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return 0 ; } +/* +* XXX: For ARBG/ABGR formats we default to expecting scanout buffers +* to be already pre-multiplied. We need to add a knob (or a different +* DRM_FORMAT) for user-space to configure that. +*/ +static u32 skl_plane_ctl_alpha (uint32_t pixel_format) +{ +switch (pixel_format) { +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +return PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +default : +return PLANE_CTL_ALPHA_DISABLE ; + } +} + +static u32 glk_plane_color_ctl_alpha (uint32_t pixel_format) +{ +switch (pixel_format) { +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +return PLANE_COLOR_ALPHA_SW_PREMULTIPLY ; +default : +return PLANE_COLOR_ALPHA_DISABLE ; + } +} +static u32 skl_plane_ctl_tiling (uint64_t fb_modifier) {switch (fb_modifier) {@@ -3521,7 +3539,8 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, plane_ctl =PLANE_CTL_ENABLE ; -if (!IS_GEMINILAKE (dev_priv) && !IS_CANNONLAKE (dev_priv)) { +if (INTEL_GEN (dev_priv) <10 && !IS_GEMINILAKE (dev_priv)) { + plane_ctl |=skl_plane_ctl_alpha (fb->format->format); plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE | PLANE_CTL_PIPE_CSC_ENABLE |@@ -3540,6 +3559,20 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,return plane_ctl; } +u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +const struct drm_framebuffer *fb = plane_state->base.fb; +u32 plane_color_ctl =0 ; + + plane_color_ctl |=PLANE_COLOR_PIPE_GAMMA_ENABLE ; + plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; + plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; + plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); + +return plane_color_ctl; +} + static int __intel_display_resume(struct drm_device *dev, struct drm_atomic_state *state,@@ -8426,7 +8459,7 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -u32 val, base, offset, stride_mult, tiling; +u32 val, base, offset, stride_mult, tiling, alpha;int pipe = crtc->pipe;int fourcc, pixel_format;unsigned int aligned_height;@@ -8448,9 +8481,16 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, goto error; pixel_format = val &PLANE_CTL_FORMAT_MASK ; + +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) { + alpha =I915_READ (PLANE_COLOR_CTL (pipe,0 )); + alpha &=PLANE_COLOR_ALPHA_MASK ; + }else { + alpha = val &PLANE_CTL_ALPHA_MASK ; + } + fourcc =skl_format_to_fourcc (pixel_format, - val &PLANE_CTL_ORDER_RGBX , - val &PLANE_CTL_ALPHA_MASK ); + val &PLANE_CTL_ORDER_RGBX , alpha); fb->format =drm_format_info (fourcc); tiling = val &PLANE_CTL_TILED_MASK ;@@ -12853,6 +12893,9 @@ intel_check_primary_plane(struct intel_plane *plane, state->ctl =i9xx_plane_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 ; }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 · 1 line
2.14.1
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx