* drm/i915 fixes that failed to backport to v4.15
@ 2017-11-21 10:20 Jani Nikula
2017-11-22 6:10 ` Zhenyu Wang
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Jani Nikula @ 2017-11-21 10:20 UTC (permalink / raw)
To: intel-gfx, radhakrishna.sripada, rodrigo.vivi, fred.gao, zhenyuw,
chuanxiao.dong, zhi.a.wang
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.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: drm/i915 fixes that failed to backport to v4.15
2017-11-21 10:20 drm/i915 fixes that failed to backport to v4.15 Jani Nikula
@ 2017-11-22 6:10 ` Zhenyu Wang
2017-12-06 22:25 ` [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Rodrigo Vivi
2017-12-06 22:28 ` ✗ Fi.CI.BAT: failure for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2) Patchwork
2 siblings, 0 replies; 7+ messages in thread
From: Zhenyu Wang @ 2017-11-22 6:10 UTC (permalink / raw)
To: Jani Nikula; +Cc: fred.gao, intel-gfx, rodrigo.vivi
[-- Attachment #1.1: Type: text/plain, Size: 982 bytes --]
On 2017.11.21 12:20:00 +0200, Jani Nikula wrote:
>
> 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.
> 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")
I think this one is needed and will do backport.
> 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!
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
2017-11-21 10:20 drm/i915 fixes that failed to backport to v4.15 Jani Nikula
2017-11-22 6:10 ` Zhenyu Wang
@ 2017-12-06 22:25 ` Rodrigo Vivi
2017-12-07 14:58 ` Joonas Lahtinen
2017-12-06 22:28 ` ✗ Fi.CI.BAT: failure for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2) Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Rodrigo Vivi @ 2017-12-06 22:25 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
From: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
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 <rodrigo.vivi@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171117010825.23118-1-radhakrishna.sripada@intel.com
(cherry picked from commit 0cfecb7c4b9b45ed1776162e132b43f92564f3f4)
---
drivers/gpu/drm/i915/i915_reg.h | 3 ---
drivers/gpu/drm/i915/intel_pm.c | 13 -------------
2 files changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 68a58cce6ab1..3866c49bc390 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -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)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index f4a4e9496893..f0d0dbab4150 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -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)
--
2.13.6
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
2017-12-06 22:25 ` [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Rodrigo Vivi
@ 2017-12-07 14:58 ` Joonas Lahtinen
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Lahtinen @ 2017-12-07 14:58 UTC (permalink / raw)
To: Rodrigo Vivi, intel-gfx
Hi,
Thanks, this was included in the pull.
One comment below, not strictly related to this patch.
On Wed, 2017-12-06 at 14:25 -0800, Rodrigo Vivi wrote:
> From: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>
> 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 <rodrigo.vivi@intel.com>
> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20171117010825.23118-1-radhakrishna.sripada@intel.com
> (cherry picked from commit 0cfecb7c4b9b45ed1776162e132b43f92564f3f4)
<SNIP>
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -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
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2)
2017-11-21 10:20 drm/i915 fixes that failed to backport to v4.15 Jani Nikula
2017-11-22 6:10 ` Zhenyu Wang
2017-12-06 22:25 ` [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Rodrigo Vivi
@ 2017-12-06 22:28 ` Patchwork
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-12-06 22:28 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
@ 2017-11-17 1:08 Radhakrishna Sripada
2017-11-17 17:55 ` Rodrigo Vivi
0 siblings, 1 reply; 7+ messages in thread
From: Radhakrishna Sripada @ 2017-11-17 1:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
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."
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 3 ---
drivers/gpu/drm/i915/intel_pm.c | 12 ------------
2 files changed, 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 107e2d7c9fba..96c80fa0fcac 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2985,9 +2985,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)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8c69ec9eb6ee..4d2a7e4d91a7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -121,7 +121,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);
/*
@@ -141,11 +140,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)
@@ -8478,12 +8472,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)
if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_B0))
val |= SARBUNIT_CLKGATE_DIS;
I915_WRITE(SLICE_UNIT_LEVEL_CLKGATE, val);
-
- /* 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)
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
2017-11-17 1:08 [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Radhakrishna Sripada
@ 2017-11-17 17:55 ` Rodrigo Vivi
0 siblings, 0 replies; 7+ messages in thread
From: Rodrigo Vivi @ 2017-11-17 17:55 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx
On Fri, Nov 17, 2017 at 01:08:25AM +0000, Radhakrishna Sripada wrote:
> 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")
(added when merging)
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(post fact since I forgot to add this before hit push when merging :()
But I had reviewed yesterday the spec.
merged to dinq.
Thanks for the patch,
Rodrigo.
> ---
> drivers/gpu/drm/i915/i915_reg.h | 3 ---
> drivers/gpu/drm/i915/intel_pm.c | 12 ------------
> 2 files changed, 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 107e2d7c9fba..96c80fa0fcac 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2985,9 +2985,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)
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8c69ec9eb6ee..4d2a7e4d91a7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -121,7 +121,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);
>
> /*
> @@ -141,11 +140,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)
> @@ -8478,12 +8472,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)
> if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_B0))
> val |= SARBUNIT_CLKGATE_DIS;
> I915_WRITE(SLICE_UNIT_LEVEL_CLKGATE, val);
> -
> - /* 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)
> --
> 2.9.3
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-07 14:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-21 10:20 drm/i915 fixes that failed to backport to v4.15 Jani Nikula
2017-11-22 6:10 ` Zhenyu Wang
2017-12-06 22:25 ` [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Rodrigo Vivi
2017-12-07 14:58 ` Joonas Lahtinen
2017-12-06 22:28 ` ✗ Fi.CI.BAT: failure for Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" (rev2) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2017-11-17 1:08 [PATCH] Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk" Radhakrishna Sripada
2017-11-17 17:55 ` Rodrigo Vivi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.