drm/i915 fixes that failed to backport to v4.15
Subsystems (2)
All, the following fixes selected based on the Fixes: tag failed to backport to drm-next heading to v4.15.
8cf80a2e4b31 ("drm/i915/gvt: Rename reserved ring buffer")
This one I think shouldn't have included a Fixes: line in the first place. While technically a rename can be a fix, I consider Fixes: to indicate things that have a functional significance to the end user.
f2880e04f3a5 ("drm/i915/gvt: Move request alloc to dispatch_workload path only") 0cfecb7c4b9b ("Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"")
If these are needed in v4.15, please provide backports based on the drm-intel-next-fixes branch.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Jani Nikula
All, the following fixes selected based on the Fixes: tag failed to backport to drm-next heading to v4.15.
8cf80a2e4b31("drm/i915/gvt: Rename reserved ring buffer")
ignore this one, it's a fix for one refactor patch for 4.16.
Quoted 5 lines
This one I think shouldn't have included a Fixes: line in the first place. While technically a rename can be a fix, I consider Fixes: to indicate things that have a functional significance to the end user.
f2880e04f3a5("drm/i915/gvt: Move request alloc todispatch_workloadpath only")
I think this one is needed and will do backport.
Quoted 5 lines
0cfecb7c4b9b("Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"")If these are needed in v4.15, please provide backports based on the drm-intel-next-fixes branch.
thanks for notify!
Signature · 3 lines
Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
In reply to Jani NikulaFrom: Radhakrishna Sripada <[email protected]>
This reverts commit 8f067837c4b713ce2e69be95af7b2a5eb3bd7de8.
HSD says "WA withdrawn. It was causing corruption with some images. WA is not strictly necessary since this bug just causes loss of FBC compression with some sizes and images, but doesn't break anything."
--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 13 ------------- 2 files changed, 16 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -3
@@ -2951,9 +2951,6 @@ enum i915_power_well_id {#define ILK_DPFC_CHICKEN _MMIO(0x43224)#define ILK_DPFC_DISABLE_DUMMY0 (1<<8)#define ILK_DPFC_NUKE_ON_ANY_MODIFICATION (1<<23) -#define GLK_SKIP_SEG_EN (1<<12) -#define GLK_SKIP_SEG_COUNT_MASK (3<<10) -#define GLK_SKIP_SEG_COUNT (x) ((x)<<10)#define ILK_FBC_RT_BASE _MMIO(0x2128)#define ILK_FBC_RT_VALID (1<<0)#define SNB_FBC_FRONT_BUFFER (1<<1)
drivers/gpu/drm/i915/intel_pm.c +0 -13
@@ -124,7 +124,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)static void glk_init_clock_gating (struct drm_i915_private *dev_priv) { -u32 val;gen9_init_clock_gating (dev_priv);/*
@@ -144,11 +143,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_MISC_2 , val); } -/* Display WA #1133: WaFbcSkipSegments:glk */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void i915_pineview_get_mem_freq (struct drm_i915_private *dev_priv)
@@ -8517,7 +8511,6 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)static void cnl_init_clock_gating (struct drm_i915_private *dev_priv) { -u32 val;cnp_init_clock_gating (dev_priv);/* This is not an Wa. Enable for better image quality */
@@ -8537,12 +8530,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE ,I915_READ (SLICE_UNIT_LEVEL_CLKGATE ) |SARBUNIT_CLKGATE_DIS ); - -/* Display WA #1133: WaFbcSkipSegments:cnl */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); }static void cfl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2)
URL : https://patchwork.freedesktop.org/series/33969/
State : failure
== Summary ==
Applying: Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_reg.h
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c Patch failed at 0001 Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
In reply to Rodrigo ViviHi,
Thanks, this was included in the pull.
One comment below, not strictly related to this patch.
Quoted 14 lines · Rodrigo Vivi
From: Radhakrishna Sripada <[email protected]>
This reverts commit
8f067837c4b713ce2e69be95af7b2a5eb3bd7de8.HSD says "WA withdrawn. It was causing corruption with some images. WA is not strictly necessary since this bug just causes loss of FBC compression with some sizes and images, but doesn't break anything."
Fixes 8f067837c4b7 ("drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk")Cc Rodrigo Vivi <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>(cherry picked from commit 0cfecb7c4b9b45ed1776162e132b43f92564f3f4)
<SNIP>
drivers/gpu/drm/i915/intel_pm.c static void bxt_init_clock_gating(struct drm_i915_private *dev_priv) · line 127
Quoted 6 lines
+++
b/drivers/gpu/drm/i915/intel_pm.cdrivers/gpu/drm/i915/intel_pm.c +0
-1@@ -124,7 +124,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)static void glk_init_clock_gating (struct drm_i915_private *dev_priv) { -u32 val;
This resulted being a pain because it got reused by another upstream patch, so while this revert removed the variable, the newly added non- conflicting code still depended on it.
More specific variable names like "dpfc" and allowing compiler to decide when to optimize and recycle variables would have helped :)
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx