* [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode
@ 2018-10-30 8:45 Radhakrishna Sripada
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
` (5 more replies)
0 siblings, 6 replies; 20+ messages in thread
From: Radhakrishna Sripada @ 2018-10-30 8:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Michel Thierry
Gen11 Display suports 32 planes in total. Enable the new format in context
status to be used and expanded to 32 planes.
V2: Move the WA to display WA's(Chris)
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_pm.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index bcee91bcfba6..f76fa13a12a2 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2537,6 +2537,7 @@ enum i915_power_well_id {
/* chicken reg for WaConextSwitchWithConcurrentTLBInvalidate */
#define GEN9_CSFE_CHICKEN1_RCS _MMIO(0x20D4)
#define GEN9_PREEMPT_GPGPU_SYNC_SWITCH_DISABLE (1 << 2)
+#define GEN11_ENABLE_32_PLANE_MODE (1 << 7)
/* WaClearTdlStateAckDirtyBits */
#define GEN8_STATE_ACK _MMIO(0x20F0)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82c82e233154..32d051fd45ee 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -8865,6 +8865,10 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)
/* This is not an Wa. Enable to reduce Sampler power */
I915_WRITE(GEN10_DFR_RATIO_EN_AND_CHICKEN,
I915_READ(GEN10_DFR_RATIO_EN_AND_CHICKEN) & ~DFR_DISABLE);
+
+ /* WaEnable32PlaneMode:icl */
+ I915_WRITE(GEN9_CSFE_CHICKEN1_RCS,
+ _MASKED_BIT_ENABLE(GEN11_ENABLE_32_PLANE_MODE));
}
static void cnp_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] 20+ messages in thread
* [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
@ 2018-10-30 8:45 ` Radhakrishna Sripada
2018-10-30 9:17 ` kbuild test robot
` (2 more replies)
2018-10-30 8:45 ` [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7 Radhakrishna Sripada
` (4 subsequent siblings)
5 siblings, 3 replies; 20+ messages in thread
From: Radhakrishna Sripada @ 2018-10-30 8:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi, Paulo Zanoni
Display WA_1405510057 asks to not enable YUV 420 HDMI
10bpc when horizontal blank size mod 8 reminder is 2.
V2: Rebase(r-b: Anusha)
V3: crtc_state->s/ycbcr420/output_format/
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 129b880bce64..6c6c4dd12fd5 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
struct drm_atomic_state *state = crtc_state->base.state;
struct drm_connector_state *connector_state;
struct drm_connector *connector;
+ const struct drm_display_mode *adjusted_mode =
+ &crtc_state->base.adjusted_mode;
int i;
if (HAS_GMCH_DISPLAY(dev_priv))
@@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
/* Display WA #1139: glk */
if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
- crtc_state->base.adjusted_mode.htotal > 5460)
+ adjusted_mode->htotal > 5460)
+ return false;
+
+ /* Display Wa_1405510057:icl */
+ if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
+ bpc == 10 && IS_ICELAKE(dev_priv) &&
+ (adjusted_mode->crtc_hblank_end -
+ adjusted_mode->crtc_hblank_start) % 8 == 2)
return false;
return true;
--
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] 20+ messages in thread
* [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
@ 2018-10-30 8:45 ` Radhakrishna Sripada
2018-10-31 18:59 ` Srivatsa, Anusha
2018-10-30 8:45 ` [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode Radhakrishna Sripada
` (3 subsequent siblings)
5 siblings, 1 reply; 20+ messages in thread
From: Radhakrishna Sripada @ 2018-10-30 8:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Oscar Mateo
From: Oscar Mateo <oscar.mateo@intel.com>
Required to dinamically set 'Trilinear Filter Quality Mode'
Userpsace consumer is mesa.
V2: Rebase
V3: Update commit message
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/intel_workarounds.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 01b9b7591c5d..896874278852 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -1016,6 +1016,8 @@ static void cnl_whitelist_build(struct whitelist *w)
static void icl_whitelist_build(struct whitelist *w)
{
+ /* WaAllowUMDToModifyHalfSliceChicken7:icl */
+ whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
}
static struct whitelist *whitelist_build(struct intel_engine_cs *engine,
--
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] 20+ messages in thread
* [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
2018-10-30 8:45 ` [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7 Radhakrishna Sripada
@ 2018-10-30 8:45 ` Radhakrishna Sripada
2018-10-30 9:12 ` Chris Wilson
2018-10-31 18:50 ` Srivatsa, Anusha
2018-10-30 9:18 ` ✗ Fi.CI.BAT: failure for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode Patchwork
` (2 subsequent siblings)
5 siblings, 2 replies; 20+ messages in thread
From: Radhakrishna Sripada @ 2018-10-30 8:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Oscar Mateo
From: Oscar Mateo <oscar.mateo@intel.com>
Required for Bindless samplers.
Userspace consumer: mesa
V2: Rebase
V3: Update commit message
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 2 ++
drivers/gpu/drm/i915/intel_workarounds.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index f76fa13a12a2..050fedb4fc81 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8648,6 +8648,8 @@ enum {
#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)
#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)
+#define GEN10_SAMPLER_MODE _MMIO(0xE18C)
+
/* IVYBRIDGE DPF */
#define GEN7_L3CDERRST1(slice) _MMIO(0xB008 + (slice) * 0x200) /* L3CD Error Status 1 */
#define GEN7_L3CDERRST1_ROW_MASK (0x7ff << 14)
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 896874278852..d7176213e3ce 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -1018,6 +1018,9 @@ static void icl_whitelist_build(struct whitelist *w)
{
/* WaAllowUMDToModifyHalfSliceChicken7:icl */
whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
+
+ /* WaAllowUMDToModifySamplerMode:icl */
+ whitelist_reg(w, GEN10_SAMPLER_MODE);
}
static struct whitelist *whitelist_build(struct intel_engine_cs *engine,
--
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] 20+ messages in thread
* Re: [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode
2018-10-30 8:45 ` [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode Radhakrishna Sripada
@ 2018-10-30 9:12 ` Chris Wilson
2018-10-30 9:20 ` Chris Wilson
2018-10-31 18:50 ` Srivatsa, Anusha
1 sibling, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2018-10-30 9:12 UTC (permalink / raw)
To: Radhakrishna Sripada, intel-gfx; +Cc: Oscar Mateo
Quoting Radhakrishna Sripada (2018-10-30 08:45:04)
> From: Oscar Mateo <oscar.mateo@intel.com>
>
> Required for Bindless samplers.
> Userspace consumer: mesa
>
> V2: Rebase
> V3: Update commit message
>
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 2 ++
> drivers/gpu/drm/i915/intel_workarounds.c | 3 +++
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index f76fa13a12a2..050fedb4fc81 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -8648,6 +8648,8 @@ enum {
> #define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)
> #define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)
>
> +#define GEN10_SAMPLER_MODE _MMIO(0xE18C)
> +
> /* IVYBRIDGE DPF */
> #define GEN7_L3CDERRST1(slice) _MMIO(0xB008 + (slice) * 0x200) /* L3CD Error Status 1 */
> #define GEN7_L3CDERRST1_ROW_MASK (0x7ff << 14)
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> index 896874278852..d7176213e3ce 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -1018,6 +1018,9 @@ static void icl_whitelist_build(struct whitelist *w)
> {
> /* WaAllowUMDToModifyHalfSliceChicken7:icl */
> whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
> +
> + /* WaAllowUMDToModifySamplerMode:icl */
> + whitelist_reg(w, GEN10_SAMPLER_MODE);
Hmm, we need the basic subtests of gem_workarounds in BAT to have any
coverage of this code.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
@ 2018-10-30 9:17 ` kbuild test robot
2018-10-30 9:30 ` kbuild test robot
2018-10-30 22:27 ` Rodrigo Vivi
2 siblings, 0 replies; 20+ messages in thread
From: kbuild test robot @ 2018-10-30 9:17 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: Paulo Zanoni, intel-gfx, kbuild-all, Rodrigo Vivi
[-- Attachment #1: Type: text/plain, Size: 4174 bytes --]
Hi Radhakrishna,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on v4.19 next-20181030]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Radhakrishna-Sripada/drm-i915-icl-Add-WaEnable32PlaneMode/20181030-164539
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x005-201843 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
drivers/gpu//drm/i915/intel_hdmi.c: In function 'hdmi_deep_color_possible':
>> drivers/gpu//drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~~~~~~~~~~~~
output_types
>> drivers/gpu//drm/i915/intel_hdmi.c:1654:35: error: 'INTEL_OUTPUT_FORMAT_YCBCR420' undeclared (first use in this function); did you mean 'INTEL_OUTPUT_DP_MST'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
INTEL_OUTPUT_DP_MST
drivers/gpu//drm/i915/intel_hdmi.c:1654:35: note: each undeclared identifier is reported only once for each function it appears in
vim +1654 drivers/gpu//drm/i915/intel_hdmi.c
1591
1592 static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
1593 int bpc)
1594 {
1595 struct drm_i915_private *dev_priv =
1596 to_i915(crtc_state->base.crtc->dev);
1597 struct drm_atomic_state *state = crtc_state->base.state;
1598 struct drm_connector_state *connector_state;
1599 struct drm_connector *connector;
1600 const struct drm_display_mode *adjusted_mode =
1601 &crtc_state->base.adjusted_mode;
1602 int i;
1603
1604 if (HAS_GMCH_DISPLAY(dev_priv))
1605 return false;
1606
1607 if (bpc == 10 && INTEL_GEN(dev_priv) < 11)
1608 return false;
1609
1610 if (crtc_state->pipe_bpp <= 8*3)
1611 return false;
1612
1613 if (!crtc_state->has_hdmi_sink)
1614 return false;
1615
1616 /*
1617 * HDMI deep color affects the clocks, so it's only possible
1618 * when not cloning with other encoder types.
1619 */
1620 if (crtc_state->output_types != 1 << INTEL_OUTPUT_HDMI)
1621 return false;
1622
1623 for_each_new_connector_in_state(state, connector, connector_state, i) {
1624 const struct drm_display_info *info = &connector->display_info;
1625
1626 if (connector_state->crtc != crtc_state->base.crtc)
1627 continue;
1628
1629 if (crtc_state->ycbcr420) {
1630 const struct drm_hdmi_info *hdmi = &info->hdmi;
1631
1632 if (bpc == 12 && !(hdmi->y420_dc_modes &
1633 DRM_EDID_YCBCR420_DC_36))
1634 return false;
1635 else if (bpc == 10 && !(hdmi->y420_dc_modes &
1636 DRM_EDID_YCBCR420_DC_30))
1637 return false;
1638 } else {
1639 if (bpc == 12 && !(info->edid_hdmi_dc_modes &
1640 DRM_EDID_HDMI_DC_36))
1641 return false;
1642 else if (bpc == 10 && !(info->edid_hdmi_dc_modes &
1643 DRM_EDID_HDMI_DC_30))
1644 return false;
1645 }
1646 }
1647
1648 /* Display WA #1139: glk */
1649 if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
1650 adjusted_mode->htotal > 5460)
1651 return false;
1652
1653 /* Display Wa_1405510057:icl */
> 1654 if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
1655 bpc == 10 && IS_ICELAKE(dev_priv) &&
1656 (adjusted_mode->crtc_hblank_end -
1657 adjusted_mode->crtc_hblank_start) % 8 == 2)
1658 return false;
1659
1660 return true;
1661 }
1662
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 31079 bytes --]
[-- Attachment #3: 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] 20+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
` (2 preceding siblings ...)
2018-10-30 8:45 ` [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode Radhakrishna Sripada
@ 2018-10-30 9:18 ` Patchwork
2018-10-31 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
2018-11-01 5:02 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-10-30 9:18 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
URL : https://patchwork.freedesktop.org/series/51736/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_5053 -> Patchwork_10645 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10645 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10645, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51736/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10645:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
fi-skl-iommu: PASS -> INCOMPLETE
==== Warnings ====
igt@drv_selftest@live_guc:
fi-skl-iommu: PASS -> SKIP +1
== Known issues ==
Here are the changes found in Patchwork_10645 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s4-devices:
fi-blb-e6850: NOTRUN -> INCOMPLETE (fdo#107718)
igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
fi-byt-clapper: PASS -> FAIL (fdo#103191, fdo#107362) +1
==== Possible fixes ====
igt@drv_getparams_basic@basic-eu-total:
fi-kbl-7560u: INCOMPLETE (fdo#103665) -> PASS
igt@drv_module_reload@basic-reload:
fi-glk-j4005: DMESG-WARN (fdo#106725, fdo#106248) -> PASS
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: INCOMPLETE (fdo#107718) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: FAIL (fdo#100368) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-byt-clapper: FAIL (fdo#103191, fdo#107362) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#106248 https://bugs.freedesktop.org/show_bug.cgi?id=106248
fdo#106725 https://bugs.freedesktop.org/show_bug.cgi?id=106725
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
== Participating hosts (47 -> 41) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5053 -> Patchwork_10645
CI_DRM_5053: fb5dde5f5303ed6eb6099f9435762ed70b3bfdb0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4699: 1270ec553741ac20c45178d2b26f9a9562ea565f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10645: e70001aa2cbf474303af8e09f96123b7be77d6e0 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e70001aa2cbf drm/i915/icl: WaAllowUMDToModifySamplerMode
438b479a73ab drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
d1a3aabde515 drm/i915/icl: Implement Display WA_1405510057
a1e4353acc17 drm/i915/icl: Add WaEnable32PlaneMode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10645/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode
2018-10-30 9:12 ` Chris Wilson
@ 2018-10-30 9:20 ` Chris Wilson
0 siblings, 0 replies; 20+ messages in thread
From: Chris Wilson @ 2018-10-30 9:20 UTC (permalink / raw)
To: Radhakrishna Sripada, intel-gfx; +Cc: Oscar Mateo
Quoting Chris Wilson (2018-10-30 09:12:20)
> Quoting Radhakrishna Sripada (2018-10-30 08:45:04)
> > From: Oscar Mateo <oscar.mateo@intel.com>
> >
> > Required for Bindless samplers.
> > Userspace consumer: mesa
> >
> > V2: Rebase
> > V3: Update commit message
> >
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_reg.h | 2 ++
> > drivers/gpu/drm/i915/intel_workarounds.c | 3 +++
> > 2 files changed, 5 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index f76fa13a12a2..050fedb4fc81 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -8648,6 +8648,8 @@ enum {
> > #define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)
> > #define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)
> >
> > +#define GEN10_SAMPLER_MODE _MMIO(0xE18C)
> > +
> > /* IVYBRIDGE DPF */
> > #define GEN7_L3CDERRST1(slice) _MMIO(0xB008 + (slice) * 0x200) /* L3CD Error Status 1 */
> > #define GEN7_L3CDERRST1_ROW_MASK (0x7ff << 14)
> > diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
> > index 896874278852..d7176213e3ce 100644
> > --- a/drivers/gpu/drm/i915/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> > @@ -1018,6 +1018,9 @@ static void icl_whitelist_build(struct whitelist *w)
> > {
> > /* WaAllowUMDToModifyHalfSliceChicken7:icl */
> > whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
> > +
> > + /* WaAllowUMDToModifySamplerMode:icl */
> > + whitelist_reg(w, GEN10_SAMPLER_MODE);
>
> Hmm, we need the basic subtests of gem_workarounds in BAT to have any
> coverage of this code.
Nah, we have live_reset_whitelist() to provide basic coverage in BAT.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
2018-10-30 9:17 ` kbuild test robot
@ 2018-10-30 9:30 ` kbuild test robot
2018-10-30 22:35 ` Rodrigo Vivi
2018-10-30 22:27 ` Rodrigo Vivi
2 siblings, 1 reply; 20+ messages in thread
From: kbuild test robot @ 2018-10-30 9:30 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: Paulo Zanoni, intel-gfx, kbuild-all, Rodrigo Vivi
[-- Attachment #1: Type: text/plain, Size: 6540 bytes --]
Hi Radhakrishna,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.19 next-20181030]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Radhakrishna-Sripada/drm-i915-icl-Add-WaEnable32PlaneMode/20181030-164539
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x075-201843 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All warnings (new ones prefixed by >>):
In file included from include/linux/string.h:6:0,
from include/linux/uuid.h:20,
from include/linux/mod_devicetable.h:13,
from include/linux/i2c.h:29,
from drivers/gpu/drm/i915/intel_hdmi.c:29:
drivers/gpu/drm/i915/intel_hdmi.c: In function 'hdmi_deep_color_possible':
drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^
include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~
drivers/gpu/drm/i915/intel_hdmi.c:1654:35: error: 'INTEL_OUTPUT_FORMAT_YCBCR420' undeclared (first use in this function); did you mean 'INTEL_OUTPUT_DP_MST'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^
include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~
drivers/gpu/drm/i915/intel_hdmi.c:1654:35: note: each undeclared identifier is reported only once for each function it appears in
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^
include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~
drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^
include/linux/compiler.h:58:42: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~
drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^
include/linux/compiler.h:69:16: note: in definition of macro '__trace_if'
______r = !!(cond); \
^~~~
>> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
^~
vim +/if +1654 drivers/gpu/drm/i915/intel_hdmi.c
1591
1592 static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
1593 int bpc)
1594 {
1595 struct drm_i915_private *dev_priv =
1596 to_i915(crtc_state->base.crtc->dev);
1597 struct drm_atomic_state *state = crtc_state->base.state;
1598 struct drm_connector_state *connector_state;
1599 struct drm_connector *connector;
1600 const struct drm_display_mode *adjusted_mode =
1601 &crtc_state->base.adjusted_mode;
1602 int i;
1603
1604 if (HAS_GMCH_DISPLAY(dev_priv))
1605 return false;
1606
1607 if (bpc == 10 && INTEL_GEN(dev_priv) < 11)
1608 return false;
1609
1610 if (crtc_state->pipe_bpp <= 8*3)
1611 return false;
1612
1613 if (!crtc_state->has_hdmi_sink)
1614 return false;
1615
1616 /*
1617 * HDMI deep color affects the clocks, so it's only possible
1618 * when not cloning with other encoder types.
1619 */
1620 if (crtc_state->output_types != 1 << INTEL_OUTPUT_HDMI)
1621 return false;
1622
1623 for_each_new_connector_in_state(state, connector, connector_state, i) {
1624 const struct drm_display_info *info = &connector->display_info;
1625
1626 if (connector_state->crtc != crtc_state->base.crtc)
1627 continue;
1628
1629 if (crtc_state->ycbcr420) {
1630 const struct drm_hdmi_info *hdmi = &info->hdmi;
1631
1632 if (bpc == 12 && !(hdmi->y420_dc_modes &
1633 DRM_EDID_YCBCR420_DC_36))
1634 return false;
1635 else if (bpc == 10 && !(hdmi->y420_dc_modes &
1636 DRM_EDID_YCBCR420_DC_30))
1637 return false;
1638 } else {
1639 if (bpc == 12 && !(info->edid_hdmi_dc_modes &
1640 DRM_EDID_HDMI_DC_36))
1641 return false;
1642 else if (bpc == 10 && !(info->edid_hdmi_dc_modes &
1643 DRM_EDID_HDMI_DC_30))
1644 return false;
1645 }
1646 }
1647
1648 /* Display WA #1139: glk */
1649 if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
1650 adjusted_mode->htotal > 5460)
1651 return false;
1652
1653 /* Display Wa_1405510057:icl */
> 1654 if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
1655 bpc == 10 && IS_ICELAKE(dev_priv) &&
1656 (adjusted_mode->crtc_hblank_end -
1657 adjusted_mode->crtc_hblank_start) % 8 == 2)
1658 return false;
1659
1660 return true;
1661 }
1662
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33854 bytes --]
[-- Attachment #3: 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] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
2018-10-30 9:17 ` kbuild test robot
2018-10-30 9:30 ` kbuild test robot
@ 2018-10-30 22:27 ` Rodrigo Vivi
2018-11-01 19:33 ` Rodrigo Vivi
2 siblings, 1 reply; 20+ messages in thread
From: Rodrigo Vivi @ 2018-10-30 22:27 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx, Paulo Zanoni
On Tue, Oct 30, 2018 at 01:45:02AM -0700, Radhakrishna Sripada wrote:
> Display WA_1405510057 asks to not enable YUV 420 HDMI
> 10bpc when horizontal blank size mod 8 reminder is 2.
>
> V2: Rebase(r-b: Anusha)
> V3: crtc_state->s/ycbcr420/output_format/
>
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 129b880bce64..6c6c4dd12fd5 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> struct drm_atomic_state *state = crtc_state->base.state;
> struct drm_connector_state *connector_state;
> struct drm_connector *connector;
> + const struct drm_display_mode *adjusted_mode =
> + &crtc_state->base.adjusted_mode;
> int i;
>
> if (HAS_GMCH_DISPLAY(dev_priv))
> @@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
>
> /* Display WA #1139: glk */
> if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> - crtc_state->base.adjusted_mode.htotal > 5460)
> + adjusted_mode->htotal > 5460)
> + return false;
> +
> + /* Display Wa_1405510057:icl */
> + if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> + bpc == 10 && IS_ICELAKE(dev_priv) &&
> + (adjusted_mode->crtc_hblank_end -
> + adjusted_mode->crtc_hblank_start) % 8 == 2)
> return false;
>
> return true;
> --
> 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] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 9:30 ` kbuild test robot
@ 2018-10-30 22:35 ` Rodrigo Vivi
2018-10-31 18:54 ` Radhakrishna Sripada
0 siblings, 1 reply; 20+ messages in thread
From: Rodrigo Vivi @ 2018-10-30 22:35 UTC (permalink / raw)
To: kbuild test robot; +Cc: kbuild-all, intel-gfx, Paulo Zanoni
On Tue, Oct 30, 2018 at 05:30:25PM +0800, kbuild test robot wrote:
> Hi Radhakrishna,
>
> Thank you for the patch! Perhaps something to improve:
>
> [auto build test WARNING on drm-intel/for-linux-next]
> [also build test WARNING on v4.19 next-20181030]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url: https://github.com/0day-ci/linux/commits/Radhakrishna-Sripada/drm-i915-icl-Add-WaEnable32PlaneMode/20181030-164539
> base: git://anongit.freedesktop.org/drm-intel for-linux-next
> config: i386-randconfig-x075-201843 (attached as .config)
> compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
> reproduce:
> # save the attached .config to linux build tree
> make ARCH=i386
>
> All warnings (new ones prefixed by >>):
>
> In file included from include/linux/string.h:6:0,
> from include/linux/uuid.h:20,
> from include/linux/mod_devicetable.h:13,
> from include/linux/i2c.h:29,
> from drivers/gpu/drm/i915/intel_hdmi.c:29:
> drivers/gpu/drm/i915/intel_hdmi.c: In function 'hdmi_deep_color_possible':
> drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
it seems you need to rebase on latest drm-tip...
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^
> include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> ^~~~
> >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^~
> drivers/gpu/drm/i915/intel_hdmi.c:1654:35: error: 'INTEL_OUTPUT_FORMAT_YCBCR420' undeclared (first use in this function); did you mean 'INTEL_OUTPUT_DP_MST'?
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^
> include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> ^~~~
> >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^~
> drivers/gpu/drm/i915/intel_hdmi.c:1654:35: note: each undeclared identifier is reported only once for each function it appears in
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^
> include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> ^~~~
> >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^~
> drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^
> include/linux/compiler.h:58:42: note: in definition of macro '__trace_if'
> if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> ^~~~
> >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^~
> drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^
> include/linux/compiler.h:69:16: note: in definition of macro '__trace_if'
> ______r = !!(cond); \
> ^~~~
> >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> ^~
>
> vim +/if +1654 drivers/gpu/drm/i915/intel_hdmi.c
>
> 1591
> 1592 static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> 1593 int bpc)
> 1594 {
> 1595 struct drm_i915_private *dev_priv =
> 1596 to_i915(crtc_state->base.crtc->dev);
> 1597 struct drm_atomic_state *state = crtc_state->base.state;
> 1598 struct drm_connector_state *connector_state;
> 1599 struct drm_connector *connector;
> 1600 const struct drm_display_mode *adjusted_mode =
> 1601 &crtc_state->base.adjusted_mode;
> 1602 int i;
> 1603
> 1604 if (HAS_GMCH_DISPLAY(dev_priv))
> 1605 return false;
> 1606
> 1607 if (bpc == 10 && INTEL_GEN(dev_priv) < 11)
> 1608 return false;
> 1609
> 1610 if (crtc_state->pipe_bpp <= 8*3)
> 1611 return false;
> 1612
> 1613 if (!crtc_state->has_hdmi_sink)
> 1614 return false;
> 1615
> 1616 /*
> 1617 * HDMI deep color affects the clocks, so it's only possible
> 1618 * when not cloning with other encoder types.
> 1619 */
> 1620 if (crtc_state->output_types != 1 << INTEL_OUTPUT_HDMI)
> 1621 return false;
> 1622
> 1623 for_each_new_connector_in_state(state, connector, connector_state, i) {
> 1624 const struct drm_display_info *info = &connector->display_info;
> 1625
> 1626 if (connector_state->crtc != crtc_state->base.crtc)
> 1627 continue;
> 1628
> 1629 if (crtc_state->ycbcr420) {
> 1630 const struct drm_hdmi_info *hdmi = &info->hdmi;
> 1631
> 1632 if (bpc == 12 && !(hdmi->y420_dc_modes &
> 1633 DRM_EDID_YCBCR420_DC_36))
> 1634 return false;
> 1635 else if (bpc == 10 && !(hdmi->y420_dc_modes &
> 1636 DRM_EDID_YCBCR420_DC_30))
> 1637 return false;
> 1638 } else {
> 1639 if (bpc == 12 && !(info->edid_hdmi_dc_modes &
> 1640 DRM_EDID_HDMI_DC_36))
> 1641 return false;
> 1642 else if (bpc == 10 && !(info->edid_hdmi_dc_modes &
> 1643 DRM_EDID_HDMI_DC_30))
> 1644 return false;
> 1645 }
> 1646 }
> 1647
> 1648 /* Display WA #1139: glk */
> 1649 if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> 1650 adjusted_mode->htotal > 5460)
> 1651 return false;
> 1652
> 1653 /* Display Wa_1405510057:icl */
> > 1654 if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> 1655 bpc == 10 && IS_ICELAKE(dev_priv) &&
> 1656 (adjusted_mode->crtc_hblank_end -
> 1657 adjusted_mode->crtc_hblank_start) % 8 == 2)
> 1658 return false;
> 1659
> 1660 return true;
> 1661 }
> 1662
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode
2018-10-30 8:45 ` [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode Radhakrishna Sripada
2018-10-30 9:12 ` Chris Wilson
@ 2018-10-31 18:50 ` Srivatsa, Anusha
1 sibling, 0 replies; 20+ messages in thread
From: Srivatsa, Anusha @ 2018-10-31 18:50 UTC (permalink / raw)
To: Sripada, Radhakrishna, intel-gfx; +Cc: Oscar Mateo
>-----Original Message-----
>From: Sripada, Radhakrishna
>Sent: Tuesday, October 30, 2018 1:45 AM
>To: intel-gfx@lists.freedesktop.org
>Cc: Oscar Mateo <oscar.mateo@intel.com>; Srivatsa, Anusha
><anusha.srivatsa@intel.com>; Mika Kuoppala <mika.kuoppala@linux.intel.com>;
>Sripada, Radhakrishna <radhakrishna.sripada@intel.com>
>Subject: [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode
>
>From: Oscar Mateo <oscar.mateo@intel.com>
>
>Required for Bindless samplers.
>Userspace consumer: mesa
>
>V2: Rebase
>V3: Update commit message
>
>Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
>Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Checked with WA database.
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>---
> drivers/gpu/drm/i915/i915_reg.h | 2 ++
> drivers/gpu/drm/i915/intel_workarounds.c | 3 +++
> 2 files changed, 5 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index f76fa13a12a2..050fedb4fc81 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -8648,6 +8648,8 @@ enum {
> #define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)
> #define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7)
>
>+#define GEN10_SAMPLER_MODE _MMIO(0xE18C)
>+
> /* IVYBRIDGE DPF */
> #define GEN7_L3CDERRST1(slice) _MMIO(0xB008 + (slice) *
>0x200) /* L3CD Error Status 1 */
> #define GEN7_L3CDERRST1_ROW_MASK (0x7ff << 14)
>diff --git a/drivers/gpu/drm/i915/intel_workarounds.c
>b/drivers/gpu/drm/i915/intel_workarounds.c
>index 896874278852..d7176213e3ce 100644
>--- a/drivers/gpu/drm/i915/intel_workarounds.c
>+++ b/drivers/gpu/drm/i915/intel_workarounds.c
>@@ -1018,6 +1018,9 @@ static void icl_whitelist_build(struct whitelist *w) {
> /* WaAllowUMDToModifyHalfSliceChicken7:icl */
> whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
>+
>+ /* WaAllowUMDToModifySamplerMode:icl */
>+ whitelist_reg(w, GEN10_SAMPLER_MODE);
> }
>
> static struct whitelist *whitelist_build(struct intel_engine_cs *engine,
>--
>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] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 22:35 ` Rodrigo Vivi
@ 2018-10-31 18:54 ` Radhakrishna Sripada
0 siblings, 0 replies; 20+ messages in thread
From: Radhakrishna Sripada @ 2018-10-31 18:54 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: kbuild-all, intel-gfx, Paulo Zanoni
On Tue, Oct 30, 2018 at 03:35:39PM -0700, Rodrigo Vivi wrote:
> On Tue, Oct 30, 2018 at 05:30:25PM +0800, kbuild test robot wrote:
> > Hi Radhakrishna,
> >
> > Thank you for the patch! Perhaps something to improve:
> >
> > [auto build test WARNING on drm-intel/for-linux-next]
> > [also build test WARNING on v4.19 next-20181030]
> > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
> >
> > url: https://github.com/0day-ci/linux/commits/Radhakrishna-Sripada/drm-i915-icl-Add-WaEnable32PlaneMode/20181030-164539
> > base: git://anongit.freedesktop.org/drm-intel for-linux-next
> > config: i386-randconfig-x075-201843 (attached as .config)
> > compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
> > reproduce:
> > # save the attached .config to linux build tree
> > make ARCH=i386
> >
> > All warnings (new ones prefixed by >>):
> >
> > In file included from include/linux/string.h:6:0,
> > from include/linux/uuid.h:20,
> > from include/linux/mod_devicetable.h:13,
> > from include/linux/i2c.h:29,
> > from drivers/gpu/drm/i915/intel_hdmi.c:29:
> > drivers/gpu/drm/i915/intel_hdmi.c: In function 'hdmi_deep_color_possible':
> > drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
>
> it seems you need to rebase on latest drm-tip...
I rebased the patch on drm-tip. The drm-tip commit
33b7f3ee6e00831 drm/i915: Add CRTC output format YCBCR 4:2:0
introduced crtc_state->output_format. And this commit is not part of drm-intel
for-linux-next tag.
Regards,
Radhakrishna(RK) Sripada
>
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^
> > include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> > if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> > ^~~~
> > >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^~
> > drivers/gpu/drm/i915/intel_hdmi.c:1654:35: error: 'INTEL_OUTPUT_FORMAT_YCBCR420' undeclared (first use in this function); did you mean 'INTEL_OUTPUT_DP_MST'?
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^
> > include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> > if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> > ^~~~
> > >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^~
> > drivers/gpu/drm/i915/intel_hdmi.c:1654:35: note: each undeclared identifier is reported only once for each function it appears in
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^
> > include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
> > if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> > ^~~~
> > >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^~
> > drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^
> > include/linux/compiler.h:58:42: note: in definition of macro '__trace_if'
> > if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
> > ^~~~
> > >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^~
> > drivers/gpu/drm/i915/intel_hdmi.c:1654:18: error: 'const struct intel_crtc_state' has no member named 'output_format'; did you mean 'output_types'?
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^
> > include/linux/compiler.h:69:16: note: in definition of macro '__trace_if'
> > ______r = !!(cond); \
> > ^~~~
> > >> drivers/gpu/drm/i915/intel_hdmi.c:1654:2: note: in expansion of macro 'if'
> > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > ^~
> >
> > vim +/if +1654 drivers/gpu/drm/i915/intel_hdmi.c
> >
> > 1591
> > 1592 static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > 1593 int bpc)
> > 1594 {
> > 1595 struct drm_i915_private *dev_priv =
> > 1596 to_i915(crtc_state->base.crtc->dev);
> > 1597 struct drm_atomic_state *state = crtc_state->base.state;
> > 1598 struct drm_connector_state *connector_state;
> > 1599 struct drm_connector *connector;
> > 1600 const struct drm_display_mode *adjusted_mode =
> > 1601 &crtc_state->base.adjusted_mode;
> > 1602 int i;
> > 1603
> > 1604 if (HAS_GMCH_DISPLAY(dev_priv))
> > 1605 return false;
> > 1606
> > 1607 if (bpc == 10 && INTEL_GEN(dev_priv) < 11)
> > 1608 return false;
> > 1609
> > 1610 if (crtc_state->pipe_bpp <= 8*3)
> > 1611 return false;
> > 1612
> > 1613 if (!crtc_state->has_hdmi_sink)
> > 1614 return false;
> > 1615
> > 1616 /*
> > 1617 * HDMI deep color affects the clocks, so it's only possible
> > 1618 * when not cloning with other encoder types.
> > 1619 */
> > 1620 if (crtc_state->output_types != 1 << INTEL_OUTPUT_HDMI)
> > 1621 return false;
> > 1622
> > 1623 for_each_new_connector_in_state(state, connector, connector_state, i) {
> > 1624 const struct drm_display_info *info = &connector->display_info;
> > 1625
> > 1626 if (connector_state->crtc != crtc_state->base.crtc)
> > 1627 continue;
> > 1628
> > 1629 if (crtc_state->ycbcr420) {
> > 1630 const struct drm_hdmi_info *hdmi = &info->hdmi;
> > 1631
> > 1632 if (bpc == 12 && !(hdmi->y420_dc_modes &
> > 1633 DRM_EDID_YCBCR420_DC_36))
> > 1634 return false;
> > 1635 else if (bpc == 10 && !(hdmi->y420_dc_modes &
> > 1636 DRM_EDID_YCBCR420_DC_30))
> > 1637 return false;
> > 1638 } else {
> > 1639 if (bpc == 12 && !(info->edid_hdmi_dc_modes &
> > 1640 DRM_EDID_HDMI_DC_36))
> > 1641 return false;
> > 1642 else if (bpc == 10 && !(info->edid_hdmi_dc_modes &
> > 1643 DRM_EDID_HDMI_DC_30))
> > 1644 return false;
> > 1645 }
> > 1646 }
> > 1647
> > 1648 /* Display WA #1139: glk */
> > 1649 if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > 1650 adjusted_mode->htotal > 5460)
> > 1651 return false;
> > 1652
> > 1653 /* Display Wa_1405510057:icl */
> > > 1654 if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > 1655 bpc == 10 && IS_ICELAKE(dev_priv) &&
> > 1656 (adjusted_mode->crtc_hblank_end -
> > 1657 adjusted_mode->crtc_hblank_start) % 8 == 2)
> > 1658 return false;
> > 1659
> > 1660 return true;
> > 1661 }
> > 1662
> >
> > ---
> > 0-DAY kernel test infrastructure Open Source Technology Center
> > https://lists.01.org/pipermail/kbuild-all Intel Corporation
>
>
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
2018-10-30 8:45 ` [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7 Radhakrishna Sripada
@ 2018-10-31 18:59 ` Srivatsa, Anusha
0 siblings, 0 replies; 20+ messages in thread
From: Srivatsa, Anusha @ 2018-10-31 18:59 UTC (permalink / raw)
To: Sripada, Radhakrishna, intel-gfx; +Cc: Oscar Mateo
>-----Original Message-----
>From: Sripada, Radhakrishna
>Sent: Tuesday, October 30, 2018 1:45 AM
>To: intel-gfx@lists.freedesktop.org
>Cc: Oscar Mateo <oscar.mateo@intel.com>; Mika Kuoppala
><mika.kuoppala@linux.intel.com>; Srivatsa, Anusha
><anusha.srivatsa@intel.com>; Sripada, Radhakrishna
><radhakrishna.sripada@intel.com>
>Subject: [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
>
>From: Oscar Mateo <oscar.mateo@intel.com>
>
>Required to dinamically set 'Trilinear Filter Quality Mode'
^^^^^^fix the typo.
>Userpsace consumer is mesa.
>
>V2: Rebase
>V3: Update commit message
>
>Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
>Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
With the typo fix,
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>---
> drivers/gpu/drm/i915/intel_workarounds.c | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_workarounds.c
>b/drivers/gpu/drm/i915/intel_workarounds.c
>index 01b9b7591c5d..896874278852 100644
>--- a/drivers/gpu/drm/i915/intel_workarounds.c
>+++ b/drivers/gpu/drm/i915/intel_workarounds.c
>@@ -1016,6 +1016,8 @@ static void cnl_whitelist_build(struct whitelist *w)
>
> static void icl_whitelist_build(struct whitelist *w) {
>+ /* WaAllowUMDToModifyHalfSliceChicken7:icl */
>+ whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
> }
>
> static struct whitelist *whitelist_build(struct intel_engine_cs *engine,
>--
>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] 20+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
` (3 preceding siblings ...)
2018-10-30 9:18 ` ✗ Fi.CI.BAT: failure for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode Patchwork
@ 2018-10-31 20:02 ` Patchwork
2018-11-01 5:02 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-10-31 20:02 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
URL : https://patchwork.freedesktop.org/series/51736/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5062 -> Patchwork_10677 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51736/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10677 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_coherency:
fi-gdg-551: PASS -> DMESG-FAIL (fdo#107164)
igt@gem_ctx_switch@basic-default:
fi-icl-u: PASS -> DMESG-FAIL (fdo#108535)
igt@kms_flip@basic-plain-flip:
fi-skl-6700hq: PASS -> DMESG-WARN (fdo#105998)
igt@kms_pipe_crc_basic@read-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362)
==== Possible fixes ====
igt@kms_chamelium@common-hpd-after-suspend:
fi-skl-6700k2: INCOMPLETE (fdo#104108, fdo#105524, k.org#199541) -> PASS
igt@kms_flip@basic-flip-vs-dpms:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b:
fi-byt-clapper: FAIL (fdo#107362) -> PASS
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105524 https://bugs.freedesktop.org/show_bug.cgi?id=105524
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#108535 https://bugs.freedesktop.org/show_bug.cgi?id=108535
k.org#199541 https://bugzilla.kernel.org/show_bug.cgi?id=199541
== Participating hosts (49 -> 42) ==
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-cfl-8109u
== Build changes ==
* Linux: CI_DRM_5062 -> Patchwork_10677
CI_DRM_5062: 3aa71a0d803ee01605f9a3026ddd989a591a73c6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4703: f882a542a3eb24e78e51aa6410a3a67c0efb4e97 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10677: 64add43e38798c2de47215981984507ba9c44086 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
64add43e3879 drm/i915/icl: WaAllowUMDToModifySamplerMode
664dd879a6be drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
2b3e3c18e8f0 drm/i915/icl: Implement Display WA_1405510057
3c0b0699208a drm/i915/icl: Add WaEnable32PlaneMode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10677/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
` (4 preceding siblings ...)
2018-10-31 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-11-01 5:02 ` Patchwork
5 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-11-01 5:02 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode
URL : https://patchwork.freedesktop.org/series/51736/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5062_full -> Patchwork_10677_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10677_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10677_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10677_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_10677_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_bad_domains@gtt-domain:
shard-apl: PASS -> INCOMPLETE (fdo#103927)
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-skl: PASS -> FAIL (fdo#108470, fdo#107815, fdo#108228)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_cursor_crc@cursor-128x128-onscreen:
shard-apl: PASS -> FAIL (fdo#103232) +1
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: NOTRUN -> FAIL (fdo#106509, fdo#105454)
igt@kms_cursor_legacy@cursora-vs-flipa-toggle:
shard-glk: PASS -> DMESG-WARN (fdo#106538, fdo#105763)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-render:
shard-glk: PASS -> FAIL (fdo#103167)
igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
shard-kbl: PASS -> DMESG-WARN (fdo#103313, fdo#105345)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
shard-skl: PASS -> FAIL (fdo#103191, fdo#107362)
igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
shard-apl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
shard-skl: PASS -> FAIL (fdo#107815)
igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
shard-glk: NOTRUN -> FAIL (fdo#108145)
igt@pm_rpm@system-suspend-modeset:
shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
==== Possible fixes ====
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: INCOMPLETE (fdo#106023, fdo#106887, fdo#103665) -> PASS +1
igt@kms_color@pipe-b-degamma:
shard-apl: FAIL (fdo#104782) -> PASS
igt@kms_cursor_crc@cursor-64x21-random:
shard-apl: FAIL (fdo#103232) -> PASS +3
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-snb: DMESG-WARN (fdo#102365) -> PASS
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: DMESG-WARN (fdo#106538, fdo#105763) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
shard-apl: FAIL (fdo#108145) -> PASS
igt@pm_rpm@modeset-lpsp-stress-no-wait:
shard-skl: INCOMPLETE (fdo#107807) -> PASS
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
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#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108228 https://bugs.freedesktop.org/show_bug.cgi?id=108228
fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5062 -> Patchwork_10677
CI_DRM_5062: 3aa71a0d803ee01605f9a3026ddd989a591a73c6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4703: f882a542a3eb24e78e51aa6410a3a67c0efb4e97 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10677: 64add43e38798c2de47215981984507ba9c44086 @ 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_10677/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-10-30 22:27 ` Rodrigo Vivi
@ 2018-11-01 19:33 ` Rodrigo Vivi
2018-11-01 23:52 ` Imre Deak
0 siblings, 1 reply; 20+ messages in thread
From: Rodrigo Vivi @ 2018-11-01 19:33 UTC (permalink / raw)
To: Radhakrishna Sripada; +Cc: intel-gfx, Paulo Zanoni
On Tue, Oct 30, 2018 at 03:27:35PM -0700, Rodrigo Vivi wrote:
> On Tue, Oct 30, 2018 at 01:45:02AM -0700, Radhakrishna Sripada wrote:
> > Display WA_1405510057 asks to not enable YUV 420 HDMI
> > 10bpc when horizontal blank size mod 8 reminder is 2.
> >
> > V2: Rebase(r-b: Anusha)
> > V3: crtc_state->s/ycbcr420/output_format/
> >
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
pushed to dinq. thanks for patches and reviews.
>
> > ---
> > drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > index 129b880bce64..6c6c4dd12fd5 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > struct drm_atomic_state *state = crtc_state->base.state;
> > struct drm_connector_state *connector_state;
> > struct drm_connector *connector;
> > + const struct drm_display_mode *adjusted_mode =
> > + &crtc_state->base.adjusted_mode;
> > int i;
> >
> > if (HAS_GMCH_DISPLAY(dev_priv))
> > @@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> >
> > /* Display WA #1139: glk */
> > if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > - crtc_state->base.adjusted_mode.htotal > 5460)
> > + adjusted_mode->htotal > 5460)
> > + return false;
> > +
> > + /* Display Wa_1405510057:icl */
> > + if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > + bpc == 10 && IS_ICELAKE(dev_priv) &&
> > + (adjusted_mode->crtc_hblank_end -
> > + adjusted_mode->crtc_hblank_start) % 8 == 2)
> > return false;
> >
> > return true;
> > --
> > 2.9.3
> >
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-11-01 19:33 ` Rodrigo Vivi
@ 2018-11-01 23:52 ` Imre Deak
2018-11-02 0:34 ` Rodrigo Vivi
0 siblings, 1 reply; 20+ messages in thread
From: Imre Deak @ 2018-11-01 23:52 UTC (permalink / raw)
To: Rodrigo Vivi, Ville Syrjälä; +Cc: intel-gfx, Paulo Zanoni
On Thu, Nov 01, 2018 at 12:33:04PM -0700, Rodrigo Vivi wrote:
> On Tue, Oct 30, 2018 at 03:27:35PM -0700, Rodrigo Vivi wrote:
> > On Tue, Oct 30, 2018 at 01:45:02AM -0700, Radhakrishna Sripada wrote:
> > > Display WA_1405510057 asks to not enable YUV 420 HDMI
> > > 10bpc when horizontal blank size mod 8 reminder is 2.
> > >
> > > V2: Rebase(r-b: Anusha)
> > > V3: crtc_state->s/ycbcr420/output_format/
> > >
> > > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> >
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> pushed to dinq. thanks for patches and reviews.
I think there was a wrong conflict resolution in this push:
commit 0992e781d7ce707889d81f8e349ce1561392493f
Merge: 10cf4fd63eed f57f9371e285
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Thu Nov 1 12:43:25 2018 -0700
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip
# Conflicts:
# drivers/gpu/drm/i915/i915_debugfs.c
# drivers/gpu/drm/i915/i915_irq.c
# drivers/gpu/drm/i915/intel_csr.c
# drivers/gpu/drm/i915/intel_display.c
# drivers/gpu/drm/i915/intel_dp.c
# drivers/gpu/drm/i915/intel_dp_mst.c
# drivers/gpu/drm/i915/intel_drv.h
diff --cc drivers/gpu/drm/i915/intel_display.c
index 9741cc419e1b,3618d3affc89..532178763fa1
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -15701,14 -15414,18 +15414,25 @@@ static void readout_plane_state(struct
crtc_state = to_intel_crtc_state(crtc->base.state);
intel_set_plane_visible(crtc_state, plane_state, visible);
+
+ DRM_DEBUG_KMS("[PLANE:%d:%s] hw state readout: %s, pipe %c\n",
+ plane->base.base.id, plane->base.name,
+ enableddisabled(visible), pipe_name(pipe));
+ }
+
+ for_each_intel_crtc(&dev_priv->drm, crtc) {
+ struct intel_crtc_state *crtc_state =
+ to_intel_crtc_state(crtc->base.state);
+
+ fixup_active_planes(crtc_state);
}
+
+ for_each_intel_crtc(&dev_priv->drm, crtc) {
+ struct intel_crtc_state *crtc_state =
+ to_intel_crtc_state(crtc->base.state);
+
+ fixup_active_planes(crtc_state);
+ }
}
static void intel_modeset_readout_hw_state(struct drm_device *dev)
I'm resolving it with keeping only one of the for_each_intel_crtc()
loop.
>
> >
> > > ---
> > > drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
> > > 1 file changed, 10 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > > index 129b880bce64..6c6c4dd12fd5 100644
> > > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > > @@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > > struct drm_atomic_state *state = crtc_state->base.state;
> > > struct drm_connector_state *connector_state;
> > > struct drm_connector *connector;
> > > + const struct drm_display_mode *adjusted_mode =
> > > + &crtc_state->base.adjusted_mode;
> > > int i;
> > >
> > > if (HAS_GMCH_DISPLAY(dev_priv))
> > > @@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > >
> > > /* Display WA #1139: glk */
> > > if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > > - crtc_state->base.adjusted_mode.htotal > 5460)
> > > + adjusted_mode->htotal > 5460)
> > > + return false;
> > > +
> > > + /* Display Wa_1405510057:icl */
> > > + if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > > + bpc == 10 && IS_ICELAKE(dev_priv) &&
> > > + (adjusted_mode->crtc_hblank_end -
> > > + adjusted_mode->crtc_hblank_start) % 8 == 2)
> > > return false;
> > >
> > > return true;
> > > --
> > > 2.9.3
> > >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-11-01 23:52 ` Imre Deak
@ 2018-11-02 0:34 ` Rodrigo Vivi
2018-11-02 1:08 ` Imre Deak
0 siblings, 1 reply; 20+ messages in thread
From: Rodrigo Vivi @ 2018-11-02 0:34 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx, Paulo Zanoni
On Fri, Nov 02, 2018 at 01:52:20AM +0200, Imre Deak wrote:
> On Thu, Nov 01, 2018 at 12:33:04PM -0700, Rodrigo Vivi wrote:
> > On Tue, Oct 30, 2018 at 03:27:35PM -0700, Rodrigo Vivi wrote:
> > > On Tue, Oct 30, 2018 at 01:45:02AM -0700, Radhakrishna Sripada wrote:
> > > > Display WA_1405510057 asks to not enable YUV 420 HDMI
> > > > 10bpc when horizontal blank size mod 8 reminder is 2.
> > > >
> > > > V2: Rebase(r-b: Anusha)
> > > > V3: crtc_state->s/ycbcr420/output_format/
> > > >
> > > > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > > > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> > >
> > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >
> > pushed to dinq. thanks for patches and reviews.
>
> I think there was a wrong conflict resolution in this push:
>
> commit 0992e781d7ce707889d81f8e349ce1561392493f
> Merge: 10cf4fd63eed f57f9371e285
> Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Date: Thu Nov 1 12:43:25 2018 -0700
>
> Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip
>
> # Conflicts:
> # drivers/gpu/drm/i915/i915_debugfs.c
> # drivers/gpu/drm/i915/i915_irq.c
> # drivers/gpu/drm/i915/intel_csr.c
> # drivers/gpu/drm/i915/intel_display.c
> # drivers/gpu/drm/i915/intel_dp.c
> # drivers/gpu/drm/i915/intel_dp_mst.c
> # drivers/gpu/drm/i915/intel_drv.h
>
> diff --cc drivers/gpu/drm/i915/intel_display.c
> index 9741cc419e1b,3618d3affc89..532178763fa1
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@@ -15701,14 -15414,18 +15414,25 @@@ static void readout_plane_state(struct
> crtc_state = to_intel_crtc_state(crtc->base.state);
>
> intel_set_plane_visible(crtc_state, plane_state, visible);
> +
> + DRM_DEBUG_KMS("[PLANE:%d:%s] hw state readout: %s, pipe %c\n",
> + plane->base.base.id, plane->base.name,
> + enableddisabled(visible), pipe_name(pipe));
> + }
> +
> + for_each_intel_crtc(&dev_priv->drm, crtc) {
> + struct intel_crtc_state *crtc_state =
> + to_intel_crtc_state(crtc->base.state);
> +
> + fixup_active_planes(crtc_state);
> }
> +
> + for_each_intel_crtc(&dev_priv->drm, crtc) {
> + struct intel_crtc_state *crtc_state =
> + to_intel_crtc_state(crtc->base.state);
> +
> + fixup_active_planes(crtc_state);
> + }
> }
>
> static void intel_modeset_readout_hw_state(struct drm_device *dev)
>
> I'm resolving it with keeping only one of the for_each_intel_crtc()
> loop.
ops, my bad.
and it was the third or forth time I was solving this same conflict
in 1 week and got excess of confidence :/
>
> >
> > >
> > > > ---
> > > > drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
> > > > 1 file changed, 10 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > > > index 129b880bce64..6c6c4dd12fd5 100644
> > > > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > > > @@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > > > struct drm_atomic_state *state = crtc_state->base.state;
> > > > struct drm_connector_state *connector_state;
> > > > struct drm_connector *connector;
> > > > + const struct drm_display_mode *adjusted_mode =
> > > > + &crtc_state->base.adjusted_mode;
> > > > int i;
> > > >
> > > > if (HAS_GMCH_DISPLAY(dev_priv))
> > > > @@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > > >
> > > > /* Display WA #1139: glk */
> > > > if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > > > - crtc_state->base.adjusted_mode.htotal > 5460)
> > > > + adjusted_mode->htotal > 5460)
> > > > + return false;
> > > > +
> > > > + /* Display Wa_1405510057:icl */
> > > > + if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > > > + bpc == 10 && IS_ICELAKE(dev_priv) &&
> > > > + (adjusted_mode->crtc_hblank_end -
> > > > + adjusted_mode->crtc_hblank_start) % 8 == 2)
> > > > return false;
> > > >
> > > > return true;
> > > > --
> > > > 2.9.3
> > > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057
2018-11-02 0:34 ` Rodrigo Vivi
@ 2018-11-02 1:08 ` Imre Deak
0 siblings, 0 replies; 20+ messages in thread
From: Imre Deak @ 2018-11-02 1:08 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx, Paulo Zanoni
On Thu, Nov 01, 2018 at 05:34:14PM -0700, Rodrigo Vivi wrote:
> On Fri, Nov 02, 2018 at 01:52:20AM +0200, Imre Deak wrote:
> > On Thu, Nov 01, 2018 at 12:33:04PM -0700, Rodrigo Vivi wrote:
> > > On Tue, Oct 30, 2018 at 03:27:35PM -0700, Rodrigo Vivi wrote:
> > > > On Tue, Oct 30, 2018 at 01:45:02AM -0700, Radhakrishna Sripada wrote:
> > > > > Display WA_1405510057 asks to not enable YUV 420 HDMI
> > > > > 10bpc when horizontal blank size mod 8 reminder is 2.
> > > > >
> > > > > V2: Rebase(r-b: Anusha)
> > > > > V3: crtc_state->s/ycbcr420/output_format/
> > > > >
> > > > > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > > > > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> > > >
> > > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > >
> > > pushed to dinq. thanks for patches and reviews.
> >
> > I think there was a wrong conflict resolution in this push:
> >
> > commit 0992e781d7ce707889d81f8e349ce1561392493f
> > Merge: 10cf4fd63eed f57f9371e285
> > Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Date: Thu Nov 1 12:43:25 2018 -0700
> >
> > Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip
> >
> > # Conflicts:
> > # drivers/gpu/drm/i915/i915_debugfs.c
> > # drivers/gpu/drm/i915/i915_irq.c
> > # drivers/gpu/drm/i915/intel_csr.c
> > # drivers/gpu/drm/i915/intel_display.c
> > # drivers/gpu/drm/i915/intel_dp.c
> > # drivers/gpu/drm/i915/intel_dp_mst.c
> > # drivers/gpu/drm/i915/intel_drv.h
> >
> > diff --cc drivers/gpu/drm/i915/intel_display.c
> > index 9741cc419e1b,3618d3affc89..532178763fa1
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@@ -15701,14 -15414,18 +15414,25 @@@ static void readout_plane_state(struct
> > crtc_state = to_intel_crtc_state(crtc->base.state);
> >
> > intel_set_plane_visible(crtc_state, plane_state, visible);
> > +
> > + DRM_DEBUG_KMS("[PLANE:%d:%s] hw state readout: %s, pipe %c\n",
> > + plane->base.base.id, plane->base.name,
> > + enableddisabled(visible), pipe_name(pipe));
> > + }
> > +
> > + for_each_intel_crtc(&dev_priv->drm, crtc) {
> > + struct intel_crtc_state *crtc_state =
> > + to_intel_crtc_state(crtc->base.state);
> > +
> > + fixup_active_planes(crtc_state);
> > }
> > +
> > + for_each_intel_crtc(&dev_priv->drm, crtc) {
> > + struct intel_crtc_state *crtc_state =
> > + to_intel_crtc_state(crtc->base.state);
> > +
> > + fixup_active_planes(crtc_state);
> > + }
> > }
> >
> > static void intel_modeset_readout_hw_state(struct drm_device *dev)
> >
> > I'm resolving it with keeping only one of the for_each_intel_crtc()
> > loop.
>
> ops, my bad.
>
> and it was the third or forth time I was solving this same conflict
> in 1 week and got excess of confidence :/
Hm, wonder why rerere doesn't pick it up.
>
> >
> > >
> > > >
> > > > > ---
> > > > > drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++++-
> > > > > 1 file changed, 10 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > > > > index 129b880bce64..6c6c4dd12fd5 100644
> > > > > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > > > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > > > > @@ -1595,6 +1595,8 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > > > > struct drm_atomic_state *state = crtc_state->base.state;
> > > > > struct drm_connector_state *connector_state;
> > > > > struct drm_connector *connector;
> > > > > + const struct drm_display_mode *adjusted_mode =
> > > > > + &crtc_state->base.adjusted_mode;
> > > > > int i;
> > > > >
> > > > > if (HAS_GMCH_DISPLAY(dev_priv))
> > > > > @@ -1643,7 +1645,14 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
> > > > >
> > > > > /* Display WA #1139: glk */
> > > > > if (bpc == 12 && IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > > > > - crtc_state->base.adjusted_mode.htotal > 5460)
> > > > > + adjusted_mode->htotal > 5460)
> > > > > + return false;
> > > > > +
> > > > > + /* Display Wa_1405510057:icl */
> > > > > + if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> > > > > + bpc == 10 && IS_ICELAKE(dev_priv) &&
> > > > > + (adjusted_mode->crtc_hblank_end -
> > > > > + adjusted_mode->crtc_hblank_start) % 8 == 2)
> > > > > return false;
> > > > >
> > > > > return true;
> > > > > --
> > > > > 2.9.3
> > > > >
> > > > _______________________________________________
> > > > Intel-gfx mailing list
> > > > Intel-gfx@lists.freedesktop.org
> > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2018-11-02 1:08 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 8:45 [PATCH v3 1/4] drm/i915/icl: Add WaEnable32PlaneMode Radhakrishna Sripada
2018-10-30 8:45 ` [PATCH v3 2/4] drm/i915/icl: Implement Display WA_1405510057 Radhakrishna Sripada
2018-10-30 9:17 ` kbuild test robot
2018-10-30 9:30 ` kbuild test robot
2018-10-30 22:35 ` Rodrigo Vivi
2018-10-31 18:54 ` Radhakrishna Sripada
2018-10-30 22:27 ` Rodrigo Vivi
2018-11-01 19:33 ` Rodrigo Vivi
2018-11-01 23:52 ` Imre Deak
2018-11-02 0:34 ` Rodrigo Vivi
2018-11-02 1:08 ` Imre Deak
2018-10-30 8:45 ` [PATCH v3 3/4] drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7 Radhakrishna Sripada
2018-10-31 18:59 ` Srivatsa, Anusha
2018-10-30 8:45 ` [PATCH v3 4/4] drm/i915/icl: WaAllowUMDToModifySamplerMode Radhakrishna Sripada
2018-10-30 9:12 ` Chris Wilson
2018-10-30 9:20 ` Chris Wilson
2018-10-31 18:50 ` Srivatsa, Anusha
2018-10-30 9:18 ` ✗ Fi.CI.BAT: failure for series starting with [v3,1/4] drm/i915/icl: Add WaEnable32PlaneMode Patchwork
2018-10-31 20:02 ` ✓ Fi.CI.BAT: success " Patchwork
2018-11-01 5:02 ` ✓ Fi.CI.IGT: " Patchwork
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.