* [Intel-gfx] [PATCH 0/3] More DMC cleanup
@ 2021-05-21 19:51 Anusha Srivatsa
2021-05-21 19:51 ` [Intel-gfx] [PATCH 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2021-05-21 19:51 UTC (permalink / raw)
To: intel-gfx
Last of prep patches before Pipe DMC patches
can land.
v2: Add struct intel_dmc to intel_dmc.h in a separate
patch
v3: Minor code shuffling and indentation fixes.
Anusha Srivatsa (3):
drm/i915/dmc: s/DRM_ERROR/drm_err
drm/i915/dmc: Add intel_dmc_has_payload() helper
drm/i915/dmc: Move struct intel_dmc to intel_dmc.h
.../drm/i915/display/intel_display_debugfs.c | 4 +-
.../drm/i915/display/intel_display_power.c | 16 ++---
drivers/gpu/drm/i915/display/intel_dmc.c | 61 +++++++++++--------
drivers/gpu/drm/i915/display/intel_dmc.h | 22 +++++++
drivers/gpu/drm/i915/i915_drv.h | 18 +-----
drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
6 files changed, 69 insertions(+), 54 deletions(-)
--
2.25.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* [Intel-gfx] [PATCH 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa @ 2021-05-21 19:51 ` Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa ` (4 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Anusha Srivatsa @ 2021-05-21 19:51 UTC (permalink / raw) To: intel-gfx; +Cc: Lucas De Marchi Use new format of debug messages across intel_csr. While at it, change some function definitions which now need dev_priv for drm_err and drm_info etc. v2: use container_of() (Jani) v3: Indentation fixes. (Jani) Cc: Jani Nikula <jani.nikula@linux.intel.com> Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_dmc.c | 48 +++++++++++++----------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 560574dd929a..5887453ff302 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -395,6 +395,7 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, const struct intel_dmc_header_base *dmc_header, size_t rem_size) { + struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc); unsigned int header_len_bytes, dmc_header_size, payload_size, i; const u32 *mmioaddr, *mmiodata; u32 mmio_count, mmio_count_max; @@ -439,28 +440,28 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, header_len_bytes = dmc_header->header_len; dmc_header_size = sizeof(*v1); } else { - DRM_ERROR("Unknown DMC fw header version: %u\n", - dmc_header->header_ver); + drm_err(&i915->drm, "Unknown DMC fw header version: %u\n", + dmc_header->header_ver); return 0; } if (header_len_bytes != dmc_header_size) { - DRM_ERROR("DMC firmware has wrong dmc header length " - "(%u bytes)\n", header_len_bytes); + drm_err(&i915->drm, "DMC firmware has wrong dmc header length " + "(%u bytes)\n", header_len_bytes); return 0; } /* Cache the dmc header info. */ if (mmio_count > mmio_count_max) { - DRM_ERROR("DMC firmware has wrong mmio count %u\n", mmio_count); + drm_err(&i915->drm, "DMC firmware has wrong mmio count %u\n", mmio_count); return 0; } for (i = 0; i < mmio_count; i++) { if (mmioaddr[i] < DMC_MMIO_START_RANGE || mmioaddr[i] > DMC_MMIO_END_RANGE) { - DRM_ERROR("DMC firmware has wrong mmio address 0x%x\n", - mmioaddr[i]); + drm_err(&i915->drm, "DMC firmware has wrong mmio address 0x%x\n", + mmioaddr[i]); return 0; } dmc->mmioaddr[i] = _MMIO(mmioaddr[i]); @@ -476,14 +477,14 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, goto error_truncated; if (payload_size > dmc->max_fw_size) { - DRM_ERROR("DMC FW too big (%u bytes)\n", payload_size); + drm_err(&i915->drm, "DMC FW too big (%u bytes)\n", payload_size); return 0; } dmc->dmc_fw_size = dmc_header->fw_size; dmc->dmc_payload = kmalloc(payload_size, GFP_KERNEL); if (!dmc->dmc_payload) { - DRM_ERROR("Memory allocation failed for dmc payload\n"); + drm_err(&i915->drm, "Memory allocation failed for dmc payload\n"); return 0; } @@ -493,7 +494,7 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc, return header_len_bytes + payload_size; error_truncated: - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&i915->drm, "Truncated DMC firmware, refusing.\n"); return 0; } @@ -503,6 +504,7 @@ parse_dmc_fw_package(struct intel_dmc *dmc, const struct stepping_info *si, size_t rem_size) { + struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc); u32 package_size = sizeof(struct intel_package_header); u32 num_entries, max_entries, dmc_offset; const struct intel_fw_info *fw_info; @@ -515,8 +517,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc, } else if (package_header->header_ver == 2) { max_entries = PACKAGE_V2_MAX_FW_INFO_ENTRIES; } else { - DRM_ERROR("DMC firmware has unknown header version %u\n", - package_header->header_ver); + drm_err(&i915->drm, "DMC firmware has unknown header version %u\n", + package_header->header_ver); return 0; } @@ -529,8 +531,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc, goto error_truncated; if (package_header->header_len * 4 != package_size) { - DRM_ERROR("DMC firmware has wrong package header length " - "(%u bytes)\n", package_size); + drm_err(&i915->drm, "DMC firmware has wrong package header length " + "(%u bytes)\n", package_size); return 0; } @@ -543,8 +545,8 @@ parse_dmc_fw_package(struct intel_dmc *dmc, dmc_offset = find_dmc_fw_offset(fw_info, num_entries, si, package_header->header_ver); if (dmc_offset == DMC_DEFAULT_FW_OFFSET) { - DRM_ERROR("DMC firmware not supported for %c stepping\n", - si->stepping); + drm_err(&i915->drm, "DMC firmware not supported for %c stepping\n", + si->stepping); return 0; } @@ -552,7 +554,7 @@ parse_dmc_fw_package(struct intel_dmc *dmc, return package_size + dmc_offset * 4; error_truncated: - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&i915->drm, "Truncated DMC firmware, refusing.\n"); return 0; } @@ -561,22 +563,24 @@ static u32 parse_dmc_fw_css(struct intel_dmc *dmc, struct intel_css_header *css_header, size_t rem_size) { + struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc); + if (rem_size < sizeof(struct intel_css_header)) { - DRM_ERROR("Truncated DMC firmware, refusing.\n"); + drm_err(&i915->drm, "Truncated DMC firmware, refusing.\n"); return 0; } if (sizeof(struct intel_css_header) != (css_header->header_len * 4)) { - DRM_ERROR("DMC firmware has wrong CSS header length " - "(%u bytes)\n", - (css_header->header_len * 4)); + drm_err(&i915->drm, "DMC firmware has wrong CSS header length " + "(%u bytes)\n", + (css_header->header_len * 4)); return 0; } if (dmc->required_version && css_header->version != dmc->required_version) { - DRM_INFO("Refusing to load DMC firmware v%u.%u," + drm_info(&i915->drm, "Refusing to load DMC firmware v%u.%u," " please use v%u.%u\n", DMC_VERSION_MAJOR(css_header->version), DMC_VERSION_MINOR(css_header->version), -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa @ 2021-05-21 19:51 ` Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa ` (3 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Anusha Srivatsa @ 2021-05-21 19:51 UTC (permalink / raw) To: intel-gfx; +Cc: Lucas De Marchi We check for dmc_payload being there at various points in the driver. Replace it with the helper. v2: rebased. v3: Move intel_dmc to intel_dmc.h in another patch (Lucas) v4: Remove headers not needed from intel_dmc.h Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> --- .../gpu/drm/i915/display/intel_display_debugfs.c | 4 ++-- .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++-------- drivers/gpu/drm/i915/display/intel_dmc.c | 13 +++++++++---- drivers/gpu/drm/i915/display/intel_dmc.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 94e5cbd86e77..88bb05d5c483 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -542,10 +542,10 @@ static int i915_dmc_info(struct seq_file *m, void *unused) wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); - seq_printf(m, "fw loaded: %s\n", yesno(dmc->dmc_payload)); + seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv))); seq_printf(m, "path: %s\n", dmc->fw_path); - if (!dmc->dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) goto out; seq_printf(m, "version: %d.%d\n", DMC_VERSION_MAJOR(dmc->version), diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 991ceea06a07..b546672c9b00 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1220,7 +1220,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv, struct i915_power_well *power_well) { - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) return; switch (dev_priv->dmc.target_dc_state) { @@ -5579,7 +5579,7 @@ static void skl_display_core_init(struct drm_i915_private *dev_priv, gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5646,7 +5646,7 @@ static void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5712,7 +5712,7 @@ static void cnl_display_core_init(struct drm_i915_private *dev_priv, bool resume /* 6. Enable DBUF */ gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5869,7 +5869,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv, if (DISPLAY_VER(dev_priv) >= 12) tgl_bw_buddy_init(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); /* Wa_14011508470 */ @@ -6230,7 +6230,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915, */ if (!(i915->dmc.allowed_dc_mask & DC_STATE_EN_DC9) && suspend_mode == I915_DRM_SUSPEND_IDLE && - i915->dmc.dmc_payload) { + intel_dmc_has_payload(i915)) { intel_display_power_flush_work(i915); intel_power_domains_verify_state(i915); return; @@ -6420,7 +6420,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) if (DISPLAY_VER(i915) >= 11) { bxt_disable_dc9(i915); icl_display_core_init(i915, true); - if (i915->dmc.dmc_payload) { + if (intel_dmc_has_payload(i915)) { if (i915->dmc.allowed_dc_mask & DC_STATE_EN_UPTO_DC6) skl_enable_dc6(i915); @@ -6431,7 +6431,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { bxt_disable_dc9(i915); bxt_display_core_init(i915, true); - if (i915->dmc.dmc_payload && + if (intel_dmc_has_payload(i915) && (i915->dmc.allowed_dc_mask & DC_STATE_EN_UPTO_DC5)) gen9_enable_dc5(i915); } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) { diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 5887453ff302..0e87251b3d4c 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -237,6 +237,11 @@ struct stepping_info { char substepping; }; +bool intel_dmc_has_payload(struct drm_i915_private *dev_priv) +{ + return dev_priv->dmc.dmc_payload; +} + static const struct stepping_info skl_stepping_info[] = { {'A', '0'}, {'B', '0'}, {'C', '0'}, {'D', '0'}, {'E', '0'}, {'F', '0'}, @@ -320,7 +325,7 @@ void intel_dmc_load_program(struct drm_i915_private *dev_priv) return; } - if (!dev_priv->dmc.dmc_payload) { + if (!intel_dmc_has_payload(dev_priv)) { drm_err(&dev_priv->drm, "Tried to program CSR with empty payload\n"); return; @@ -656,7 +661,7 @@ static void dmc_load_work_fn(struct work_struct *work) request_firmware(&fw, dev_priv->dmc.fw_path, dev_priv->drm.dev); parse_dmc_fw(dev_priv, fw); - if (dev_priv->dmc.dmc_payload) { + if (intel_dmc_has_payload(dev_priv)) { intel_dmc_load_program(dev_priv); intel_dmc_runtime_pm_put(dev_priv); @@ -785,7 +790,7 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv) flush_work(&dev_priv->dmc.work); /* Drop the reference held in case DMC isn't loaded. */ - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) intel_dmc_runtime_pm_put(dev_priv); } @@ -805,7 +810,7 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv) * Reacquire the reference to keep RPM disabled in case DMC isn't * loaded. */ - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) intel_dmc_runtime_pm_get(dev_priv); } diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h index 57dd99da0ced..64816f4a71b6 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.h +++ b/drivers/gpu/drm/i915/display/intel_dmc.h @@ -17,5 +17,6 @@ void intel_dmc_load_program(struct drm_i915_private *i915); void intel_dmc_ucode_fini(struct drm_i915_private *i915); void intel_dmc_ucode_suspend(struct drm_i915_private *i915); void intel_dmc_ucode_resume(struct drm_i915_private *i915); +bool intel_dmc_has_payload(struct drm_i915_private *i915); #endif /* __INTEL_DMC_H__ */ diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 8b964e355cb5..833d3e8b7631 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -792,7 +792,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, struct intel_dmc *dmc = &m->i915->dmc; err_printf(m, "DMC loaded: %s\n", - yesno(dmc->dmc_payload)); + yesno(intel_dmc_has_payload(m->i915) != 0)); err_printf(m, "DMC fw version: %d.%d\n", DMC_VERSION_MAJOR(dmc->version), DMC_VERSION_MINOR(dmc->version)); -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa @ 2021-05-21 19:51 ` Anusha Srivatsa 2021-05-21 20:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for More DMC cleanup (rev3) Patchwork ` (2 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Anusha Srivatsa @ 2021-05-21 19:51 UTC (permalink / raw) To: intel-gfx Move struct intel_dmc from i915_drv.h to intel_dmc.h. v2: Add includes along with moving the struct. Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/display/intel_dmc.h | 21 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 18 +----------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h index 64816f4a71b6..8baeb85cf8db 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.h +++ b/drivers/gpu/drm/i915/display/intel_dmc.h @@ -6,12 +6,33 @@ #ifndef __INTEL_DMC_H__ #define __INTEL_DMC_H__ +#include <drm/drm_util.h> +#include "intel_wakeref.h" +#include "i915_reg.h" + struct drm_i915_private; #define DMC_VERSION(major, minor) ((major) << 16 | (minor)) #define DMC_VERSION_MAJOR(version) ((version) >> 16) #define DMC_VERSION_MINOR(version) ((version) & 0xffff) +struct intel_dmc { + struct work_struct work; + const char *fw_path; + u32 required_version; + u32 max_fw_size; /* bytes */ + u32 *dmc_payload; + u32 dmc_fw_size; /* dwords */ + u32 version; + u32 mmio_count; + i915_reg_t mmioaddr[20]; + u32 mmiodata[20]; + u32 dc_state; + u32 target_dc_state; + u32 allowed_dc_mask; + intel_wakeref_t wakeref; +}; + void intel_dmc_ucode_init(struct drm_i915_private *i915); void intel_dmc_load_program(struct drm_i915_private *i915); void intel_dmc_ucode_fini(struct drm_i915_private *i915); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9cb02618ba15..b5962768a1f1 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -67,6 +67,7 @@ #include "display/intel_bios.h" #include "display/intel_display.h" #include "display/intel_display_power.h" +#include "display/intel_dmc.h" #include "display/intel_dpll_mgr.h" #include "display/intel_dsb.h" #include "display/intel_frontbuffer.h" @@ -328,23 +329,6 @@ struct drm_i915_display_funcs { void (*read_luts)(struct intel_crtc_state *crtc_state); }; -struct intel_dmc { - struct work_struct work; - const char *fw_path; - u32 required_version; - u32 max_fw_size; /* bytes */ - u32 *dmc_payload; - u32 dmc_fw_size; /* dwords */ - u32 version; - u32 mmio_count; - i915_reg_t mmioaddr[20]; - u32 mmiodata[20]; - u32 dc_state; - u32 target_dc_state; - u32 allowed_dc_mask; - intel_wakeref_t wakeref; -}; - enum i915_cache_level { I915_CACHE_NONE = 0, I915_CACHE_LLC, /* also used for snoopable memory on non-LLC */ -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for More DMC cleanup (rev3) 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa ` (2 preceding siblings ...) 2021-05-21 19:51 ` [Intel-gfx] [PATCH 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa @ 2021-05-21 20:01 ` Patchwork 2021-05-21 20:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-24 4:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2021-05-21 20:01 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx == Series Details == Series: More DMC cleanup (rev3) URL : https://patchwork.freedesktop.org/series/90379/ State : warning == Summary == $ dim checkpatch origin/drm-tip fff364de84b7 drm/i915/dmc: s/DRM_ERROR/drm_err -:80: WARNING:OOM_MESSAGE: Possible unnecessary 'out of memory' message #80: FILE: drivers/gpu/drm/i915/display/intel_dmc.c:487: if (!dmc->dmc_payload) { + drm_err(&i915->drm, "Memory allocation failed for dmc payload\n"); total: 0 errors, 1 warnings, 0 checks, 140 lines checked e297b14bd44f drm/i915/dmc: Add intel_dmc_has_payload() helper 73d9b38058d5 drm/i915/dmc: Move struct intel_dmc to intel_dmc.h _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for More DMC cleanup (rev3) 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa ` (3 preceding siblings ...) 2021-05-21 20:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for More DMC cleanup (rev3) Patchwork @ 2021-05-21 20:30 ` Patchwork 2021-05-24 4:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2021-05-21 20:30 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 5802 bytes --] == Series Details == Series: More DMC cleanup (rev3) URL : https://patchwork.freedesktop.org/series/90379/ State : success == Summary == CI Bug Log - changes from CI_DRM_10120 -> Patchwork_20174 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/index.html Known issues ------------ Here are the changes found in Patchwork_20174 that come from known issues: ### IGT changes ### #### Possible fixes #### * igt@kms_frontbuffer_tracking@basic: - fi-icl-u2: [FAIL][1] ([i915#49]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html #### Warnings #### * igt@i915_selftest@live@execlists: - fi-bsw-nick: [INCOMPLETE][3] ([i915#2782] / [i915#2940] / [i915#3462]) -> [DMESG-FAIL][4] ([i915#3462]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-bsw-nick/igt@i915_selftest@live@execlists.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-bsw-nick/igt@i915_selftest@live@execlists.html * igt@runner@aborted: - fi-glk-dsi: [FAIL][5] ([i915#2426] / [i915#3363] / [k.org#202321]) -> [FAIL][6] ([i915#3363] / [k.org#202321]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-glk-dsi/igt@runner@aborted.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-glk-dsi/igt@runner@aborted.html - fi-kbl-r: [FAIL][7] ([i915#1436] / [i915#3363]) -> [FAIL][8] ([i915#1436] / [i915#2426] / [i915#3363]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-kbl-r/igt@runner@aborted.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-kbl-r/igt@runner@aborted.html - fi-bdw-5557u: [FAIL][9] ([i915#3462]) -> [FAIL][10] ([i915#1602] / [i915#2029]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-bdw-5557u/igt@runner@aborted.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-bdw-5557u/igt@runner@aborted.html - fi-kbl-soraka: [FAIL][11] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][12] ([i915#1436] / [i915#3363]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-kbl-soraka/igt@runner@aborted.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-kbl-soraka/igt@runner@aborted.html - fi-cml-u2: [FAIL][13] ([i915#2082] / [i915#2426] / [i915#3363] / [i915#3462]) -> [FAIL][14] ([i915#3363] / [i915#3462]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-cml-u2/igt@runner@aborted.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-cml-u2/igt@runner@aborted.html - fi-skl-6700k2: [FAIL][15] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][16] ([i915#1436] / [i915#3363]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-skl-6700k2/igt@runner@aborted.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/fi-skl-6700k2/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602 [i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029 [i915#2082]: https://gitlab.freedesktop.org/drm/intel/issues/2082 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426 [i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782 [i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#3276]: https://gitlab.freedesktop.org/drm/intel/issues/3276 [i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283 [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291 [i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301 [i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363 [i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462 [i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321 Participating hosts (41 -> 39) ------------------------------ Additional (1): fi-rkl-11500t Missing (3): fi-bsw-cyan fi-bdw-samus fi-hsw-4200u Build changes ------------- * Linux: CI_DRM_10120 -> Patchwork_20174 CI-20190529: 20190529 CI_DRM_10120: 9221d50d353487d2e10226318d89027037255621 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6091: a7016bde81f6e6ee9f2ded3c091c56766a6adc46 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_20174: 73d9b38058d55588d18150b9465e97204df40b77 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 73d9b38058d5 drm/i915/dmc: Move struct intel_dmc to intel_dmc.h e297b14bd44f drm/i915/dmc: Add intel_dmc_has_payload() helper fff364de84b7 drm/i915/dmc: s/DRM_ERROR/drm_err == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/index.html [-- Attachment #1.2: Type: text/html, Size: 7220 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] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for More DMC cleanup (rev3) 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa ` (4 preceding siblings ...) 2021-05-21 20:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork @ 2021-05-24 4:12 ` Patchwork 5 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2021-05-24 4:12 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 30245 bytes --] == Series Details == Series: More DMC cleanup (rev3) URL : https://patchwork.freedesktop.org/series/90379/ State : success == Summary == CI Bug Log - changes from CI_DRM_10120_full -> Patchwork_20174_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_20174_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_create@create-clear: - shard-glk: [PASS][1] -> [DMESG-FAIL][2] ([i915#118] / [i915#1888] / [i915#95]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk1/igt@gem_create@create-clear.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk5/igt@gem_create@create-clear.html * igt@gem_create@create-massive: - shard-skl: NOTRUN -> [DMESG-WARN][3] ([i915#3002]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@gem_create@create-massive.html * igt@gem_ctx_isolation@preservation-s3@vcs0: - shard-kbl: [PASS][4] -> [DMESG-WARN][5] ([i915#180]) +5 similar issues [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@gem_ctx_isolation@preservation-s3@vcs0.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@vcs0.html * igt@gem_ctx_persistence@legacy-engines-hostile-preempt: - shard-snb: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#1099]) +2 similar issues [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb2/igt@gem_ctx_persistence@legacy-engines-hostile-preempt.html * igt@gem_ctx_persistence@many-contexts: - shard-tglb: [PASS][7] -> [FAIL][8] ([i915#2410]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb1/igt@gem_ctx_persistence@many-contexts.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-tglb3/igt@gem_ctx_persistence@many-contexts.html * igt@gem_ctx_ringsize@active@bcs0: - shard-skl: [PASS][9] -> [INCOMPLETE][10] ([i915#3316]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl9/igt@gem_ctx_ringsize@active@bcs0.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@gem_ctx_ringsize@active@bcs0.html * igt@gem_exec_fair@basic-none@rcs0: - shard-glk: NOTRUN -> [FAIL][11] ([i915#2842]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk6/igt@gem_exec_fair@basic-none@rcs0.html * igt@gem_exec_fair@basic-none@vcs0: - shard-apl: NOTRUN -> [FAIL][12] ([i915#2842]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@gem_exec_fair@basic-none@vcs0.html * igt@gem_exec_fair@basic-pace@bcs0: - shard-tglb: [PASS][13] -> [FAIL][14] ([i915#2842]) +1 similar issue [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb5/igt@gem_exec_fair@basic-pace@bcs0.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-tglb5/igt@gem_exec_fair@basic-pace@bcs0.html * igt@gem_exec_fair@basic-pace@rcs0: - shard-kbl: NOTRUN -> [FAIL][15] ([i915#2842]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@gem_exec_fair@basic-pace@rcs0.html * igt@gem_exec_reloc@basic-wide-active@rcs0: - shard-snb: NOTRUN -> [FAIL][16] ([i915#2389]) +2 similar issues [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb7/igt@gem_exec_reloc@basic-wide-active@rcs0.html * igt@gem_mmap_gtt@cpuset-basic-small-copy: - shard-glk: [PASS][17] -> [INCOMPLETE][18] ([i915#2055] / [i915#3468]) +1 similar issue [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk4/igt@gem_mmap_gtt@cpuset-basic-small-copy.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk5/igt@gem_mmap_gtt@cpuset-basic-small-copy.html * igt@gem_mmap_gtt@fault-concurrent: - shard-snb: NOTRUN -> [INCOMPLETE][19] ([i915#3468]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb5/igt@gem_mmap_gtt@fault-concurrent.html * igt@gem_mmap_gtt@fault-concurrent-x: - shard-apl: NOTRUN -> [INCOMPLETE][20] ([i915#3468]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@gem_mmap_gtt@fault-concurrent-x.html * igt@gem_pwrite@basic-exhaustion: - shard-snb: NOTRUN -> [WARN][21] ([i915#2658]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb7/igt@gem_pwrite@basic-exhaustion.html * igt@gem_userptr_blits@set-cache-level: - shard-snb: NOTRUN -> [FAIL][22] ([i915#3324]) [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb7/igt@gem_userptr_blits@set-cache-level.html * igt@gen9_exec_parse@bb-large: - shard-apl: NOTRUN -> [FAIL][23] ([i915#3296]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@gen9_exec_parse@bb-large.html - shard-kbl: NOTRUN -> [FAIL][24] ([i915#3296]) [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@gen9_exec_parse@bb-large.html * igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp: - shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#1937]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html * igt@kms_ccs@pipe-c-bad-pixel-format: - shard-skl: NOTRUN -> [SKIP][26] ([fdo#109271] / [fdo#111304]) [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@kms_ccs@pipe-c-bad-pixel-format.html * igt@kms_chamelium@dp-frame-dump: - shard-skl: NOTRUN -> [SKIP][27] ([fdo#109271] / [fdo#111827]) +3 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@kms_chamelium@dp-frame-dump.html * igt@kms_chamelium@hdmi-hpd-with-enabled-mode: - shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271] / [fdo#111827]) +6 similar issues [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_chamelium@hdmi-hpd-with-enabled-mode.html * igt@kms_chamelium@vga-hpd: - shard-apl: NOTRUN -> [SKIP][29] ([fdo#109271] / [fdo#111827]) +17 similar issues [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl7/igt@kms_chamelium@vga-hpd.html - shard-glk: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827]) +4 similar issues [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk1/igt@kms_chamelium@vga-hpd.html * igt@kms_color@pipe-b-ctm-green-to-red: - shard-skl: [PASS][31] -> [DMESG-WARN][32] ([i915#1982]) [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl7/igt@kms_color@pipe-b-ctm-green-to-red.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@kms_color@pipe-b-ctm-green-to-red.html * igt@kms_color_chamelium@pipe-a-ctm-0-25: - shard-snb: NOTRUN -> [SKIP][33] ([fdo#109271] / [fdo#111827]) +25 similar issues [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb7/igt@kms_color_chamelium@pipe-a-ctm-0-25.html * igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen: - shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271]) +50 similar issues [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen.html * igt@kms_cursor_crc@pipe-d-cursor-64x21-random: - shard-glk: NOTRUN -> [SKIP][35] ([fdo#109271]) +44 similar issues [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk6/igt@kms_cursor_crc@pipe-d-cursor-64x21-random.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions: - shard-skl: [PASS][36] -> [FAIL][37] ([i915#2346]) [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html * igt@kms_flip@flip-vs-expired-vblank@c-edp1: - shard-skl: [PASS][38] -> [FAIL][39] ([i915#79]) [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl7/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl2/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html * igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2: - shard-glk: [PASS][40] -> [FAIL][41] ([i915#79]) [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk5/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html * igt@kms_flip@flip-vs-suspend@c-dp1: - shard-kbl: NOTRUN -> [DMESG-WARN][42] ([i915#180]) +2 similar issues [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@kms_flip@flip-vs-suspend@c-dp1.html * igt@kms_flip@flip-vs-suspend@c-edp1: - shard-skl: [PASS][43] -> [INCOMPLETE][44] ([i915#198]) [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl4/igt@kms_flip@flip-vs-suspend@c-edp1.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl9/igt@kms_flip@flip-vs-suspend@c-edp1.html * igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1: - shard-skl: [PASS][45] -> [FAIL][46] ([i915#2122]) +1 similar issue [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html * igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs: - shard-kbl: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#2672]) [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html - shard-skl: NOTRUN -> [SKIP][48] ([fdo#109271] / [i915#2672]) [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html * igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile: - shard-snb: NOTRUN -> [SKIP][49] ([fdo#109271]) +405 similar issues [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-snb7/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html * igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs: - shard-glk: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672]) [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk6/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html - shard-apl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#2672]) [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: NOTRUN -> [FAIL][52] ([i915#1188]) [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d: - shard-kbl: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#533]) [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html - shard-skl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#533]) [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html * igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence: - shard-glk: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#533]) [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk1/igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence.html * igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb: - shard-kbl: NOTRUN -> [FAIL][56] ([i915#265]) [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html - shard-skl: NOTRUN -> [FAIL][57] ([i915#265]) [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max: - shard-apl: NOTRUN -> [FAIL][58] ([fdo#108145] / [i915#265]) +2 similar issues [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl7/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2: - shard-skl: NOTRUN -> [SKIP][59] ([fdo#109271] / [i915#658]) [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl7/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3: - shard-glk: NOTRUN -> [SKIP][60] ([fdo#109271] / [i915#658]) [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk6/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5: - shard-apl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#658]) +5 similar issues [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl7/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5.html * igt@kms_psr2_su@frontbuffer: - shard-kbl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#658]) [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_psr2_su@frontbuffer.html * igt@kms_universal_plane@disable-primary-vs-flip-pipe-d: - shard-kbl: NOTRUN -> [SKIP][63] ([fdo#109271]) +69 similar issues [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_universal_plane@disable-primary-vs-flip-pipe-d.html * igt@kms_vblank@pipe-b-ts-continuation-suspend: - shard-kbl: [PASS][64] -> [INCOMPLETE][65] ([i915#155] / [i915#180] / [i915#2828]) [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@kms_vblank@pipe-b-ts-continuation-suspend.html [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl4/igt@kms_vblank@pipe-b-ts-continuation-suspend.html * igt@kms_vblank@pipe-d-wait-idle: - shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#533]) +4 similar issues [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl7/igt@kms_vblank@pipe-d-wait-idle.html * igt@kms_writeback@writeback-fb-id: - shard-kbl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#2437]) [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@kms_writeback@writeback-fb-id.html - shard-skl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#2437]) +1 similar issue [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@kms_writeback@writeback-fb-id.html * igt@kms_writeback@writeback-pixel-formats: - shard-glk: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#2437]) [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk6/igt@kms_writeback@writeback-pixel-formats.html - shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#2437]) [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@kms_writeback@writeback-pixel-formats.html * igt@perf@polling-small-buf: - shard-skl: NOTRUN -> [FAIL][71] ([i915#1722]) [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@perf@polling-small-buf.html * igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name: - shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271]) +181 similar issues [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html * igt@sysfs_clients@pidname: - shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2994]) +2 similar issues [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@sysfs_clients@pidname.html * igt@sysfs_clients@recycle: - shard-kbl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2994]) [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@sysfs_clients@recycle.html * igt@sysfs_heartbeat_interval@mixed@vcs0: - shard-skl: [PASS][75] -> [FAIL][76] ([i915#1731]) [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl3/igt@sysfs_heartbeat_interval@mixed@vcs0.html [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl2/igt@sysfs_heartbeat_interval@mixed@vcs0.html #### Possible fixes #### * igt@gem_exec_fair@basic-deadline: - shard-kbl: [FAIL][77] ([i915#2846]) -> [PASS][78] [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@gem_exec_fair@basic-deadline.html [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@gem_exec_fair@basic-deadline.html * igt@gem_exec_fair@basic-none-share@rcs0: - shard-tglb: [FAIL][79] ([i915#2842]) -> [PASS][80] +1 similar issue [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb1/igt@gem_exec_fair@basic-none-share@rcs0.html [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-tglb8/igt@gem_exec_fair@basic-none-share@rcs0.html * igt@gem_exec_fair@basic-pace@vecs0: - shard-glk: [FAIL][81] ([i915#2842]) -> [PASS][82] +1 similar issue [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk5/igt@gem_exec_fair@basic-pace@vecs0.html [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk7/igt@gem_exec_fair@basic-pace@vecs0.html * igt@gem_mmap_gtt@cpuset-basic-small-copy: - shard-skl: [INCOMPLETE][83] ([i915#198] / [i915#3468]) -> [PASS][84] [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl9/igt@gem_mmap_gtt@cpuset-basic-small-copy.html [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@gem_mmap_gtt@cpuset-basic-small-copy.html - shard-kbl: [INCOMPLETE][85] ([i915#3468]) -> [PASS][86] [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl2/igt@gem_mmap_gtt@cpuset-basic-small-copy.html [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@gem_mmap_gtt@cpuset-basic-small-copy.html * igt@gem_mmap_gtt@cpuset-basic-small-copy-xy: - shard-glk: [INCOMPLETE][87] ([i915#2055] / [i915#3468]) -> [PASS][88] [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk9/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk1/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html * igt@gem_workarounds@suspend-resume-fd: - shard-kbl: [DMESG-WARN][89] ([i915#180]) -> [PASS][90] +2 similar issues [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl7/igt@gem_workarounds@suspend-resume-fd.html [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@gem_workarounds@suspend-resume-fd.html * igt@gen9_exec_parse@allowed-single: - shard-skl: [DMESG-WARN][91] ([i915#1436] / [i915#716]) -> [PASS][92] [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl4/igt@gen9_exec_parse@allowed-single.html [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@gen9_exec_parse@allowed-single.html * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy: - shard-glk: [FAIL][93] ([i915#72]) -> [PASS][94] [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk7/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk9/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html * igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-ytiled: - shard-skl: [DMESG-WARN][95] ([i915#1982]) -> [PASS][96] [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl3/igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-ytiled.html [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl7/igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-ytiled.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2: - shard-glk: [FAIL][97] ([i915#79]) -> [PASS][98] [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk9/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk2/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html * igt@kms_hdr@bpc-switch-suspend: - shard-skl: [FAIL][99] ([i915#1188]) -> [PASS][100] [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl7/igt@kms_hdr@bpc-switch-suspend.html [100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl2/igt@kms_hdr@bpc-switch-suspend.html * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: - shard-skl: [INCOMPLETE][101] ([i915#198]) -> [PASS][102] [101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html [102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html #### Warnings #### * igt@gem_mmap_gtt@cpuset-basic-small-copy-xy: - shard-skl: [INCOMPLETE][103] ([i915#198] / [i915#3468]) -> [INCOMPLETE][104] ([i915#198]) [103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl2/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl2/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html * igt@gem_mmap_gtt@fault-concurrent-x: - shard-skl: [INCOMPLETE][105] ([i915#198]) -> [INCOMPLETE][106] ([i915#198] / [i915#3468]) [105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-skl7/igt@gem_mmap_gtt@fault-concurrent-x.html [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-skl3/igt@gem_mmap_gtt@fault-concurrent-x.html * igt@i915_selftest@live@execlists: - shard-tglb: [INCOMPLETE][107] ([i915#3462]) -> [DMESG-FAIL][108] ([i915#3462]) [107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb1/igt@i915_selftest@live@execlists.html [108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-tglb5/igt@i915_selftest@live@execlists.html * igt@i915_suspend@sysfs-reader: - shard-kbl: [INCOMPLETE][109] ([i915#155]) -> [DMESG-WARN][110] ([i915#180]) [109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl2/igt@i915_suspend@sysfs-reader.html [110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@i915_suspend@sysfs-reader.html * igt@runner@aborted: - shard-kbl: ([FAIL][111], [FAIL][112], [FAIL][113], [FAIL][114], [FAIL][115], [FAIL][116], [FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120], [FAIL][121], [FAIL][122], [FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#2292] / [i915#2722] / [i915#3002] / [i915#3363] / [i915#92]) -> ([FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133], [FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#2722] / [i915#3002] / [i915#3363] / [i915#602] / [i915#92]) [111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl3/igt@runner@aborted.html [114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl7/igt@runner@aborted.html [115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl1/igt@runner@aborted.html [117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl1/igt@runner@aborted.html [118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl1/igt@runner@aborted.html [119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl3/igt@runner@aborted.html [120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl3/igt@runner@aborted.html [121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl7/igt@runner@aborted.html [122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl2/igt@runner@aborted.html [124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl2/igt@runner@aborted.html [125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-kbl4/igt@runner@aborted.html [127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl2/igt@runner@aborted.html [129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl3/igt@runner@aborted.html [130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl4/igt@runner@aborted.html [132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl4/igt@runner@aborted.html [135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl7/igt@runner@aborted.html [137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl4/igt@runner@aborted.html [138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@runner@aborted.html [139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@runner@aborted.html [140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@runner@aborted.html [141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@runner@aborted.html [142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-kbl1/igt@runner@aborted.html - shard-apl: ([FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146]) ([i915#180] / [i915#2722] / [i915#3002] / [i915#3363]) -> ([FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150]) ([i915#2722] / [i915#3002] / [i915#3363]) [143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-apl1/igt@runner@aborted.html [144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-apl1/igt@runner@aborted.html [145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-apl7/igt@runner@aborted.html [146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-apl6/igt@runner@aborted.html [147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@runner@aborted.html [148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl1/igt@runner@aborted.html [149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl3/igt@runner@aborted.html [150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-apl7/igt@runner@aborted.html - shard-glk: ([FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155]) ([i915#2722] / [i915#3002] / [i915#3363] / [k.org#202321]) -> ([FAIL][156], [FAIL][157], [FAIL][158]) ([i915#3002] / [i915#3363] / [k.org#202321]) [151]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk7/igt@runner@aborted.html [152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk4/igt@runner@aborted.html [153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk2/igt@runner@aborted.html [154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk5/igt@runner@aborted.html [155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-glk5/igt@runner@aborted.html [156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk7/igt@runner@aborted.html [157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk4/igt@runner@aborted.html [158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/shard-glk2/igt@runner@aborted.html - shard-tglb: ([FAIL][159], [FAIL][160], [FAIL][161], [FAIL][162], [FAIL][163], [FAIL][164], [FAIL][165], [FAIL][166]) ([i915#1436] / [i915#2722] / [i915#2966] / [i915#3002]) -> ([FAIL][167], [FAIL][168], [FAIL][169], [FAIL][170], [FAIL][171], [FAIL][172], [FAIL][173], [FAIL][174]) ([i915#1436] / [i915#2426] / [i915#2722] / [i915#2966] / [i915#3002]) [159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb6/igt@runner@aborted.html [160]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb2/igt@runner@aborted.html [161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/shard-tglb5/igt@runner@aborted.html == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20174/index.html [-- Attachment #1.2: Type: text/html, Size: 33456 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] 11+ messages in thread
* [Intel-gfx] [PATCH 0/3] More DMC cleanup @ 2021-05-20 23:53 Anusha Srivatsa 2021-05-20 23:53 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 0 siblings, 1 reply; 11+ messages in thread From: Anusha Srivatsa @ 2021-05-20 23:53 UTC (permalink / raw) To: intel-gfx Last of prep patches before Pipe DMC patches can land. v2: Add struct intel_dmc to intel_dmc.h in a separate patch Anusha Srivatsa (3): drm/i915/dmc: s/DRM_ERROR/drm_err drm/i915/dmc: Add intel_dmc_has_payload() helper drm/i915/dmc: Move struct intel_dmc to intel_dmc.h .../drm/i915/display/intel_display_debugfs.c | 4 +- .../drm/i915/display/intel_display_power.c | 16 +++--- drivers/gpu/drm/i915/display/intel_dmc.c | 55 +++++++++++-------- drivers/gpu/drm/i915/display/intel_dmc.h | 22 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 18 +----- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 6 files changed, 67 insertions(+), 50 deletions(-) -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-20 23:53 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa @ 2021-05-20 23:53 ` Anusha Srivatsa 2021-05-21 10:03 ` Jani Nikula 0 siblings, 1 reply; 11+ messages in thread From: Anusha Srivatsa @ 2021-05-20 23:53 UTC (permalink / raw) To: intel-gfx; +Cc: Lucas De Marchi We check for dmc_payload being there at various points in the driver. Replace it with the helper. v2: rebased. v3: Move intel_dmc to intel_dmc.h in another patch (Lucas) Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> --- .../gpu/drm/i915/display/intel_display_debugfs.c | 4 ++-- .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++-------- drivers/gpu/drm/i915/display/intel_dmc.c | 13 +++++++++---- drivers/gpu/drm/i915/display/intel_dmc.h | 5 +++++ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 94e5cbd86e77..88bb05d5c483 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -542,10 +542,10 @@ static int i915_dmc_info(struct seq_file *m, void *unused) wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); - seq_printf(m, "fw loaded: %s\n", yesno(dmc->dmc_payload)); + seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv))); seq_printf(m, "path: %s\n", dmc->fw_path); - if (!dmc->dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) goto out; seq_printf(m, "version: %d.%d\n", DMC_VERSION_MAJOR(dmc->version), diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 991ceea06a07..b546672c9b00 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1220,7 +1220,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv, struct i915_power_well *power_well) { - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) return; switch (dev_priv->dmc.target_dc_state) { @@ -5579,7 +5579,7 @@ static void skl_display_core_init(struct drm_i915_private *dev_priv, gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5646,7 +5646,7 @@ static void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5712,7 +5712,7 @@ static void cnl_display_core_init(struct drm_i915_private *dev_priv, bool resume /* 6. Enable DBUF */ gen9_dbuf_enable(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); } @@ -5869,7 +5869,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv, if (DISPLAY_VER(dev_priv) >= 12) tgl_bw_buddy_init(dev_priv); - if (resume && dev_priv->dmc.dmc_payload) + if (resume && intel_dmc_has_payload(dev_priv)) intel_dmc_load_program(dev_priv); /* Wa_14011508470 */ @@ -6230,7 +6230,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915, */ if (!(i915->dmc.allowed_dc_mask & DC_STATE_EN_DC9) && suspend_mode == I915_DRM_SUSPEND_IDLE && - i915->dmc.dmc_payload) { + intel_dmc_has_payload(i915)) { intel_display_power_flush_work(i915); intel_power_domains_verify_state(i915); return; @@ -6420,7 +6420,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) if (DISPLAY_VER(i915) >= 11) { bxt_disable_dc9(i915); icl_display_core_init(i915, true); - if (i915->dmc.dmc_payload) { + if (intel_dmc_has_payload(i915)) { if (i915->dmc.allowed_dc_mask & DC_STATE_EN_UPTO_DC6) skl_enable_dc6(i915); @@ -6431,7 +6431,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { bxt_disable_dc9(i915); bxt_display_core_init(i915, true); - if (i915->dmc.dmc_payload && + if (intel_dmc_has_payload(i915) && (i915->dmc.allowed_dc_mask & DC_STATE_EN_UPTO_DC5)) gen9_enable_dc5(i915); } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) { diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 71ef6022d4af..14282e5fdf8b 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -237,6 +237,11 @@ struct stepping_info { char substepping; }; +bool intel_dmc_has_payload(struct drm_i915_private *dev_priv) +{ + return dev_priv->dmc.dmc_payload; +} + static const struct stepping_info skl_stepping_info[] = { {'A', '0'}, {'B', '0'}, {'C', '0'}, {'D', '0'}, {'E', '0'}, {'F', '0'}, @@ -320,7 +325,7 @@ void intel_dmc_load_program(struct drm_i915_private *dev_priv) return; } - if (!dev_priv->dmc.dmc_payload) { + if (!intel_dmc_has_payload(dev_priv)) { drm_err(&dev_priv->drm, "Tried to program CSR with empty payload\n"); return; @@ -658,7 +663,7 @@ static void dmc_load_work_fn(struct work_struct *work) request_firmware(&fw, dev_priv->dmc.fw_path, dev_priv->drm.dev); parse_dmc_fw(dev_priv, fw); - if (dev_priv->dmc.dmc_payload) { + if (intel_dmc_has_payload(dev_priv)) { intel_dmc_load_program(dev_priv); intel_dmc_runtime_pm_put(dev_priv); @@ -787,7 +792,7 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv) flush_work(&dev_priv->dmc.work); /* Drop the reference held in case DMC isn't loaded. */ - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) intel_dmc_runtime_pm_put(dev_priv); } @@ -807,7 +812,7 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv) * Reacquire the reference to keep RPM disabled in case DMC isn't * loaded. */ - if (!dev_priv->dmc.dmc_payload) + if (!intel_dmc_has_payload(dev_priv)) intel_dmc_runtime_pm_get(dev_priv); } diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h index 57dd99da0ced..a928172459e3 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.h +++ b/drivers/gpu/drm/i915/display/intel_dmc.h @@ -6,6 +6,10 @@ #ifndef __INTEL_DMC_H__ #define __INTEL_DMC_H__ +#include <drm/drm_util.h> +#include "intel_wakeref.h" +#include "i915_reg.h" + struct drm_i915_private; #define DMC_VERSION(major, minor) ((major) << 16 | (minor)) @@ -17,5 +21,6 @@ void intel_dmc_load_program(struct drm_i915_private *i915); void intel_dmc_ucode_fini(struct drm_i915_private *i915); void intel_dmc_ucode_suspend(struct drm_i915_private *i915); void intel_dmc_ucode_resume(struct drm_i915_private *i915); +bool intel_dmc_has_payload(struct drm_i915_private *i915); #endif /* __INTEL_DMC_H__ */ diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 8b964e355cb5..833d3e8b7631 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -792,7 +792,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, struct intel_dmc *dmc = &m->i915->dmc; err_printf(m, "DMC loaded: %s\n", - yesno(dmc->dmc_payload)); + yesno(intel_dmc_has_payload(m->i915) != 0)); err_printf(m, "DMC fw version: %d.%d\n", DMC_VERSION_MAJOR(dmc->version), DMC_VERSION_MINOR(dmc->version)); -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-20 23:53 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa @ 2021-05-21 10:03 ` Jani Nikula 2021-05-21 19:28 ` Srivatsa, Anusha 0 siblings, 1 reply; 11+ messages in thread From: Jani Nikula @ 2021-05-21 10:03 UTC (permalink / raw) To: Anusha Srivatsa, intel-gfx; +Cc: Lucas De Marchi On Thu, 20 May 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote: > We check for dmc_payload being there at various points in the driver. > Replace it with the helper. Seems like a good idea. Some comments inline. BR, Jani. > > v2: rebased. > v3: Move intel_dmc to intel_dmc.h in another patch (Lucas) > > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > .../gpu/drm/i915/display/intel_display_debugfs.c | 4 ++-- > .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++-------- > drivers/gpu/drm/i915/display/intel_dmc.c | 13 +++++++++---- > drivers/gpu/drm/i915/display/intel_dmc.h | 5 +++++ > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > 5 files changed, 25 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 94e5cbd86e77..88bb05d5c483 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -542,10 +542,10 @@ static int i915_dmc_info(struct seq_file *m, void *unused) > > wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); > > - seq_printf(m, "fw loaded: %s\n", yesno(dmc->dmc_payload)); > + seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv))); > seq_printf(m, "path: %s\n", dmc->fw_path); > > - if (!dmc->dmc_payload) > + if (!intel_dmc_has_payload(dev_priv)) > goto out; > > seq_printf(m, "version: %d.%d\n", DMC_VERSION_MAJOR(dmc->version), > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index 991ceea06a07..b546672c9b00 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -1220,7 +1220,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, > static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv, > struct i915_power_well *power_well) > { > - if (!dev_priv->dmc.dmc_payload) > + if (!intel_dmc_has_payload(dev_priv)) > return; > > switch (dev_priv->dmc.target_dc_state) { > @@ -5579,7 +5579,7 @@ static void skl_display_core_init(struct drm_i915_private *dev_priv, > > gen9_dbuf_enable(dev_priv); > > - if (resume && dev_priv->dmc.dmc_payload) > + if (resume && intel_dmc_has_payload(dev_priv)) > intel_dmc_load_program(dev_priv); > } > > @@ -5646,7 +5646,7 @@ static void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume > > gen9_dbuf_enable(dev_priv); > > - if (resume && dev_priv->dmc.dmc_payload) > + if (resume && intel_dmc_has_payload(dev_priv)) > intel_dmc_load_program(dev_priv); > } > > @@ -5712,7 +5712,7 @@ static void cnl_display_core_init(struct drm_i915_private *dev_priv, bool resume > /* 6. Enable DBUF */ > gen9_dbuf_enable(dev_priv); > > - if (resume && dev_priv->dmc.dmc_payload) > + if (resume && intel_dmc_has_payload(dev_priv)) > intel_dmc_load_program(dev_priv); > } > > @@ -5869,7 +5869,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv, > if (DISPLAY_VER(dev_priv) >= 12) > tgl_bw_buddy_init(dev_priv); > > - if (resume && dev_priv->dmc.dmc_payload) > + if (resume && intel_dmc_has_payload(dev_priv)) > intel_dmc_load_program(dev_priv); > > /* Wa_14011508470 */ > @@ -6230,7 +6230,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915, > */ > if (!(i915->dmc.allowed_dc_mask & DC_STATE_EN_DC9) && > suspend_mode == I915_DRM_SUSPEND_IDLE && > - i915->dmc.dmc_payload) { > + intel_dmc_has_payload(i915)) { > intel_display_power_flush_work(i915); > intel_power_domains_verify_state(i915); > return; > @@ -6420,7 +6420,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) > if (DISPLAY_VER(i915) >= 11) { > bxt_disable_dc9(i915); > icl_display_core_init(i915, true); > - if (i915->dmc.dmc_payload) { > + if (intel_dmc_has_payload(i915)) { > if (i915->dmc.allowed_dc_mask & > DC_STATE_EN_UPTO_DC6) > skl_enable_dc6(i915); > @@ -6431,7 +6431,7 @@ void intel_display_power_resume(struct drm_i915_private *i915) > } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { > bxt_disable_dc9(i915); > bxt_display_core_init(i915, true); > - if (i915->dmc.dmc_payload && > + if (intel_dmc_has_payload(i915) && > (i915->dmc.allowed_dc_mask & DC_STATE_EN_UPTO_DC5)) > gen9_enable_dc5(i915); > } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) { > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > index 71ef6022d4af..14282e5fdf8b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -237,6 +237,11 @@ struct stepping_info { > char substepping; > }; > > +bool intel_dmc_has_payload(struct drm_i915_private *dev_priv) > +{ > + return dev_priv->dmc.dmc_payload; Please use i915 name for struct drm_i915_private when adding new code. > +} > + > static const struct stepping_info skl_stepping_info[] = { > {'A', '0'}, {'B', '0'}, {'C', '0'}, > {'D', '0'}, {'E', '0'}, {'F', '0'}, > @@ -320,7 +325,7 @@ void intel_dmc_load_program(struct drm_i915_private *dev_priv) > return; > } > > - if (!dev_priv->dmc.dmc_payload) { > + if (!intel_dmc_has_payload(dev_priv)) { > drm_err(&dev_priv->drm, > "Tried to program CSR with empty payload\n"); > return; > @@ -658,7 +663,7 @@ static void dmc_load_work_fn(struct work_struct *work) > request_firmware(&fw, dev_priv->dmc.fw_path, dev_priv->drm.dev); > parse_dmc_fw(dev_priv, fw); > > - if (dev_priv->dmc.dmc_payload) { > + if (intel_dmc_has_payload(dev_priv)) { > intel_dmc_load_program(dev_priv); > intel_dmc_runtime_pm_put(dev_priv); > > @@ -787,7 +792,7 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv) > flush_work(&dev_priv->dmc.work); > > /* Drop the reference held in case DMC isn't loaded. */ > - if (!dev_priv->dmc.dmc_payload) > + if (!intel_dmc_has_payload(dev_priv)) > intel_dmc_runtime_pm_put(dev_priv); > } > > @@ -807,7 +812,7 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv) > * Reacquire the reference to keep RPM disabled in case DMC isn't > * loaded. > */ > - if (!dev_priv->dmc.dmc_payload) > + if (!intel_dmc_has_payload(dev_priv)) > intel_dmc_runtime_pm_get(dev_priv); > } > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h > index 57dd99da0ced..a928172459e3 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.h > +++ b/drivers/gpu/drm/i915/display/intel_dmc.h > @@ -6,6 +6,10 @@ > #ifndef __INTEL_DMC_H__ > #define __INTEL_DMC_H__ > > +#include <drm/drm_util.h> > +#include "intel_wakeref.h" > +#include "i915_reg.h" > + You don't need any of these for the patch at hand. Please remove. > struct drm_i915_private; > > #define DMC_VERSION(major, minor) ((major) << 16 | (minor)) > @@ -17,5 +21,6 @@ void intel_dmc_load_program(struct drm_i915_private *i915); > void intel_dmc_ucode_fini(struct drm_i915_private *i915); > void intel_dmc_ucode_suspend(struct drm_i915_private *i915); > void intel_dmc_ucode_resume(struct drm_i915_private *i915); > +bool intel_dmc_has_payload(struct drm_i915_private *i915); > > #endif /* __INTEL_DMC_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 8b964e355cb5..833d3e8b7631 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -792,7 +792,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, > struct intel_dmc *dmc = &m->i915->dmc; > > err_printf(m, "DMC loaded: %s\n", > - yesno(dmc->dmc_payload)); > + yesno(intel_dmc_has_payload(m->i915) != 0)); The != 0 part is unnecessary. BR, Jani. > err_printf(m, "DMC fw version: %d.%d\n", > DMC_VERSION_MAJOR(dmc->version), > DMC_VERSION_MINOR(dmc->version)); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-21 10:03 ` Jani Nikula @ 2021-05-21 19:28 ` Srivatsa, Anusha 2021-05-21 19:42 ` Srivatsa, Anusha 0 siblings, 1 reply; 11+ messages in thread From: Srivatsa, Anusha @ 2021-05-21 19:28 UTC (permalink / raw) To: Jani Nikula, intel-gfx@lists.freedesktop.org; +Cc: De Marchi, Lucas > -----Original Message----- > From: Jani Nikula <jani.nikula@linux.intel.com> > Sent: Friday, May 21, 2021 3:04 AM > To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: De Marchi, Lucas <lucas.demarchi@intel.com> > Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add > intel_dmc_has_payload() helper > > On Thu, 20 May 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote: > > We check for dmc_payload being there at various points in the driver. > > Replace it with the helper. > > Seems like a good idea. Some comments inline. > > BR, > Jani. > > > > > v2: rebased. > > v3: Move intel_dmc to intel_dmc.h in another patch (Lucas) > > > > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> > > --- > > .../gpu/drm/i915/display/intel_display_debugfs.c | 4 ++-- > > .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++-------- > > drivers/gpu/drm/i915/display/intel_dmc.c | 13 +++++++++---- > > drivers/gpu/drm/i915/display/intel_dmc.h | 5 +++++ > > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > > 5 files changed, 25 insertions(+), 15 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > index 94e5cbd86e77..88bb05d5c483 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > @@ -542,10 +542,10 @@ static int i915_dmc_info(struct seq_file *m, > > void *unused) > > > > wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); > > > > - seq_printf(m, "fw loaded: %s\n", yesno(dmc->dmc_payload)); > > + seq_printf(m, "fw loaded: %s\n", > > +yesno(intel_dmc_has_payload(dev_priv))); > > seq_printf(m, "path: %s\n", dmc->fw_path); > > > > - if (!dmc->dmc_payload) > > + if (!intel_dmc_has_payload(dev_priv)) > > goto out; > > > > seq_printf(m, "version: %d.%d\n", DMC_VERSION_MAJOR(dmc- > >version), > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c > > b/drivers/gpu/drm/i915/display/intel_display_power.c > > index 991ceea06a07..b546672c9b00 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > > @@ -1220,7 +1220,7 @@ static void > gen9_dc_off_power_well_enable(struct > > drm_i915_private *dev_priv, static void > gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv, > > struct i915_power_well > *power_well) { > > - if (!dev_priv->dmc.dmc_payload) > > + if (!intel_dmc_has_payload(dev_priv)) > > return; > > > > switch (dev_priv->dmc.target_dc_state) { @@ -5579,7 +5579,7 @@ > > static void skl_display_core_init(struct drm_i915_private *dev_priv, > > > > gen9_dbuf_enable(dev_priv); > > > > - if (resume && dev_priv->dmc.dmc_payload) > > + if (resume && intel_dmc_has_payload(dev_priv)) > > intel_dmc_load_program(dev_priv); > > } > > > > @@ -5646,7 +5646,7 @@ static void bxt_display_core_init(struct > > drm_i915_private *dev_priv, bool resume > > > > gen9_dbuf_enable(dev_priv); > > > > - if (resume && dev_priv->dmc.dmc_payload) > > + if (resume && intel_dmc_has_payload(dev_priv)) > > intel_dmc_load_program(dev_priv); > > } > > > > @@ -5712,7 +5712,7 @@ static void cnl_display_core_init(struct > drm_i915_private *dev_priv, bool resume > > /* 6. Enable DBUF */ > > gen9_dbuf_enable(dev_priv); > > > > - if (resume && dev_priv->dmc.dmc_payload) > > + if (resume && intel_dmc_has_payload(dev_priv)) > > intel_dmc_load_program(dev_priv); > > } > > > > @@ -5869,7 +5869,7 @@ static void icl_display_core_init(struct > drm_i915_private *dev_priv, > > if (DISPLAY_VER(dev_priv) >= 12) > > tgl_bw_buddy_init(dev_priv); > > > > - if (resume && dev_priv->dmc.dmc_payload) > > + if (resume && intel_dmc_has_payload(dev_priv)) > > intel_dmc_load_program(dev_priv); > > > > /* Wa_14011508470 */ > > @@ -6230,7 +6230,7 @@ void intel_power_domains_suspend(struct > drm_i915_private *i915, > > */ > > if (!(i915->dmc.allowed_dc_mask & DC_STATE_EN_DC9) && > > suspend_mode == I915_DRM_SUSPEND_IDLE && > > - i915->dmc.dmc_payload) { > > + intel_dmc_has_payload(i915)) { > > intel_display_power_flush_work(i915); > > intel_power_domains_verify_state(i915); > > return; > > @@ -6420,7 +6420,7 @@ void intel_display_power_resume(struct > drm_i915_private *i915) > > if (DISPLAY_VER(i915) >= 11) { > > bxt_disable_dc9(i915); > > icl_display_core_init(i915, true); > > - if (i915->dmc.dmc_payload) { > > + if (intel_dmc_has_payload(i915)) { > > if (i915->dmc.allowed_dc_mask & > > DC_STATE_EN_UPTO_DC6) > > skl_enable_dc6(i915); > > @@ -6431,7 +6431,7 @@ void intel_display_power_resume(struct > drm_i915_private *i915) > > } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { > > bxt_disable_dc9(i915); > > bxt_display_core_init(i915, true); > > - if (i915->dmc.dmc_payload && > > + if (intel_dmc_has_payload(i915) && > > (i915->dmc.allowed_dc_mask & > DC_STATE_EN_UPTO_DC5)) > > gen9_enable_dc5(i915); > > } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) { diff --git > > a/drivers/gpu/drm/i915/display/intel_dmc.c > > b/drivers/gpu/drm/i915/display/intel_dmc.c > > index 71ef6022d4af..14282e5fdf8b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > > @@ -237,6 +237,11 @@ struct stepping_info { > > char substepping; > > }; > > > > +bool intel_dmc_has_payload(struct drm_i915_private *dev_priv) { > > + return dev_priv->dmc.dmc_payload; > > Please use i915 name for struct drm_i915_private when adding new code. > > > +} > > + > > static const struct stepping_info skl_stepping_info[] = { > > {'A', '0'}, {'B', '0'}, {'C', '0'}, > > {'D', '0'}, {'E', '0'}, {'F', '0'}, > > @@ -320,7 +325,7 @@ void intel_dmc_load_program(struct > drm_i915_private *dev_priv) > > return; > > } > > > > - if (!dev_priv->dmc.dmc_payload) { > > + if (!intel_dmc_has_payload(dev_priv)) { > > drm_err(&dev_priv->drm, > > "Tried to program CSR with empty payload\n"); > > return; > > @@ -658,7 +663,7 @@ static void dmc_load_work_fn(struct work_struct > *work) > > request_firmware(&fw, dev_priv->dmc.fw_path, dev_priv- > >drm.dev); > > parse_dmc_fw(dev_priv, fw); > > > > - if (dev_priv->dmc.dmc_payload) { > > + if (intel_dmc_has_payload(dev_priv)) { > > intel_dmc_load_program(dev_priv); > > intel_dmc_runtime_pm_put(dev_priv); > > > > @@ -787,7 +792,7 @@ void intel_dmc_ucode_suspend(struct > drm_i915_private *dev_priv) > > flush_work(&dev_priv->dmc.work); > > > > /* Drop the reference held in case DMC isn't loaded. */ > > - if (!dev_priv->dmc.dmc_payload) > > + if (!intel_dmc_has_payload(dev_priv)) > > intel_dmc_runtime_pm_put(dev_priv); > > } > > > > @@ -807,7 +812,7 @@ void intel_dmc_ucode_resume(struct > drm_i915_private *dev_priv) > > * Reacquire the reference to keep RPM disabled in case DMC isn't > > * loaded. > > */ > > - if (!dev_priv->dmc.dmc_payload) > > + if (!intel_dmc_has_payload(dev_priv)) > > intel_dmc_runtime_pm_get(dev_priv); > > } > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h > > b/drivers/gpu/drm/i915/display/intel_dmc.h > > index 57dd99da0ced..a928172459e3 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dmc.h > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.h > > @@ -6,6 +6,10 @@ > > #ifndef __INTEL_DMC_H__ > > #define __INTEL_DMC_H__ > > > > +#include <drm/drm_util.h> > > +#include "intel_wakeref.h" > > +#include "i915_reg.h" > > + > > You don't need any of these for the patch at hand. Please remove. Actually for i915_reg_t used in the intel_dmc struct, I need to have the header included here. I am making the other changes. Thanks, Anusha > > struct drm_i915_private; > > > > #define DMC_VERSION(major, minor) ((major) << 16 | (minor)) > > @@ -17,5 +21,6 @@ void intel_dmc_load_program(struct > drm_i915_private > > *i915); void intel_dmc_ucode_fini(struct drm_i915_private *i915); > > void intel_dmc_ucode_suspend(struct drm_i915_private *i915); void > > intel_dmc_ucode_resume(struct drm_i915_private *i915); > > +bool intel_dmc_has_payload(struct drm_i915_private *i915); > > > > #endif /* __INTEL_DMC_H__ */ > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c > > b/drivers/gpu/drm/i915/i915_gpu_error.c > > index 8b964e355cb5..833d3e8b7631 100644 > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > > @@ -792,7 +792,7 @@ static void __err_print_to_sgl(struct > drm_i915_error_state_buf *m, > > struct intel_dmc *dmc = &m->i915->dmc; > > > > err_printf(m, "DMC loaded: %s\n", > > - yesno(dmc->dmc_payload)); > > + yesno(intel_dmc_has_payload(m->i915) != 0)); > > The != 0 part is unnecessary. > > BR, > Jani. > > > err_printf(m, "DMC fw version: %d.%d\n", > > DMC_VERSION_MAJOR(dmc->version), > > DMC_VERSION_MINOR(dmc->version)); > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-21 19:28 ` Srivatsa, Anusha @ 2021-05-21 19:42 ` Srivatsa, Anusha 0 siblings, 0 replies; 11+ messages in thread From: Srivatsa, Anusha @ 2021-05-21 19:42 UTC (permalink / raw) To: Jani Nikula, intel-gfx@lists.freedesktop.org; +Cc: De Marchi, Lucas > -----Original Message----- > From: Srivatsa, Anusha > Sent: Friday, May 21, 2021 12:28 PM > To: 'Jani Nikula' <jani.nikula@linux.intel.com>; intel- > gfx@lists.freedesktop.org > Cc: De Marchi, Lucas <lucas.demarchi@intel.com> > Subject: RE: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add > intel_dmc_has_payload() helper > > > > > -----Original Message----- > > From: Jani Nikula <jani.nikula@linux.intel.com> > > Sent: Friday, May 21, 2021 3:04 AM > > To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel- > > gfx@lists.freedesktop.org > > Cc: De Marchi, Lucas <lucas.demarchi@intel.com> > > Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add > > intel_dmc_has_payload() helper > > > > On Thu, 20 May 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> > wrote: > > > We check for dmc_payload being there at various points in the driver. > > > Replace it with the helper. > > > > Seems like a good idea. Some comments inline. > > > > BR, > > Jani. > > > > > > > > v2: rebased. > > > v3: Move intel_dmc to intel_dmc.h in another patch (Lucas) > > > > > > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > > > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> > > > --- > > > .../gpu/drm/i915/display/intel_display_debugfs.c | 4 ++-- > > > .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++-------- > > > drivers/gpu/drm/i915/display/intel_dmc.c | 13 +++++++++---- > > > drivers/gpu/drm/i915/display/intel_dmc.h | 5 +++++ > > > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > > > 5 files changed, 25 insertions(+), 15 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > index 94e5cbd86e77..88bb05d5c483 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > @@ -542,10 +542,10 @@ static int i915_dmc_info(struct seq_file *m, > > > void *unused) > > > > > > wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); > > > > > > - seq_printf(m, "fw loaded: %s\n", yesno(dmc->dmc_payload)); > > > + seq_printf(m, "fw loaded: %s\n", > > > +yesno(intel_dmc_has_payload(dev_priv))); > > > seq_printf(m, "path: %s\n", dmc->fw_path); > > > > > > - if (!dmc->dmc_payload) > > > + if (!intel_dmc_has_payload(dev_priv)) > > > goto out; > > > > > > seq_printf(m, "version: %d.%d\n", DMC_VERSION_MAJOR(dmc- > version), > > >diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c > > > b/drivers/gpu/drm/i915/display/intel_display_power.c > > > index 991ceea06a07..b546672c9b00 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > > > @@ -1220,7 +1220,7 @@ static void > > gen9_dc_off_power_well_enable(struct > > > drm_i915_private *dev_priv, static void > > gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv, > > > struct i915_power_well > > *power_well) { > > > - if (!dev_priv->dmc.dmc_payload) > > > + if (!intel_dmc_has_payload(dev_priv)) > > > return; > > > > > > switch (dev_priv->dmc.target_dc_state) { @@ -5579,7 +5579,7 @@ > > > static void skl_display_core_init(struct drm_i915_private *dev_priv, > > > > > > gen9_dbuf_enable(dev_priv); > > > > > > - if (resume && dev_priv->dmc.dmc_payload) > > > + if (resume && intel_dmc_has_payload(dev_priv)) > > > intel_dmc_load_program(dev_priv); } > > > > > > @@ -5646,7 +5646,7 @@ static void bxt_display_core_init(struct > > > drm_i915_private *dev_priv, bool resume > > > > > > gen9_dbuf_enable(dev_priv); > > > > > > - if (resume && dev_priv->dmc.dmc_payload) > > > + if (resume && intel_dmc_has_payload(dev_priv)) > > > intel_dmc_load_program(dev_priv); } > > > > > > @@ -5712,7 +5712,7 @@ static void cnl_display_core_init(struct > > drm_i915_private *dev_priv, bool resume > > > /* 6. Enable DBUF */ > > > gen9_dbuf_enable(dev_priv); > > > > > > - if (resume && dev_priv->dmc.dmc_payload) > > > + if (resume && intel_dmc_has_payload(dev_priv)) > > > intel_dmc_load_program(dev_priv); } > > > > > > @@ -5869,7 +5869,7 @@ static void icl_display_core_init(struct > > drm_i915_private *dev_priv, > > > if (DISPLAY_VER(dev_priv) >= 12) > > > tgl_bw_buddy_init(dev_priv); > > > > > > - if (resume && dev_priv->dmc.dmc_payload) > > > + if (resume && intel_dmc_has_payload(dev_priv)) > > > intel_dmc_load_program(dev_priv); > > > > > > /* Wa_14011508470 */ > > > @@ -6230,7 +6230,7 @@ void intel_power_domains_suspend(struct > > drm_i915_private *i915, > > > */ > > > if (!(i915->dmc.allowed_dc_mask & DC_STATE_EN_DC9) && > > > suspend_mode == I915_DRM_SUSPEND_IDLE && > > > - i915->dmc.dmc_payload) { > > > + intel_dmc_has_payload(i915)) { > > > intel_display_power_flush_work(i915); > > > intel_power_domains_verify_state(i915); > > > return; > > > @@ -6420,7 +6420,7 @@ void intel_display_power_resume(struct > > drm_i915_private *i915) > > > if (DISPLAY_VER(i915) >= 11) { > > > bxt_disable_dc9(i915); > > > icl_display_core_init(i915, true); > > > - if (i915->dmc.dmc_payload) { > > > + if (intel_dmc_has_payload(i915)) { > > > if (i915->dmc.allowed_dc_mask & > > > DC_STATE_EN_UPTO_DC6) > > > skl_enable_dc6(i915); > > > @@ -6431,7 +6431,7 @@ void intel_display_power_resume(struct > > drm_i915_private *i915) > > > } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { > > > bxt_disable_dc9(i915); > > > bxt_display_core_init(i915, true); > > > - if (i915->dmc.dmc_payload && > > > + if (intel_dmc_has_payload(i915) && > > > (i915->dmc.allowed_dc_mask & > > DC_STATE_EN_UPTO_DC5)) > > > gen9_enable_dc5(i915); > > > } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) { diff --git > > > a/drivers/gpu/drm/i915/display/intel_dmc.c > > > b/drivers/gpu/drm/i915/display/intel_dmc.c > > > index 71ef6022d4af..14282e5fdf8b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > > > @@ -237,6 +237,11 @@ struct stepping_info { > > > char substepping; > > > }; > > > > > > +bool intel_dmc_has_payload(struct drm_i915_private *dev_priv) { > > > + return dev_priv->dmc.dmc_payload; > > > > Please use i915 name for struct drm_i915_private when adding new code. > > > > > +} > > > + > > > static const struct stepping_info skl_stepping_info[] = { > > > {'A', '0'}, {'B', '0'}, {'C', '0'}, > > > {'D', '0'}, {'E', '0'}, {'F', '0'}, @@ -320,7 +325,7 @@ void > > > intel_dmc_load_program(struct > > drm_i915_private *dev_priv) > > > return; > > > } > > > > > > - if (!dev_priv->dmc.dmc_payload) { > > > + if (!intel_dmc_has_payload(dev_priv)) { > > > drm_err(&dev_priv->drm, > > > "Tried to program CSR with empty payload\n"); > > > return; > > > @@ -658,7 +663,7 @@ static void dmc_load_work_fn(struct work_struct > > *work) > > > request_firmware(&fw, dev_priv->dmc.fw_path, dev_priv- drm.dev); > > > parse_dmc_fw(dev_priv, fw); > > > > > > - if (dev_priv->dmc.dmc_payload) { > > > + if (intel_dmc_has_payload(dev_priv)) { > > > intel_dmc_load_program(dev_priv); > > > intel_dmc_runtime_pm_put(dev_priv); > > > > > > @@ -787,7 +792,7 @@ void intel_dmc_ucode_suspend(struct > > drm_i915_private *dev_priv) > > > flush_work(&dev_priv->dmc.work); > > > > > > /* Drop the reference held in case DMC isn't loaded. */ > > > - if (!dev_priv->dmc.dmc_payload) > > > + if (!intel_dmc_has_payload(dev_priv)) > > > intel_dmc_runtime_pm_put(dev_priv); > > > } > > > > > > @@ -807,7 +812,7 @@ void intel_dmc_ucode_resume(struct > > drm_i915_private *dev_priv) > > > * Reacquire the reference to keep RPM disabled in case DMC isn't > > > * loaded. > > > */ > > > - if (!dev_priv->dmc.dmc_payload) > > > + if (!intel_dmc_has_payload(dev_priv)) > > > intel_dmc_runtime_pm_get(dev_priv); > > > } > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h > > > b/drivers/gpu/drm/i915/display/intel_dmc.h > > > index 57dd99da0ced..a928172459e3 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dmc.h > > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.h > > > @@ -6,6 +6,10 @@ > > > #ifndef __INTEL_DMC_H__ > > > #define __INTEL_DMC_H__ > > > > > > +#include <drm/drm_util.h> > > > +#include "intel_wakeref.h" > > > +#include "i915_reg.h" > > > + > > > > You don't need any of these for the patch at hand. Please remove. > > Actually for i915_reg_t used in the intel_dmc struct, I need to have the > header included here. > > I am making the other changes. > Correction, the headers are indeed not needed in this patch. It has to be part of Patch3 of this series. Removing them from this patch. Anusha > Thanks, > Anusha > > > > struct drm_i915_private; > > > > > > #define DMC_VERSION(major, minor) ((major) << 16 | (minor)) > > > @@ -17,5 +21,6 @@ void intel_dmc_load_program(struct > > drm_i915_private > > > *i915); void intel_dmc_ucode_fini(struct drm_i915_private *i915); > > > void intel_dmc_ucode_suspend(struct drm_i915_private *i915); void > > > intel_dmc_ucode_resume(struct drm_i915_private *i915); > > > +bool intel_dmc_has_payload(struct drm_i915_private *i915); > > > > > > #endif /* __INTEL_DMC_H__ */ > > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c > > > b/drivers/gpu/drm/i915/i915_gpu_error.c > > > index 8b964e355cb5..833d3e8b7631 100644 > > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > > > @@ -792,7 +792,7 @@ static void __err_print_to_sgl(struct > > drm_i915_error_state_buf *m, > > > struct intel_dmc *dmc = &m->i915->dmc; > > > > > > err_printf(m, "DMC loaded: %s\n", > > > - yesno(dmc->dmc_payload)); > > > + yesno(intel_dmc_has_payload(m->i915) != 0)); > > > > The != 0 part is unnecessary. > > > > BR, > > Jani. > > > > > err_printf(m, "DMC fw version: %d.%d\n", > > > DMC_VERSION_MAJOR(dmc->version), > > > DMC_VERSION_MINOR(dmc->version)); > > > > -- > > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-05-24 4:12 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-05-21 19:51 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 2021-05-21 19:51 ` [Intel-gfx] [PATCH 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa 2021-05-21 20:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for More DMC cleanup (rev3) Patchwork 2021-05-21 20:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-24 4:12 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-05-20 23:53 [Intel-gfx] [PATCH 0/3] More DMC cleanup Anusha Srivatsa 2021-05-20 23:53 ` [Intel-gfx] [PATCH 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 2021-05-21 10:03 ` Jani Nikula 2021-05-21 19:28 ` Srivatsa, Anusha 2021-05-21 19:42 ` Srivatsa, Anusha
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox