* [Intel-gfx] [CI 0/3] Resend More DMC cleanup
@ 2021-05-26 22:02 Anusha Srivatsa
2021-05-26 22:02 ` [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Anusha Srivatsa @ 2021-05-26 22:02 UTC (permalink / raw)
To: intel-gfx
v2: Add struct intel_dmc to intel_dmc.h in a separate
patch
v3: Minor code shuffling and indentation fixes
v4: Checkpatch 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 | 63 ++++++++++---------
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(+), 56 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] 8+ messages in thread* [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa @ 2021-05-26 22:02 ` Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa ` (3 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-26 22:02 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 | 50 ++++++++++++------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 560574dd929a..5e9c0b509034 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,16 +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"); + if (!dmc->dmc_payload) return 0; - } payload = (u8 *)(dmc_header) + header_len_bytes; memcpy(dmc->dmc_payload, payload, payload_size); @@ -493,7 +492,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 +502,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 +515,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 +529,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 +543,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 +552,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 +561,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] 8+ messages in thread
* [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa @ 2021-05-26 22:02 ` Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa ` (2 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-26 22:02 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 2f7d1664c473..3ca8112eead5 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1218,7 +1218,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) { @@ -5577,7 +5577,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); } @@ -5644,7 +5644,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); } @@ -5710,7 +5710,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); } @@ -5867,7 +5867,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 */ @@ -6228,7 +6228,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; @@ -6418,7 +6418,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); @@ -6429,7 +6429,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 5e9c0b509034..97308da28059 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 *i915) +{ + return i915->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; @@ -654,7 +659,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); @@ -783,7 +788,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); } @@ -803,7 +808,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] 8+ messages in thread
* [Intel-gfx] [CI 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa @ 2021-05-26 22:02 ` Anusha Srivatsa 2021-05-27 2:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success for Resend More DMC cleanup Patchwork 2021-05-27 18:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 4 siblings, 0 replies; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-26 22:02 UTC (permalink / raw) To: intel-gfx; +Cc: Lucas De Marchi Move struct intel_dmc from i915_drv.h to intel_dmc.h. v2: Add includes along with moving the struct. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> 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..4c22f567b61b 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 "i915_reg.h" +#include "intel_wakeref.h" +#include <linux/workqueue.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 0f6d27da69ac..0c6301b28c37 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] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Resend More DMC cleanup 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa ` (2 preceding siblings ...) 2021-05-26 22:02 ` [Intel-gfx] [CI 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa @ 2021-05-27 2:51 ` Patchwork 2021-05-27 18:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 4 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2021-05-27 2:51 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 3871 bytes --] == Series Details == Series: Resend More DMC cleanup URL : https://patchwork.freedesktop.org/series/90635/ State : success == Summary == CI Bug Log - changes from CI_DRM_10138 -> Patchwork_20217 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/index.html Known issues ------------ Here are the changes found in Patchwork_20217 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@kms_frontbuffer_tracking@basic: - fi-tgl-u2: [PASS][1] -> [FAIL][2] ([i915#2416]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-tgl-u2/igt@kms_frontbuffer_tracking@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-tgl-u2/igt@kms_frontbuffer_tracking@basic.html #### Warnings #### * igt@i915_selftest@live@execlists: - fi-tgl-u2: [DMESG-FAIL][3] ([i915#3462]) -> [INCOMPLETE][4] ([i915#3462]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-tgl-u2/igt@i915_selftest@live@execlists.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-tgl-u2/igt@i915_selftest@live@execlists.html * igt@runner@aborted: - fi-cfl-8700k: [FAIL][5] ([i915#3363]) -> [FAIL][6] ([i915#2426] / [i915#3363]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-cfl-8700k/igt@runner@aborted.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-cfl-8700k/igt@runner@aborted.html - fi-glk-dsi: [FAIL][7] ([i915#2426] / [i915#3363] / [k.org#202321]) -> [FAIL][8] ([i915#3363] / [k.org#202321]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-glk-dsi/igt@runner@aborted.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-glk-dsi/igt@runner@aborted.html - fi-kbl-guc: [FAIL][9] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][10] ([i915#1436] / [i915#3363]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-kbl-guc/igt@runner@aborted.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-kbl-guc/igt@runner@aborted.html - fi-cml-u2: [FAIL][11] ([i915#2082] / [i915#2426] / [i915#3363] / [i915#3462]) -> [FAIL][12] ([i915#3363] / [i915#3462]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/fi-cml-u2/igt@runner@aborted.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/fi-cml-u2/igt@runner@aborted.html [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#2082]: https://gitlab.freedesktop.org/drm/intel/issues/2082 [i915#2416]: https://gitlab.freedesktop.org/drm/intel/issues/2416 [i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426 [i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363 [i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462 [k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321 Participating hosts (44 -> 40) ------------------------------ Missing (4): fi-cml-drallion fi-ilk-m540 fi-bdw-samus fi-hsw-4200u Build changes ------------- * Linux: CI_DRM_10138 -> Patchwork_20217 CI-20190529: 20190529 CI_DRM_10138: 041f69e539b30565783cd1298842cc269f5005cb @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6094: f62d8953c0bc5ed68ea978662e62f9dbb46cf101 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_20217: 25cc3fdf4beefb1251490351097826de2778fb2a @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 25cc3fdf4bee drm/i915/dmc: Move struct intel_dmc to intel_dmc.h f540e6b99332 drm/i915/dmc: Add intel_dmc_has_payload() helper 9e349983ef44 drm/i915/dmc: s/DRM_ERROR/drm_err == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/index.html [-- Attachment #1.2: Type: text/html, Size: 5551 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] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for Resend More DMC cleanup 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa ` (3 preceding siblings ...) 2021-05-27 2:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success for Resend More DMC cleanup Patchwork @ 2021-05-27 18:20 ` Patchwork 4 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2021-05-27 18:20 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 30246 bytes --] == Series Details == Series: Resend More DMC cleanup URL : https://patchwork.freedesktop.org/series/90635/ State : success == Summary == CI Bug Log - changes from CI_DRM_10138_full -> Patchwork_20217_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_20217_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@drm_import_export@prime: - shard-tglb: [PASS][1] -> [INCOMPLETE][2] ([i915#750]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb5/igt@drm_import_export@prime.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb2/igt@drm_import_export@prime.html * igt@feature_discovery@display-3x: - shard-tglb: NOTRUN -> [SKIP][3] ([i915#1839]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@feature_discovery@display-3x.html * igt@gem_ctx_persistence@clone: - shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +1 similar issue [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb2/igt@gem_ctx_persistence@clone.html * igt@gem_eio@unwedge-stress: - shard-tglb: [PASS][5] -> [TIMEOUT][6] ([i915#2369] / [i915#3063]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb3/igt@gem_eio@unwedge-stress.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb2/igt@gem_eio@unwedge-stress.html * igt@gem_exec_fair@basic-deadline: - shard-glk: [PASS][7] -> [FAIL][8] ([i915#2846]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk6/igt@gem_exec_fair@basic-deadline.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk6/igt@gem_exec_fair@basic-deadline.html - shard-apl: NOTRUN -> [FAIL][9] ([i915#2846]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@gem_exec_fair@basic-deadline.html * igt@gem_exec_fair@basic-none@vcs1: - shard-iclb: NOTRUN -> [FAIL][10] ([i915#2842]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb4/igt@gem_exec_fair@basic-none@vcs1.html * igt@gem_exec_fair@basic-pace@vcs1: - shard-kbl: [PASS][11] -> [FAIL][12] ([i915#2842]) +1 similar issue [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs1.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html * igt@gem_exec_reloc@basic-wide-active@vcs1: - shard-iclb: NOTRUN -> [FAIL][13] ([i915#2389]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb2/igt@gem_exec_reloc@basic-wide-active@vcs1.html * igt@gem_mmap_gtt@big-copy-odd: - shard-skl: [PASS][14] -> [FAIL][15] ([i915#307]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl10/igt@gem_mmap_gtt@big-copy-odd.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@gem_mmap_gtt@big-copy-odd.html * igt@gem_mmap_gtt@cpuset-basic-small-copy-odd: - shard-apl: NOTRUN -> [INCOMPLETE][16] ([i915#3468]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html - shard-kbl: [PASS][17] -> [INCOMPLETE][18] ([i915#3468]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl2/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl1/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html * igt@gem_mmap_gtt@cpuset-basic-small-copy-xy: - shard-glk: [PASS][19] -> [INCOMPLETE][20] ([i915#2055] / [i915#3468]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk8/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk4/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html - shard-iclb: [PASS][21] -> [INCOMPLETE][22] ([i915#3468]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb6/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb7/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html * igt@gem_mmap_gtt@cpuset-medium-copy: - shard-iclb: [PASS][23] -> [FAIL][24] ([i915#307]) +1 similar issue [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb1/igt@gem_mmap_gtt@cpuset-medium-copy.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb1/igt@gem_mmap_gtt@cpuset-medium-copy.html * igt@gem_mmap_gtt@cpuset-medium-copy-xy: - shard-apl: [PASS][25] -> [INCOMPLETE][26] ([i915#3468]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-apl8/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl2/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html - shard-tglb: [PASS][27] -> [INCOMPLETE][28] ([i915#3468] / [i915#750]) [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb7/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb8/igt@gem_mmap_gtt@cpuset-medium-copy-xy.html * igt@gem_mmap_gtt@fault-concurrent-x: - shard-skl: NOTRUN -> [INCOMPLETE][29] ([i915#198]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@gem_mmap_gtt@fault-concurrent-x.html - shard-kbl: NOTRUN -> [INCOMPLETE][30] ([i915#3468]) [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl2/igt@gem_mmap_gtt@fault-concurrent-x.html * igt@gem_mmap_gtt@fault-concurrent-y: - shard-skl: NOTRUN -> [INCOMPLETE][31] ([i915#3468]) [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl7/igt@gem_mmap_gtt@fault-concurrent-y.html * igt@gem_pread@exhaustion: - shard-snb: NOTRUN -> [WARN][32] ([i915#2658]) [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb2/igt@gem_pread@exhaustion.html * igt@gem_pwrite@basic-exhaustion: - shard-apl: NOTRUN -> [WARN][33] ([i915#2658]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl2/igt@gem_pwrite@basic-exhaustion.html * igt@gem_userptr_blits@dmabuf-sync: - shard-kbl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#3323]) [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@gem_userptr_blits@dmabuf-sync.html * igt@gem_userptr_blits@vma-merge: - shard-apl: NOTRUN -> [FAIL][35] ([i915#3318]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl3/igt@gem_userptr_blits@vma-merge.html * igt@kms_big_fb@x-tiled-16bpp-rotate-90: - shard-tglb: NOTRUN -> [SKIP][36] ([fdo#111614]) +1 similar issue [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@kms_big_fb@x-tiled-16bpp-rotate-90.html * igt@kms_big_joiner@invalid-modeset: - shard-apl: NOTRUN -> [SKIP][37] ([fdo#109271] / [i915#2705]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl3/igt@kms_big_joiner@invalid-modeset.html * igt@kms_ccs@pipe-c-ccs-on-another-bo: - shard-skl: NOTRUN -> [SKIP][38] ([fdo#109271] / [fdo#111304]) [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@kms_ccs@pipe-c-ccs-on-another-bo.html * igt@kms_chamelium@dp-frame-dump: - shard-glk: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +2 similar issues [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk9/igt@kms_chamelium@dp-frame-dump.html * igt@kms_chamelium@hdmi-aspect-ratio: - shard-skl: NOTRUN -> [SKIP][40] ([fdo#109271] / [fdo#111827]) +5 similar issues [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@kms_chamelium@hdmi-aspect-ratio.html - shard-kbl: NOTRUN -> [SKIP][41] ([fdo#109271] / [fdo#111827]) +3 similar issues [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl2/igt@kms_chamelium@hdmi-aspect-ratio.html * igt@kms_chamelium@hdmi-edid-change-during-suspend: - shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +25 similar issues [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl2/igt@kms_chamelium@hdmi-edid-change-during-suspend.html * igt@kms_chamelium@vga-hpd-for-each-pipe: - shard-tglb: NOTRUN -> [SKIP][43] ([fdo#109284] / [fdo#111827]) +4 similar issues [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@kms_chamelium@vga-hpd-for-each-pipe.html * igt@kms_chamelium@vga-hpd-without-ddc: - shard-snb: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +10 similar issues [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb2/igt@kms_chamelium@vga-hpd-without-ddc.html * igt@kms_color@pipe-d-legacy-gamma: - shard-tglb: [PASS][45] -> [DMESG-WARN][46] ([i915#2868]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb3/igt@kms_color@pipe-d-legacy-gamma.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_color@pipe-d-legacy-gamma.html * igt@kms_content_protection@atomic-dpms: - shard-apl: NOTRUN -> [TIMEOUT][47] ([i915#1319]) +1 similar issue [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl1/igt@kms_content_protection@atomic-dpms.html * igt@kms_content_protection@dp-mst-lic-type-0: - shard-tglb: NOTRUN -> [SKIP][48] ([i915#3116]) [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_content_protection@dp-mst-lic-type-0.html * igt@kms_cursor_crc@pipe-a-cursor-32x32-sliding: - shard-tglb: NOTRUN -> [SKIP][49] ([i915#3319]) +1 similar issue [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_cursor_crc@pipe-a-cursor-32x32-sliding.html * igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen: - shard-apl: NOTRUN -> [FAIL][50] ([i915#3444]) [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen.html * igt@kms_cursor_crc@pipe-d-cursor-32x10-offscreen: - shard-tglb: NOTRUN -> [SKIP][51] ([i915#3359]) +3 similar issues [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-32x10-offscreen.html * igt@kms_cursor_crc@pipe-d-cursor-512x170-offscreen: - shard-tglb: NOTRUN -> [SKIP][52] ([fdo#109279] / [i915#3359]) +1 similar issue [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-512x170-offscreen.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic: - shard-skl: [PASS][53] -> [FAIL][54] ([i915#2346]) [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html * igt@kms_dp_dsc@basic-dsc-enable-edp: - shard-tglb: NOTRUN -> [CRASH][55] ([i915#3494]) [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_dp_dsc@basic-dsc-enable-edp.html * igt@kms_fbcon_fbt@fbc-suspend: - shard-kbl: [PASS][56] -> [INCOMPLETE][57] ([i915#155] / [i915#180] / [i915#636]) [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl4/igt@kms_fbcon_fbt@fbc-suspend.html [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl1/igt@kms_fbcon_fbt@fbc-suspend.html * igt@kms_flip@2x-flip-vs-rmfb: - shard-tglb: NOTRUN -> [SKIP][58] ([fdo#111825]) +10 similar issues [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_flip@2x-flip-vs-rmfb.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1: - shard-skl: NOTRUN -> [FAIL][59] ([i915#79]) [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html * igt@kms_flip@flip-vs-suspend-interruptible@a-dp1: - shard-kbl: [PASS][60] -> [DMESG-WARN][61] ([i915#180]) +6 similar issues [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl1/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html * igt@kms_flip@flip-vs-suspend-interruptible@c-dp1: - shard-apl: [PASS][62] -> [DMESG-WARN][63] ([i915#180]) +1 similar issue [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html * igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1: - shard-skl: [PASS][64] -> [FAIL][65] ([i915#2122]) [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl3/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl10/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt: - shard-iclb: [PASS][66] -> [FAIL][67] ([i915#49]) [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html * igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt: - shard-skl: NOTRUN -> [SKIP][68] ([fdo#109271]) +58 similar issues [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt.html * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite: - shard-snb: NOTRUN -> [SKIP][69] ([fdo#109271]) +188 similar issues [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb2/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-kbl: NOTRUN -> [DMESG-WARN][70] ([i915#180]) [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_pipe_b_c_ivb@pipe-b-dpms-off-modeset-pipe-c: - shard-tglb: NOTRUN -> [SKIP][71] ([fdo#109289]) [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@kms_pipe_b_c_ivb@pipe-b-dpms-off-modeset-pipe-c.html * igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d: - shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#533]) +2 similar issues [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d: - shard-kbl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#533]) +1 similar issue [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d.html * igt@kms_plane_alpha_blend@pipe-a-alpha-basic: - shard-apl: NOTRUN -> [FAIL][74] ([fdo#108145] / [i915#265]) +5 similar issues [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html * igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb: - shard-apl: NOTRUN -> [FAIL][75] ([i915#265]) [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl3/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html * igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb: - shard-kbl: NOTRUN -> [FAIL][76] ([i915#265]) [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [PASS][77] -> [FAIL][78] ([fdo#108145] / [i915#265]) +1 similar issue [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1: - shard-skl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658]) [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html - shard-kbl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#658]) +1 similar issue [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html * igt@kms_psr2_sf@plane-move-sf-dmg-area-2: - shard-apl: NOTRUN -> [SKIP][81] ([fdo#109271] / [i915#658]) +7 similar issues [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@kms_psr2_sf@plane-move-sf-dmg-area-2.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5: - shard-tglb: NOTRUN -> [SKIP][82] ([i915#2920]) [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html * igt@kms_psr2_su@page_flip: - shard-glk: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#658]) [83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk9/igt@kms_psr2_su@page_flip.html * igt@kms_psr@psr2_dpms: - shard-iclb: [PASS][84] -> [SKIP][85] ([fdo#109441]) [84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb2/igt@kms_psr@psr2_dpms.html [85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb1/igt@kms_psr@psr2_dpms.html * igt@kms_setmode@basic: - shard-snb: NOTRUN -> [FAIL][86] ([i915#31]) [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb2/igt@kms_setmode@basic.html * igt@kms_writeback@writeback-fb-id: - shard-skl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#2437]) [87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl7/igt@kms_writeback@writeback-fb-id.html * igt@kms_writeback@writeback-pixel-formats: - shard-glk: NOTRUN -> [SKIP][88] ([fdo#109271] / [i915#2437]) [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk9/igt@kms_writeback@writeback-pixel-formats.html * igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame: - shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271]) +251 similar issues [89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame.html * igt@nouveau_crc@pipe-c-ctx-flip-skip-current-frame: - shard-tglb: NOTRUN -> [SKIP][90] ([i915#2530]) +1 similar issue [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@nouveau_crc@pipe-c-ctx-flip-skip-current-frame.html * igt@prime_nv_pcopy@test1_macro: - shard-tglb: NOTRUN -> [SKIP][91] ([fdo#109291]) +1 similar issue [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@prime_nv_pcopy@test1_macro.html * igt@prime_nv_pcopy@test2: - shard-kbl: NOTRUN -> [SKIP][92] ([fdo#109271]) +58 similar issues [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@prime_nv_pcopy@test2.html * igt@prime_nv_pcopy@test3_3: - shard-glk: NOTRUN -> [SKIP][93] ([fdo#109271]) +36 similar issues [93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk9/igt@prime_nv_pcopy@test3_3.html * igt@sysfs_clients@create: - shard-skl: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#2994]) [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl5/igt@sysfs_clients@create.html * igt@sysfs_clients@recycle: - shard-tglb: NOTRUN -> [SKIP][95] ([i915#2994]) [95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@sysfs_clients@recycle.html * igt@sysfs_clients@recycle-many: - shard-apl: NOTRUN -> [SKIP][96] ([fdo#109271] / [i915#2994]) +3 similar issues [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl7/igt@sysfs_clients@recycle-many.html * igt@sysfs_clients@sema-50: - shard-kbl: NOTRUN -> [SKIP][97] ([fdo#109271] / [i915#2994]) +1 similar issue [97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl3/igt@sysfs_clients@sema-50.html #### Possible fixes #### * igt@gem_ctx_isolation@preservation-s3@vcs0: - shard-kbl: [DMESG-WARN][98] ([i915#180]) -> [PASS][99] +6 similar issues [98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@vcs0.html [99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@vcs0.html * igt@gem_exec_fair@basic-none-share@rcs0: - shard-iclb: [FAIL][100] ([i915#2842]) -> [PASS][101] +1 similar issue [100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb2/igt@gem_exec_fair@basic-none-share@rcs0.html [101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb2/igt@gem_exec_fair@basic-none-share@rcs0.html - shard-apl: [SKIP][102] ([fdo#109271]) -> [PASS][103] [102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-apl2/igt@gem_exec_fair@basic-none-share@rcs0.html [103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl6/igt@gem_exec_fair@basic-none-share@rcs0.html * igt@gem_exec_fair@basic-pace-share@rcs0: - shard-glk: [FAIL][104] ([i915#2842]) -> [PASS][105] +1 similar issue [104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html [105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_exec_fair@basic-pace@vecs0: - shard-tglb: [FAIL][106] ([i915#2842]) -> [PASS][107] +3 similar issues [106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb6/igt@gem_exec_fair@basic-pace@vecs0.html [107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb8/igt@gem_exec_fair@basic-pace@vecs0.html * igt@gem_mmap_gtt@cpuset-basic-small-copy-odd: - shard-glk: [INCOMPLETE][108] ([i915#2055] / [i915#3468]) -> [PASS][109] [108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk6/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html [109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk6/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html * igt@gem_mmap_gtt@cpuset-basic-small-copy-xy: - shard-tglb: [INCOMPLETE][110] ([i915#3468]) -> [PASS][111] +1 similar issue [110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb8/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html [111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb5/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html * igt@gem_mmap_gtt@cpuset-big-copy-odd: - shard-glk: [FAIL][112] ([i915#307]) -> [PASS][113] [112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk4/igt@gem_mmap_gtt@cpuset-big-copy-odd.html [113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk5/igt@gem_mmap_gtt@cpuset-big-copy-odd.html * igt@gem_userptr_blits@huge-split: - shard-tglb: [FAIL][114] ([i915#3376]) -> [PASS][115] [114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-tglb1/igt@gem_userptr_blits@huge-split.html [115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-tglb6/igt@gem_userptr_blits@huge-split.html * igt@kms_color@pipe-c-ctm-0-75: - shard-skl: [DMESG-WARN][116] ([i915#1982]) -> [PASS][117] [116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl4/igt@kms_color@pipe-c-ctm-0-75.html [117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl4/igt@kms_color@pipe-c-ctm-0-75.html * igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy: - shard-skl: [FAIL][118] ([i915#2346]) -> [PASS][119] [118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html [119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2: - shard-glk: [FAIL][120] ([i915#79]) -> [PASS][121] [120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html [121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk6/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1: - shard-iclb: [FAIL][122] ([i915#79]) -> [PASS][123] [122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb3/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html [123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb4/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html * igt@kms_flip@flip-vs-suspend@a-dp1: - shard-apl: [DMESG-WARN][124] ([i915#180]) -> [PASS][125] [124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-apl6/igt@kms_flip@flip-vs-suspend@a-dp1.html [125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-apl2/igt@kms_flip@flip-vs-suspend@a-dp1.html * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence: - shard-glk: [FAIL][126] ([i915#53]) -> [PASS][127] [126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk2/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence.html [127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk5/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence.html * igt@kms_psr@psr2_cursor_mmap_cpu: - shard-iclb: [SKIP][128] ([fdo#109441]) -> [PASS][129] +2 similar issues [128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb5/igt@kms_psr@psr2_cursor_mmap_cpu.html [129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html * igt@kms_vblank@pipe-c-ts-continuation-idle-hang: - shard-glk: [DMESG-WARN][130] ([i915#118] / [i915#95]) -> [PASS][131] [130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-glk2/igt@kms_vblank@pipe-c-ts-continuation-idle-hang.html [131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-glk9/igt@kms_vblank@pipe-c-ts-continuation-idle-hang.html * igt@perf@polling-parameterized: - shard-skl: [FAIL][132] ([i915#1542]) -> [PASS][133] [132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl10/igt@perf@polling-parameterized.html [133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl8/igt@perf@polling-parameterized.html #### Warnings #### * igt@gem_mmap_gtt@cpuset-basic-small-copy-odd: - shard-skl: [INCOMPLETE][134] ([i915#198] / [i915#2910] / [i915#3468]) -> [INCOMPLETE][135] ([i915#198] / [i915#2910]) [134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-skl10/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html [135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-skl4/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html * igt@gem_mmap_gtt@fault-concurrent-x: - shard-snb: [INCOMPLETE][136] ([i915#3485]) -> [INCOMPLETE][137] ([i915#3468] / [i915#3485]) [136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-snb6/igt@gem_mmap_gtt@fault-concurrent-x.html [137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-snb5/igt@gem_mmap_gtt@fault-concurrent-x.html * igt@i915_pm_rc6_residency@rc6-idle: - shard-iclb: [WARN][138] ([i915#2684]) -> [WARN][139] ([i915#1804] / [i915#2684]) [138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb1/igt@i915_pm_rc6_residency@rc6-idle.html [139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb4/igt@i915_pm_rc6_residency@rc6-idle.html * igt@i915_suspend@debugfs-reader: - shard-kbl: [DMESG-WARN][140] ([i915#180]) -> [INCOMPLETE][141] ([i915#155]) [140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-kbl7/igt@i915_suspend@debugfs-reader.html [141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-kbl4/igt@i915_suspend@debugfs-reader.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1: - shard-iclb: [SKIP][142] ([i915#2920]) -> [SKIP][143] ([i915#658]) [142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10138/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html [143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4: - shard-iclb: [SKIP][144] ([i915#658]) -> [SKIP][145] ([i915#2920]) +2 similar iss == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20217/index.html [-- Attachment #1.2: Type: text/html, Size: 33568 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] 8+ messages in thread
* [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err @ 2021-05-26 16:53 Anusha Srivatsa 2021-05-26 16:53 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 0 siblings, 1 reply; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-26 16:53 UTC (permalink / raw) To: intel-gfx 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 | 50 ++++++++++++------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 560574dd929a..5e9c0b509034 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,16 +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"); + if (!dmc->dmc_payload) return 0; - } payload = (u8 *)(dmc_header) + header_len_bytes; memcpy(dmc->dmc_payload, payload, payload_size); @@ -493,7 +492,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 +502,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 +515,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 +529,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 +543,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 +552,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 +561,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] 8+ messages in thread
* [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-26 16:53 [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa @ 2021-05-26 16:53 ` Anusha Srivatsa 0 siblings, 0 replies; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-26 16:53 UTC (permalink / raw) To: intel-gfx 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 2f7d1664c473..3ca8112eead5 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1218,7 +1218,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) { @@ -5577,7 +5577,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); } @@ -5644,7 +5644,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); } @@ -5710,7 +5710,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); } @@ -5867,7 +5867,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 */ @@ -6228,7 +6228,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; @@ -6418,7 +6418,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); @@ -6429,7 +6429,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 5e9c0b509034..97308da28059 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 *i915) +{ + return i915->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; @@ -654,7 +659,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); @@ -783,7 +788,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); } @@ -803,7 +808,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] 8+ messages in thread
* [Intel-gfx] [CI 0/3] More DMC cleanup @ 2021-05-24 19:21 Anusha Srivatsa 2021-05-24 19:21 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 0 siblings, 1 reply; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-24 19:21 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] 8+ messages in thread
* [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper 2021-05-24 19:21 [Intel-gfx] [CI 0/3] More DMC cleanup Anusha Srivatsa @ 2021-05-24 19:21 ` Anusha Srivatsa 0 siblings, 0 replies; 8+ messages in thread From: Anusha Srivatsa @ 2021-05-24 19:21 UTC (permalink / raw) To: intel-gfx 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..f9a0f194f9cf 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 *i915) +{ + return i915->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] 8+ messages in thread
end of thread, other threads:[~2021-05-27 18:20 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-26 22:02 [Intel-gfx] [CI 0/3] Resend More DMC cleanup Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 2021-05-26 22:02 ` [Intel-gfx] [CI 3/3] drm/i915/dmc: Move struct intel_dmc to intel_dmc.h Anusha Srivatsa 2021-05-27 2:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success for Resend More DMC cleanup Patchwork 2021-05-27 18:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-05-26 16:53 [Intel-gfx] [CI 1/3] drm/i915/dmc: s/DRM_ERROR/drm_err Anusha Srivatsa 2021-05-26 16:53 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa 2021-05-24 19:21 [Intel-gfx] [CI 0/3] More DMC cleanup Anusha Srivatsa 2021-05-24 19:21 ` [Intel-gfx] [CI 2/3] drm/i915/dmc: Add intel_dmc_has_payload() helper Anusha Srivatsa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.