FAILED: patch "[PATCH] drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk" failed to apply to 4.17-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
0c79f9cb77eae28d48a4f9fc1b3341aacbbd260cMon Sep 17 00:00:00 2001
From: Michel Thierry <[email protected]>
Date: Thu, 10 May 2018 13:07:08 -0700
Subject: [PATCH] drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk
Factor in clear values wherever required while updating destination min/max.
References: HSDES#1604444184
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -7259,6 +7259,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)
drivers/gpu/drm/i915/intel_workarounds.c +4 -0
@@ -270,6 +270,10 @@ static int gen9_ctx_workarounds_init(struct drm_i915_private *dev_priv)GEN9_PREEMPT_GPGPU_LEVEL_MASK , GEN9_PREEMPT_GPGPU_COMMAND_LEVEL); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +return 0 ; }
Hi Greg,
Quoted 6 lines · On 7/5/2018 8:41 AM, [email protected] wrote:
The patch below does not apply to the 4.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
The backport of this patch is already in the 4.17-stable tree (commit: b579f924a90f42fa561afd8201514fc216b71949).
Thanks,
-Michel
Quoted 54 lines
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From
0c79f9cb77eae28d48a4f9fc1b3341aacbbd260cMon Sep 17 00:00:00 2001
From: Michel Thierry <[email protected]>
Date: Thu, 10 May 2018 13:07:08 -0700
Subject: [PATCH] drm/i915/gen9: AddWaClearHIZ_WM_CHICKEN3for bxt and glkFactor in clear values wherever required while updating destination min/max.
References: HSDES#1604444184
Signed-off-by Michel Thierry <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Oscar Mateo <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Signed-off-by Chris Wilson <[email protected]>drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -7259,6 +7259,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)drivers/gpu/drm/i915/intel_workarounds.c +4
-0@@ -270,6 +270,10 @@ static int gen9_ctx_workarounds_init(struct drm_i915_private *dev_priv)GEN9_PREEMPT_GPGPU_LEVEL_MASK , GEN9_PREEMPT_GPGPU_COMMAND_LEVEL); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +return 0 ; }
Greg KH
maintainerQuoted 4 lines · Michel Thierry
Hi Greg,
Quoted 1 line · On 7/5/2018 8:41 AM, [email protected] wrote:
Quoted 8 lines
Quoted 5 lines
The patch below does not apply to the 4.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.The backport of this patch is already in the 4.17-stable tree (commit:
b579f924a90f42fa561afd8201514fc216b71949).
Then why was it sent to me again :(
Yeah, I know all about the horrid drm patch flow, and I still think it's horrid...
greg k-h