Skip to content

Commit c358514

Browse files
committed
Revert "drm/i915/icl: WaEnableFloatBlendOptimization"
The register for 0xe420 is unable to hold any value, including this bit. The documentation is also mixed between having a register bit for toggle and having a state command setup for it. Apparently the register toggle is deprecated. Remove the register toggle as evidence shows it's futile. The thing remaining is an apology and humble request for Mesa folks to resurrect their state setup for this as they were on right track from start. This reverts commit 0bf059f. Fixes: 0bf059f ("drm/i915/icl: WaEnableFloatBlendOptimization") References: HSDES#1406393558 Cc: Oscar Mateo <[email protected]> Cc: Anuj Phogat <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Lionel Landwerlin <[email protected]> Signed-off-by: Mika Kuoppala <[email protected]> Acked-by: Chris Wilson <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 21eb185 commit c358514

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2859,9 +2859,6 @@ enum i915_power_well_id {
28592859
#define GEN8_4x4_STC_OPTIMIZATION_DISABLE (1 << 6)
28602860
#define GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE (1 << 1)
28612861

2862-
#define GEN10_CACHE_MODE_SS _MMIO(0xe420)
2863-
#define FLOAT_BLEND_OPTIMIZATION_ENABLE (1 << 4)
2864-
28652862
#define GEN6_BLITTER_ECOSKPD _MMIO(0x221d0)
28662863
#define GEN6_BLITTER_LOCK_SHIFT 16
28672864
#define GEN6_BLITTER_FBC_NOTIFY (1 << 3)

drivers/gpu/drm/i915/intel_workarounds.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,6 @@ static int icl_ctx_workarounds_init(struct drm_i915_private *dev_priv)
508508
WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
509509
GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC);
510510

511-
/* WaEnableFloatBlendOptimization:icl */
512-
WA_SET_BIT_MASKED(GEN10_CACHE_MODE_SS, FLOAT_BLEND_OPTIMIZATION_ENABLE);
513-
514511
return 0;
515512
}
516513

0 commit comments

Comments
 (0)