drm/i915/icl: Drop redundant gamma mode mask
Subsystems (2)
PATCH 1/1 drm/i915/icl: Drop redundant gamma mode mask
gamma mode mask was not considering the 30th and 31st bits. Due to this state readout was masking these bits, causing a mismatch and false warning, even though the registers were updated correctly. Dropped the gamma mode mask as it is redundant and ideally entire register content should be matching. This resolves the state mismatch warnings.
--- drivers/gpu/drm/i915/i915_reg.h | 1 - drivers/gpu/drm/i915/intel_display.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -1
@@ -7142,7 +7142,6 @@ enum {#define GAMMA_MODE (pipe) _MMIO_PIPE(pipe, _GAMMA_MODE_A, _GAMMA_MODE_B)#define PRE_CSC_GAMMA_ENABLE (1 << 31)#define POST_CSC_GAMMA_ENABLE (1 << 30) -#define GAMMA_MODE_MODE_MASK (3 << 0)#define GAMMA_MODE_MODE_8BIT (0 << 0)#define GAMMA_MODE_MODE_10BIT (1 << 0)#define GAMMA_MODE_MODE_12BIT (2 << 0)
drivers/gpu/drm/i915/intel_display.c +1 -2
@@ -9897,8 +9897,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,intel_get_pipe_src_size (crtc, pipe_config);intel_get_crtc_ycbcr_config (crtc, pipe_config); - pipe_config->gamma_mode = -I915_READ (GAMMA_MODE (crtc->pipe)) &GAMMA_MODE_MODE_MASK ; + pipe_config->gamma_mode =I915_READ (GAMMA_MODE (crtc->pipe));if (INTEL_GEN (dev_priv) >=9 ) {u32 tmp =I915_READ (SKL_BOTTOM_COLOR (crtc->pipe));
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: Drop redundant gamma mode mask
== Series Details ==
== Series Details ==
Series: drm/i915/icl: Drop redundant gamma mode mask
URL : https://patchwork.freedesktop.org/series/56975/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5641 -> Patchwork_12266
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56975/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12266 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927]
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@runner@aborted:
- fi-apl-guc: NOTRUN -> FAIL [fdo#108622]
#### Possible fixes ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: SKIP [fdo#109271] / [fdo#109278] -> PASS +2
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-7500u: WARN [fdo#109483] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- fi-ivb-3770: SKIP [fdo#109271] -> PASS
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
Participating hosts (46 -> 40)
------------------------------
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5641 -> Patchwork_12266
CI_DRM_5641: de62285db12b508c9d8670a95f4ef28f2105d406 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4844: ee6e006202a50c5aef373c0b075027ed7177935a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12266: 4c73f7c2fcbf03357e05450ffee9b9e6e3aa3a7d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4c73f7c2fcbf drm/i915/icl: Drop redundant gamma mode mask
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12266/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/icl: Drop redundant gamma mode mask
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: drm/i915/icl: Drop redundant gamma mode mask
URL : https://patchwork.freedesktop.org/series/56975/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5641_full -> Patchwork_12266_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12266_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@extended-semaphore-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109275]
* igt@gem_busy@extended-semaphore-bsd2:
- shard-iclb: NOTRUN -> SKIP [fdo#109275] / [fdo#109276]
* igt@gem_ctx_isolation@rcs0-dirty-create:
- shard-iclb: NOTRUN -> SKIP [fdo#109281] +9
* igt@gem_ctx_isolation@vcs1-reset:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] / [fdo#109281] +2
* igt@gem_ctx_param@invalid-param-set:
- shard-iclb: NOTRUN -> FAIL [fdo#109674]
* igt@gem_exec_big:
- shard-hsw: PASS -> TIMEOUT [fdo#107937]
* igt@gem_exec_flush@basic-batch-kernel-default-cmd:
- shard-iclb: NOTRUN -> SKIP [fdo#109313]
* igt@gem_exec_parse@basic-rejected:
- shard-iclb: NOTRUN -> SKIP [fdo#109289] +5
* igt@gem_exec_schedule@preempt-other-bsd1:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] +43
* igt@gem_mocs_settings@mocs-reset-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109287] +6
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] / [fdo#109287]
* igt@gem_pwrite@huge-gtt-backwards:
- shard-iclb: NOTRUN -> SKIP [fdo#109290] +4
* igt@gem_stolen@stolen-no-mmap:
- shard-iclb: NOTRUN -> SKIP [fdo#109277] +4
* igt@i915_missed_irq:
- shard-iclb: NOTRUN -> SKIP [fdo#109503]
* igt@i915_pm_rpm@modeset-lpsp-stress:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] +3
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +46
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
- shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956] +2
* igt@kms_busy@extended-pageflip-hang-oldfb-render-d:
- shard-iclb: NOTRUN -> SKIP [fdo#109278] +17
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-iclb: NOTRUN -> FAIL [fdo#107725] +2
* igt@kms_chamelium@dp-frame-dump:
- shard-iclb: NOTRUN -> SKIP [fdo#109284] +12
* igt@kms_color@pipe-a-ctm-max:
- shard-iclb: NOTRUN -> FAIL [fdo#108147]
* igt@kms_color@pipe-a-degamma:
- shard-iclb: NOTRUN -> FAIL [fdo#104782] +2
* igt@kms_content_protection@legacy:
- shard-iclb: NOTRUN -> SKIP [fdo#109300] / [fdo#109527]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-iclb: NOTRUN -> FAIL [fdo#103232] +7
* igt@kms_cursor_crc@cursor-256x85-random:
- shard-apl: PASS -> FAIL [fdo#103232] +2
* igt@kms_cursor_crc@cursor-512x512-rapid-movement:
- shard-iclb: NOTRUN -> SKIP [fdo#109279] +5
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +22
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: NOTRUN -> SKIP [fdo#109349] +1
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-apl: PASS -> FAIL [fdo#103167] / [fdo#105682]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +65
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> FAIL [fdo#103167] +1
* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-iclb: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3
* igt@kms_plane_scaling@pipe-b-scaler-with-pixel-format:
- shard-iclb: NOTRUN -> DMESG-WARN [fdo#107724] +3
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: NOTRUN -> SKIP [fdo#109441] +6
* igt@kms_vrr@flip-dpms:
- shard-iclb: NOTRUN -> SKIP [fdo#109502]
* igt@prime_nv_api@i915_self_import:
- shard-iclb: NOTRUN -> SKIP [fdo#109291] +9
* igt@v3d_get_param@get-bad-flags:
- shard-iclb: NOTRUN -> SKIP [fdo#109315] +1
#### Possible fixes ####
* igt@i915_pm_rpm@cursor-dpms:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS +1
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-apl: FAIL [fdo#106510] / [fdo#108145] -> PASS
* igt@kms_color@pipe-b-ctm-green-to-red:
- shard-iclb: DMESG-WARN [fdo#109624] -> PASS +10
* igt@kms_cursor_crc@cursor-256x256-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff:
- shard-iclb: FAIL [fdo#103167] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_properties@plane-properties-legacy:
- shard-snb: INCOMPLETE [fdo#105411] -> PASS
* igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: DMESG-FAIL [fdo#105763] -> PASS
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
#### Warnings ####
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-iclb: SKIP [fdo#109308] -> INCOMPLETE [fdo#108840]
* igt@kms_color@pipe-b-gamma:
- shard-iclb: DMESG-FAIL [fdo#109624] -> FAIL [fdo#104782] +3
* igt@kms_color@pipe-c-ctm-max:
- shard-iclb: DMESG-FAIL [fdo#109624] -> FAIL [fdo#108147]
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107725]: https://bugs.freedesktop.org/show_bug.cgi?id=107725
[fdo#107937]: https://bugs.freedesktop.org/show_bug.cgi?id=107937
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109275]: https://bugs.freedesktop.org/show_bug.cgi?id=109275
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109277]: https://bugs.freedesktop.org/show_bug.cgi?id=109277
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109281]: https://bugs.freedesktop.org/show_bug.cgi?id=109281
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109287]: https://bugs.freedesktop.org/show_bug.cgi?id=109287
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109290]: https://bugs.freedesktop.org/show_bug.cgi?id=109290
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109502]: https://bugs.freedesktop.org/show_bug.cgi?id=109502
[fdo#109503]: https://bugs.freedesktop.org/show_bug.cgi?id=109503
[fdo#109527]: https://bugs.freedesktop.org/show_bug.cgi?id=109527
[fdo#109624]: https://bugs.freedesktop.org/show_bug.cgi?id=109624
[fdo#109674]: https://bugs.freedesktop.org/show_bug.cgi?id=109674
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 6)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* Linux: CI_DRM_5641 -> Patchwork_12266
CI_DRM_5641: de62285db12b508c9d8670a95f4ef28f2105d406 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4844: ee6e006202a50c5aef373c0b075027ed7177935a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12266: 4c73f7c2fcbf03357e05450ffee9b9e6e3aa3a7d @ 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_12266/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Uma Shankar
gamma mode mask was not considering the 30th and 31st bits. Due to this state readout was masking these bits, causing a mismatch and false warning, even though the registers were updated correctly. Dropped the gamma mode mask as it is redundant and ideally entire register content should be matching. This resolves the state mismatch warnings.
Signed-off-by Uma Shankar <[email protected]>
Thanks. Pushed with
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109624
Quoted 38 lines
--- drivers/gpu/drm/i915/i915_reg.h | 1 - drivers/gpu/drm/i915/intel_display.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-1@@ -7142,7 +7142,6 @@ enum {#define GAMMA_MODE (pipe) _MMIO_PIPE(pipe, _GAMMA_MODE_A, _GAMMA_MODE_B)#define PRE_CSC_GAMMA_ENABLE (1 << 31)#define POST_CSC_GAMMA_ENABLE (1 << 30) -#define GAMMA_MODE_MODE_MASK (3 << 0)#define GAMMA_MODE_MODE_8BIT (0 << 0)#define GAMMA_MODE_MODE_10BIT (1 << 0)#define GAMMA_MODE_MODE_12BIT (2 << 0)drivers/gpu/drm/i915/intel_display.c +1
-2@@ -9897,8 +9897,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,intel_get_pipe_src_size (crtc, pipe_config);intel_get_crtc_ycbcr_config (crtc, pipe_config); - pipe_config->gamma_mode = -I915_READ (GAMMA_MODE (crtc->pipe)) &GAMMA_MODE_MODE_MASK ; + pipe_config->gamma_mode =I915_READ (GAMMA_MODE (crtc->pipe));if (INTEL_GEN (dev_priv) >=9 ) {u32 tmp =I915_READ (SKL_BOTTOM_COLOR (crtc->pipe));Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx