* [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
@ 2021-09-25 12:46 ` Cai Huoqing
0 siblings, 0 replies; 10+ messages in thread
From: Cai Huoqing @ 2021-09-25 12:46 UTC (permalink / raw)
To: caihuoqing
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
Replace direction definition PCI_DMA_BIDIRECTIONAL
with DMA_BIDIRECTIONAL, because it helps to enhance readability
and avoid possible inconsistency.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index a74b72f50cc9..afb35d2e5c73 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
mem->remap_addr = dma_map_resource(i915->drm.dev,
mem->region.start,
mem->fake_mappable.size,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_FORCE_CONTIGUOUS);
if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
drm_mm_remove_node(&mem->fake_mappable);
@@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
dma_unmap_resource(mem->i915->drm.dev,
mem->remap_addr,
mem->fake_mappable.size,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_FORCE_CONTIGUOUS);
}
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index e5c2fdfc20e3..53d0cb327539 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
- PCI_DMA_BIDIRECTIONAL);
+ DMA_BIDIRECTIONAL);
radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
@@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
*/
spt->shadow_page.type = type;
daddr = dma_map_page(kdev, spt->shadow_page.page,
- 0, 4096, PCI_DMA_BIDIRECTIONAL);
+ 0, 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(kdev, daddr)) {
gvt_vgpu_err("fail to map dma addr\n");
ret = -EINVAL;
@@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
return spt;
err_unmap_dma:
- dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
err_free_spt:
free_spt(spt);
return ERR_PTR(ret);
@@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
return -ENOMEM;
}
- daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
- 4096, PCI_DMA_BIDIRECTIONAL);
+ daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, daddr)) {
gvt_vgpu_err("fail to dmamap scratch_pt\n");
__free_page(virt_to_page(scratch_pt));
@@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
if (vgpu->gtt.scratch_pt[i].page != NULL) {
daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
I915_GTT_PAGE_SHIFT);
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(vgpu->gtt.scratch_pt[i].page);
vgpu->gtt.scratch_pt[i].page = NULL;
vgpu->gtt.scratch_pt[i].page_mfn = 0;
@@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
}
daddr = dma_map_page(dev, virt_to_page(page), 0,
- 4096, PCI_DMA_BIDIRECTIONAL);
+ 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, daddr)) {
gvt_err("fail to dmamap scratch ggtt page\n");
__free_page(virt_to_page(page));
@@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
ret = setup_spt_oos(gvt);
if (ret) {
gvt_err("fail to initialize SPT oos\n");
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(gvt->gtt.scratch_page);
return ret;
}
@@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
I915_GTT_PAGE_SHIFT);
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(gvt->gtt.scratch_page);
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 7efa386449d1..20b82fb036f8 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
return ret;
/* Setup DMA mapping. */
- *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
+ *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, *dma_addr)) {
gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
page_to_pfn(page), ret);
@@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
{
struct device *dev = vgpu->gvt->gt->i915->drm.dev;
- dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
gvt_unpin_guest_page(vgpu, gfn, size);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 36489be4896b..cd5f2348a187 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
do {
if (dma_map_sg_attrs(obj->base.dev->dev,
pages->sgl, pages->nents,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_SKIP_CPU_SYNC |
DMA_ATTR_NO_KERNEL_MAPPING |
DMA_ATTR_NO_WARN))
@@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
usleep_range(100, 250);
dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
- PCI_DMA_BIDIRECTIONAL);
+ DMA_BIDIRECTIONAL);
}
/**
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
@ 2021-09-25 12:46 ` Cai Huoqing
0 siblings, 0 replies; 10+ messages in thread
From: Cai Huoqing @ 2021-09-25 12:46 UTC (permalink / raw)
To: caihuoqing
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
Replace direction definition PCI_DMA_BIDIRECTIONAL
with DMA_BIDIRECTIONAL, because it helps to enhance readability
and avoid possible inconsistency.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index a74b72f50cc9..afb35d2e5c73 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
mem->remap_addr = dma_map_resource(i915->drm.dev,
mem->region.start,
mem->fake_mappable.size,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_FORCE_CONTIGUOUS);
if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
drm_mm_remove_node(&mem->fake_mappable);
@@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
dma_unmap_resource(mem->i915->drm.dev,
mem->remap_addr,
mem->fake_mappable.size,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_FORCE_CONTIGUOUS);
}
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index e5c2fdfc20e3..53d0cb327539 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
- PCI_DMA_BIDIRECTIONAL);
+ DMA_BIDIRECTIONAL);
radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
@@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
*/
spt->shadow_page.type = type;
daddr = dma_map_page(kdev, spt->shadow_page.page,
- 0, 4096, PCI_DMA_BIDIRECTIONAL);
+ 0, 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(kdev, daddr)) {
gvt_vgpu_err("fail to map dma addr\n");
ret = -EINVAL;
@@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
return spt;
err_unmap_dma:
- dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
err_free_spt:
free_spt(spt);
return ERR_PTR(ret);
@@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
return -ENOMEM;
}
- daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
- 4096, PCI_DMA_BIDIRECTIONAL);
+ daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, daddr)) {
gvt_vgpu_err("fail to dmamap scratch_pt\n");
__free_page(virt_to_page(scratch_pt));
@@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
if (vgpu->gtt.scratch_pt[i].page != NULL) {
daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
I915_GTT_PAGE_SHIFT);
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(vgpu->gtt.scratch_pt[i].page);
vgpu->gtt.scratch_pt[i].page = NULL;
vgpu->gtt.scratch_pt[i].page_mfn = 0;
@@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
}
daddr = dma_map_page(dev, virt_to_page(page), 0,
- 4096, PCI_DMA_BIDIRECTIONAL);
+ 4096, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, daddr)) {
gvt_err("fail to dmamap scratch ggtt page\n");
__free_page(virt_to_page(page));
@@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
ret = setup_spt_oos(gvt);
if (ret) {
gvt_err("fail to initialize SPT oos\n");
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(gvt->gtt.scratch_page);
return ret;
}
@@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
I915_GTT_PAGE_SHIFT);
- dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
__free_page(gvt->gtt.scratch_page);
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 7efa386449d1..20b82fb036f8 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
return ret;
/* Setup DMA mapping. */
- *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
+ *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
if (dma_mapping_error(dev, *dma_addr)) {
gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
page_to_pfn(page), ret);
@@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
{
struct device *dev = vgpu->gvt->gt->i915->drm.dev;
- dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
+ dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
gvt_unpin_guest_page(vgpu, gfn, size);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 36489be4896b..cd5f2348a187 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
do {
if (dma_map_sg_attrs(obj->base.dev->dev,
pages->sgl, pages->nents,
- PCI_DMA_BIDIRECTIONAL,
+ DMA_BIDIRECTIONAL,
DMA_ATTR_SKIP_CPU_SYNC |
DMA_ATTR_NO_KERNEL_MAPPING |
DMA_ATTR_NO_WARN))
@@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
usleep_range(100, 250);
dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
- PCI_DMA_BIDIRECTIONAL);
+ DMA_BIDIRECTIONAL);
}
/**
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
2021-09-25 12:46 ` [Intel-gfx] " Cai Huoqing
(?)
@ 2021-09-27 16:26 ` Patchwork
-1 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2021-09-27 16:26 UTC (permalink / raw)
To: Cai Huoqing; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3683 bytes --]
== Series Details ==
Series: drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
URL : https://patchwork.freedesktop.org/series/95091/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10648 -> Patchwork_21166
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/index.html
Known issues
------------
Here are the changes found in Patchwork_21166 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-bsw-kefka: NOTRUN -> [SKIP][1] ([fdo#109271]) +32 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bsw-kefka/igt@amdgpu/amd_basic@query-info.html
* igt@gem_huc_copy@huc-copy:
- fi-bxt-dsi: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bxt-dsi/igt@gem_huc_copy@huc-copy.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-bxt-dsi: NOTRUN -> [SKIP][3] ([fdo#109271] / [fdo#111827]) +8 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bxt-dsi/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@hdmi-edid-read:
- fi-bsw-kefka: NOTRUN -> [SKIP][4] ([fdo#109271] / [fdo#111827]) +8 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bsw-kefka/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-bxt-dsi: NOTRUN -> [SKIP][5] ([fdo#109271]) +30 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bxt-dsi/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_frontbuffer_tracking@basic:
- fi-rkl-11600: [PASS][6] -> [SKIP][7] ([i915#1849] / [i915#3180])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/fi-rkl-11600/igt@kms_frontbuffer_tracking@basic.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-rkl-11600/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-bxt-dsi: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#533])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/fi-bxt-dsi/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3180]: https://gitlab.freedesktop.org/drm/intel/issues/3180
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Participating hosts (38 -> 33)
------------------------------
Additional (1): fi-bsw-kefka
Missing (6): bat-adls-5 fi-bsw-cyan bat-adlp-4 fi-bdw-samus bat-jsl-2 bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10648 -> Patchwork_21166
CI-20190529: 20190529
CI_DRM_10648: 73d93dcb0d48bb76af25ca3f7149598e4bc68098 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6219: 4b5644c9751b489c73c9bb174644c08b31533cc8 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21166: 6b2b0a2545bc589dd44678339e9145fee6d0422e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6b2b0a2545bc drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/index.html
[-- Attachment #2: Type: text/html, Size: 4844 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
2021-09-25 12:46 ` [Intel-gfx] " Cai Huoqing
(?)
(?)
@ 2021-09-27 19:06 ` Patchwork
-1 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2021-09-27 19:06 UTC (permalink / raw)
To: Cai Huoqing; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30308 bytes --]
== Series Details ==
Series: drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
URL : https://patchwork.freedesktop.org/series/95091/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10648_full -> Patchwork_21166_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21166_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21166_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21166_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-pgflip-blt:
- shard-iclb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-pgflip-blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-pgflip-blt.html
Known issues
------------
Here are the changes found in Patchwork_21166_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@legacy-engines-queued:
- shard-snb: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#1099]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-snb6/igt@gem_ctx_persistence@legacy-engines-queued.html
* igt@gem_eio@hibernate:
- shard-glk: NOTRUN -> [DMESG-WARN][4] ([i915#1610])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@gem_eio@hibernate.html
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][5] -> [TIMEOUT][6] ([i915#2369] / [i915#3063] / [i915#3648])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-tglb5/igt@gem_eio@unwedge-stress.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb6/igt@gem_eio@unwedge-stress.html
- shard-snb: NOTRUN -> [FAIL][7] ([i915#3354])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-snb7/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb4/igt@gem_exec_fair@basic-none-share@rcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb5/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][10] -> [FAIL][11] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-glk9/igt@gem_exec_fair@basic-pace-share@rcs0.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: NOTRUN -> [FAIL][12] ([i915#2842]) +3 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [PASS][13] -> [FAIL][14] ([i915#2842])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-kbl7/igt@gem_exec_fair@basic-pace@rcs0.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl1/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_suspend@basic-s3:
- shard-apl: NOTRUN -> [DMESG-WARN][15] ([i915#180])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@gem_exec_suspend@basic-s3.html
* igt@gem_render_copy@y-tiled-to-vebox-linear:
- shard-iclb: NOTRUN -> [SKIP][16] ([i915#768])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@gem_render_copy@y-tiled-to-vebox-linear.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#3323])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-tglb: NOTRUN -> [SKIP][18] ([i915#3297]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@gem_userptr_blits@dmabuf-unsync.html
* igt@gem_userptr_blits@vma-merge:
- shard-apl: NOTRUN -> [FAIL][19] ([i915#3318])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@gem_userptr_blits@vma-merge.html
- shard-tglb: NOTRUN -> [FAIL][20] ([i915#3318])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@gem_userptr_blits@vma-merge.html
* igt@gen7_exec_parse@cmd-crossing-page:
- shard-tglb: NOTRUN -> [SKIP][21] ([fdo#109289]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@gen7_exec_parse@cmd-crossing-page.html
* igt@gen9_exec_parse@bb-large:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#2856])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@gen9_exec_parse@bb-large.html
* igt@i915_pm_lpsp@screens-disabled:
- shard-tglb: NOTRUN -> [SKIP][23] ([i915#1902])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@i915_pm_lpsp@screens-disabled.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-tglb: NOTRUN -> [WARN][24] ([i915#2681])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-iclb: NOTRUN -> [SKIP][25] ([fdo#110892])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@i915_pm_rpm@dpms-non-lpsp.html
* igt@kms_big_fb@y-tiled-64bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][26] ([fdo#111614])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb8/igt@kms_big_fb@y-tiled-64bpp-rotate-270.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#3777]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-glk: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3777])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
* igt@kms_big_fb@yf-tiled-64bpp-rotate-0:
- shard-tglb: NOTRUN -> [SKIP][29] ([fdo#111615]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_big_fb@yf-tiled-64bpp-rotate-0.html
* igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3886])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl3/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#3886]) +7 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl6/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_gen12_rc_ccs_cc:
- shard-iclb: NOTRUN -> [SKIP][32] ([fdo#109278] / [i915#3886])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3886]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][34] ([i915#3689] / [i915#3886]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#3886]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl3/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][36] ([i915#3689]) +4 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs.html
* igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][37] ([fdo#109271]) +56 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl3/igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-iclb: NOTRUN -> [SKIP][38] ([fdo#109278]) +2 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-audio:
- shard-kbl: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl3/igt@kms_chamelium@dp-audio.html
* igt@kms_chamelium@dp-mode-timings:
- shard-apl: NOTRUN -> [SKIP][40] ([fdo#109271] / [fdo#111827]) +11 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@kms_chamelium@dp-mode-timings.html
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109284] / [fdo#111827])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_chamelium@dp-mode-timings.html
* igt@kms_chamelium@hdmi-hpd-enable-disable-mode:
- shard-snb: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +12 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-snb6/igt@kms_chamelium@hdmi-hpd-enable-disable-mode.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl4/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_color_chamelium@pipe-b-ctm-0-5:
- shard-tglb: NOTRUN -> [SKIP][44] ([fdo#109284] / [fdo#111827]) +5 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_color_chamelium@pipe-b-ctm-0-5.html
* igt@kms_color_chamelium@pipe-d-ctm-0-25:
- shard-glk: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_color_chamelium@pipe-d-ctm-0-25.html
* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> [TIMEOUT][46] ([i915#1319])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@kms_content_protection@atomic-dpms.html
* igt@kms_content_protection@legacy:
- shard-glk: NOTRUN -> [SKIP][47] ([fdo#109271]) +27 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_content_protection@legacy.html
* igt@kms_content_protection@mei_interface:
- shard-tglb: NOTRUN -> [SKIP][48] ([fdo#111828])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_content_protection@mei_interface.html
* igt@kms_cursor_crc@pipe-a-cursor-512x512-offscreen:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109278] / [fdo#109279]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_cursor_crc@pipe-a-cursor-512x512-offscreen.html
* igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding:
- shard-tglb: NOTRUN -> [SKIP][50] ([fdo#109279] / [i915#3359])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding.html
* igt@kms_cursor_crc@pipe-d-cursor-max-size-sliding:
- shard-tglb: NOTRUN -> [SKIP][51] ([i915#3359]) +4 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_cursor_crc@pipe-d-cursor-max-size-sliding.html
* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic:
- shard-skl: [PASS][52] -> [FAIL][53] ([i915#2346])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#79])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
* igt@kms_flip@flip-vs-suspend@b-dp1:
- shard-apl: [PASS][56] -> [DMESG-WARN][57] ([i915#180])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-apl7/igt@kms_flip@flip-vs-suspend@b-dp1.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl8/igt@kms_flip@flip-vs-suspend@b-dp1.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [PASS][58] -> [FAIL][59] ([i915#2122]) +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl9/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl6/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile:
- shard-iclb: [PASS][60] -> [SKIP][61] ([i915#3701])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb7/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-msflip-blt:
- shard-snb: NOTRUN -> [SKIP][62] ([fdo#109271]) +289 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-snb6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][63] ([fdo#109280])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-indfb-pgflip-blt:
- shard-tglb: NOTRUN -> [SKIP][64] ([fdo#111825]) +18 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@kms_frontbuffer_tracking@psr-2p-primscrn-indfb-pgflip-blt.html
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-tglb: [PASS][65] -> [INCOMPLETE][66] ([i915#2411] / [i915#456])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-tglb1/igt@kms_frontbuffer_tracking@psr-suspend.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb7/igt@kms_frontbuffer_tracking@psr-suspend.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][67] -> [DMESG-WARN][68] ([i915#180]) +6 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-kbl7/igt@kms_hdr@bpc-switch-suspend.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl4/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
- shard-apl: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#533])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-glk: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#533])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_pipe_crc_basic@hang-read-crc-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-apl: NOTRUN -> [FAIL][71] ([fdo#108145] / [i915#265])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][72] -> [FAIL][73] ([fdo#108145] / [i915#265])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl6/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][74] ([fdo#112054])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@kms_plane_lowres@pipe-a-tiling-yf.html
* igt@kms_plane_lowres@pipe-c-tiling-x:
- shard-iclb: NOTRUN -> [SKIP][75] ([i915#3536])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_plane_lowres@pipe-c-tiling-x.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
- shard-kbl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#658]) +1 similar issue
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl1/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html
- shard-iclb: NOTRUN -> [SKIP][77] ([i915#658])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html
- shard-apl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#658]) +2 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-glk: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk3/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-3:
- shard-tglb: NOTRUN -> [SKIP][80] ([i915#2920]) +1 similar issue
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb8/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-3.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][81] -> [SKIP][82] ([fdo#109642] / [fdo#111068] / [i915#658])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb7/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][83] -> [SKIP][84] ([fdo#109441])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_psr@psr2_no_drrs:
- shard-tglb: NOTRUN -> [FAIL][85] ([i915#132] / [i915#3467]) +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb8/igt@kms_psr@psr2_no_drrs.html
* igt@kms_sequence@get-busy:
- shard-skl: [PASS][86] -> [DMESG-WARN][87] ([i915#1982]) +1 similar issue
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl2/igt@kms_sequence@get-busy.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl2/igt@kms_sequence@get-busy.html
* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][88] ([i915#31])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-snb7/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-d-query-forked-busy:
- shard-skl: NOTRUN -> [SKIP][89] ([fdo#109271]) +13 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl6/igt@kms_vblank@pipe-d-query-forked-busy.html
* igt@kms_vblank@pipe-d-wait-forked-hang:
- shard-apl: NOTRUN -> [SKIP][90] ([fdo#109271]) +199 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@kms_vblank@pipe-d-wait-forked-hang.html
* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#2437])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@kms_writeback@writeback-check-output.html
* igt@nouveau_crc@pipe-c-source-outp-inactive:
- shard-tglb: NOTRUN -> [SKIP][92] ([i915#2530]) +1 similar issue
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@nouveau_crc@pipe-c-source-outp-inactive.html
* igt@perf@polling-small-buf:
- shard-skl: [PASS][93] -> [FAIL][94] ([i915#1722])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl1/igt@perf@polling-small-buf.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl10/igt@perf@polling-small-buf.html
* igt@perf_pmu@rc6-suspend:
- shard-tglb: [PASS][95] -> [INCOMPLETE][96] ([i915#4173] / [i915#456])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-tglb8/igt@perf_pmu@rc6-suspend.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb7/igt@perf_pmu@rc6-suspend.html
* igt@prime_nv_api@i915_nv_double_import:
- shard-tglb: NOTRUN -> [SKIP][97] ([fdo#109291]) +3 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@prime_nv_api@i915_nv_double_import.html
* igt@sysfs_clients@create:
- shard-apl: NOTRUN -> [SKIP][98] ([fdo#109271] / [i915#2994]) +3 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl1/igt@sysfs_clients@create.html
* igt@sysfs_clients@sema-10:
- shard-tglb: NOTRUN -> [SKIP][99] ([i915#2994])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb5/igt@sysfs_clients@sema-10.html
* igt@sysfs_clients@split-10:
- shard-iclb: NOTRUN -> [SKIP][100] ([i915#2994])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@sysfs_clients@split-10.html
* igt@sysfs_clients@split-50:
- shard-kbl: NOTRUN -> [SKIP][101] ([fdo#109271] / [i915#2994]) +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl3/igt@sysfs_clients@split-50.html
#### Possible fixes ####
* igt@gem_workarounds@suspend-resume:
- shard-skl: [INCOMPLETE][102] ([i915#198]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl6/igt@gem_workarounds@suspend-resume.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl3/igt@gem_workarounds@suspend-resume.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][104] ([i915#1436] / [i915#716]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl7/igt@gen9_exec_parse@allowed-single.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl6/igt@gen9_exec_parse@allowed-single.html
* igt@i915_selftest@live@gt_heartbeat:
- shard-skl: [DMESG-FAIL][106] ([i915#2291] / [i915#541]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl6/igt@i915_selftest@live@gt_heartbeat.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl3/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_suspend@forcewake:
- shard-kbl: [DMESG-WARN][108] ([i915#180]) -> [PASS][109] +1 similar issue
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-kbl6/igt@i915_suspend@forcewake.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl3/igt@i915_suspend@forcewake.html
* igt@kms_big_fb@linear-64bpp-rotate-180:
- shard-glk: [DMESG-WARN][110] -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-glk7/igt@kms_big_fb@linear-64bpp-rotate-180.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk1/igt@kms_big_fb@linear-64bpp-rotate-180.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [DMESG-WARN][112] ([i915#118] / [i915#95]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-glk4/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-glk7/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
* igt@kms_color@pipe-a-ctm-0-75:
- shard-skl: [DMESG-WARN][114] ([i915#1982]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl2/igt@kms_color@pipe-a-ctm-0-75.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl2/igt@kms_color@pipe-a-ctm-0-75.html
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [FAIL][116] ([i915#2122]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile:
- shard-iclb: [SKIP][118] ([i915#3701]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb7/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-tglb: [INCOMPLETE][120] ([i915#2411] / [i915#456]) -> [PASS][121] +1 similar issue
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-suspend.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][122] ([i915#1188]) -> [PASS][123] +2 similar issues
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes:
- shard-apl: [DMESG-WARN][124] ([i915#180]) -> [PASS][125] +1 similar issue
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-tglb: [INCOMPLETE][126] ([i915#456]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-tglb7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-tglb1/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][128] ([fdo#109441]) -> [PASS][129] +3 similar issues
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
#### Warnings ####
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [FAIL][130] ([i915#2842]) -> [SKIP][131] ([fdo#109271])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-kbl7/igt@gem_exec_fair@basic-pace@vcs0.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][132] ([i915#2684]) -> [WARN][133] ([i915#1804] / [i915#2684])
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb1/igt@i915_pm_rc6_residency@rc6-fence.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb6/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-iclb: [SKIP][134] ([i915#2920]) -> [SKIP][135] ([i915#658])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb2/igt@kms_psr2_sf@cursor-plane-update-sf.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/shard-iclb7/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
- shard-iclb: [SKIP][136] ([i915#658]) -> [SKIP][137] ([i915#2920])
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10648/shard-iclb7/i
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21166/index.html
[-- Attachment #2: Type: text/html, Size: 33669 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
2021-09-25 12:46 ` [Intel-gfx] " Cai Huoqing
@ 2021-09-30 14:21 ` Daniel Vetter
-1 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2021-09-30 14:21 UTC (permalink / raw)
To: Cai Huoqing
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
> Replace direction definition PCI_DMA_BIDIRECTIONAL
> with DMA_BIDIRECTIONAL, because it helps to enhance readability
> and avoid possible inconsistency.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Applied to drm-intel-gt-next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
> drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
> drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
> 4 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> index a74b72f50cc9..afb35d2e5c73 100644
> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
> mem->remap_addr = dma_map_resource(i915->drm.dev,
> mem->region.start,
> mem->fake_mappable.size,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_FORCE_CONTIGUOUS);
> if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
> drm_mm_remove_node(&mem->fake_mappable);
> @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
> dma_unmap_resource(mem->i915->drm.dev,
> mem->remap_addr,
> mem->fake_mappable.size,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_FORCE_CONTIGUOUS);
> }
>
> diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
> index e5c2fdfc20e3..53d0cb327539 100644
> --- a/drivers/gpu/drm/i915/gvt/gtt.c
> +++ b/drivers/gpu/drm/i915/gvt/gtt.c
> @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
> trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
>
> dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
> - PCI_DMA_BIDIRECTIONAL);
> + DMA_BIDIRECTIONAL);
>
> radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
>
> @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> */
> spt->shadow_page.type = type;
> daddr = dma_map_page(kdev, spt->shadow_page.page,
> - 0, 4096, PCI_DMA_BIDIRECTIONAL);
> + 0, 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(kdev, daddr)) {
> gvt_vgpu_err("fail to map dma addr\n");
> ret = -EINVAL;
> @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> return spt;
>
> err_unmap_dma:
> - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
> err_free_spt:
> free_spt(spt);
> return ERR_PTR(ret);
> @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
> return -ENOMEM;
> }
>
> - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
> - 4096, PCI_DMA_BIDIRECTIONAL);
> + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, daddr)) {
> gvt_vgpu_err("fail to dmamap scratch_pt\n");
> __free_page(virt_to_page(scratch_pt));
> @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
> if (vgpu->gtt.scratch_pt[i].page != NULL) {
> daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
> I915_GTT_PAGE_SHIFT);
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> __free_page(vgpu->gtt.scratch_pt[i].page);
> vgpu->gtt.scratch_pt[i].page = NULL;
> vgpu->gtt.scratch_pt[i].page_mfn = 0;
> @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> }
>
> daddr = dma_map_page(dev, virt_to_page(page), 0,
> - 4096, PCI_DMA_BIDIRECTIONAL);
> + 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, daddr)) {
> gvt_err("fail to dmamap scratch ggtt page\n");
> __free_page(virt_to_page(page));
> @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> ret = setup_spt_oos(gvt);
> if (ret) {
> gvt_err("fail to initialize SPT oos\n");
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> __free_page(gvt->gtt.scratch_page);
> return ret;
> }
> @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
> dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
> I915_GTT_PAGE_SHIFT);
>
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>
> __free_page(gvt->gtt.scratch_page);
>
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 7efa386449d1..20b82fb036f8 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
> return ret;
>
> /* Setup DMA mapping. */
> - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
> + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, *dma_addr)) {
> gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
> page_to_pfn(page), ret);
> @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
> {
> struct device *dev = vgpu->gvt->gt->i915->drm.dev;
>
> - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
> gvt_unpin_guest_page(vgpu, gfn, size);
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 36489be4896b..cd5f2348a187 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
> do {
> if (dma_map_sg_attrs(obj->base.dev->dev,
> pages->sgl, pages->nents,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_SKIP_CPU_SYNC |
> DMA_ATTR_NO_KERNEL_MAPPING |
> DMA_ATTR_NO_WARN))
> @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
> usleep_range(100, 250);
>
> dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
> - PCI_DMA_BIDIRECTIONAL);
> + DMA_BIDIRECTIONAL);
> }
>
> /**
> --
> 2.25.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
@ 2021-09-30 14:21 ` Daniel Vetter
0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2021-09-30 14:21 UTC (permalink / raw)
To: Cai Huoqing
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
> Replace direction definition PCI_DMA_BIDIRECTIONAL
> with DMA_BIDIRECTIONAL, because it helps to enhance readability
> and avoid possible inconsistency.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Applied to drm-intel-gt-next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
> drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
> drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
> 4 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> index a74b72f50cc9..afb35d2e5c73 100644
> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
> mem->remap_addr = dma_map_resource(i915->drm.dev,
> mem->region.start,
> mem->fake_mappable.size,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_FORCE_CONTIGUOUS);
> if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
> drm_mm_remove_node(&mem->fake_mappable);
> @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
> dma_unmap_resource(mem->i915->drm.dev,
> mem->remap_addr,
> mem->fake_mappable.size,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_FORCE_CONTIGUOUS);
> }
>
> diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
> index e5c2fdfc20e3..53d0cb327539 100644
> --- a/drivers/gpu/drm/i915/gvt/gtt.c
> +++ b/drivers/gpu/drm/i915/gvt/gtt.c
> @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
> trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
>
> dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
> - PCI_DMA_BIDIRECTIONAL);
> + DMA_BIDIRECTIONAL);
>
> radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
>
> @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> */
> spt->shadow_page.type = type;
> daddr = dma_map_page(kdev, spt->shadow_page.page,
> - 0, 4096, PCI_DMA_BIDIRECTIONAL);
> + 0, 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(kdev, daddr)) {
> gvt_vgpu_err("fail to map dma addr\n");
> ret = -EINVAL;
> @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> return spt;
>
> err_unmap_dma:
> - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
> err_free_spt:
> free_spt(spt);
> return ERR_PTR(ret);
> @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
> return -ENOMEM;
> }
>
> - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
> - 4096, PCI_DMA_BIDIRECTIONAL);
> + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, daddr)) {
> gvt_vgpu_err("fail to dmamap scratch_pt\n");
> __free_page(virt_to_page(scratch_pt));
> @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
> if (vgpu->gtt.scratch_pt[i].page != NULL) {
> daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
> I915_GTT_PAGE_SHIFT);
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> __free_page(vgpu->gtt.scratch_pt[i].page);
> vgpu->gtt.scratch_pt[i].page = NULL;
> vgpu->gtt.scratch_pt[i].page_mfn = 0;
> @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> }
>
> daddr = dma_map_page(dev, virt_to_page(page), 0,
> - 4096, PCI_DMA_BIDIRECTIONAL);
> + 4096, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, daddr)) {
> gvt_err("fail to dmamap scratch ggtt page\n");
> __free_page(virt_to_page(page));
> @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> ret = setup_spt_oos(gvt);
> if (ret) {
> gvt_err("fail to initialize SPT oos\n");
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> __free_page(gvt->gtt.scratch_page);
> return ret;
> }
> @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
> dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
> I915_GTT_PAGE_SHIFT);
>
> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>
> __free_page(gvt->gtt.scratch_page);
>
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 7efa386449d1..20b82fb036f8 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
> return ret;
>
> /* Setup DMA mapping. */
> - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
> + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
> if (dma_mapping_error(dev, *dma_addr)) {
> gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
> page_to_pfn(page), ret);
> @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
> {
> struct device *dev = vgpu->gvt->gt->i915->drm.dev;
>
> - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
> + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
> gvt_unpin_guest_page(vgpu, gfn, size);
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 36489be4896b..cd5f2348a187 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
> do {
> if (dma_map_sg_attrs(obj->base.dev->dev,
> pages->sgl, pages->nents,
> - PCI_DMA_BIDIRECTIONAL,
> + DMA_BIDIRECTIONAL,
> DMA_ATTR_SKIP_CPU_SYNC |
> DMA_ATTR_NO_KERNEL_MAPPING |
> DMA_ATTR_NO_WARN))
> @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
> usleep_range(100, 250);
>
> dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
> - PCI_DMA_BIDIRECTIONAL);
> + DMA_BIDIRECTIONAL);
> }
>
> /**
> --
> 2.25.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
2021-09-30 14:21 ` [Intel-gfx] " Daniel Vetter
@ 2021-09-30 18:58 ` Christophe JAILLET
-1 siblings, 0 replies; 10+ messages in thread
From: Christophe JAILLET @ 2021-09-30 18:58 UTC (permalink / raw)
To: Cai Huoqing, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
David Airlie, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
Le 30/09/2021 à 16:21, Daniel Vetter a écrit :
> On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
>> Replace direction definition PCI_DMA_BIDIRECTIONAL
>> with DMA_BIDIRECTIONAL, because it helps to enhance readability
>> and avoid possible inconsistency.
>>
>> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
>
> Applied to drm-intel-gt-next, thanks for the patch.
> -Daniel
Hi,
just in case, a similar patch received some (unrelated) comments a few
weeks ago. See [1].
Should it rings some bells to someone who know who knows what should be
done.
Just my 2c.
[1]:
https://lore.kernel.org/kernel-janitors/0cd61d5b-ac88-31e8-99ad-143af480416f@arm.com/
CJ
>
>> ---
>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
>> drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
>> drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
>> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
>> 4 files changed, 14 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> index a74b72f50cc9..afb35d2e5c73 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
>> mem->remap_addr = dma_map_resource(i915->drm.dev,
>> mem->region.start,
>> mem->fake_mappable.size,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_FORCE_CONTIGUOUS);
>> if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
>> drm_mm_remove_node(&mem->fake_mappable);
>> @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
>> dma_unmap_resource(mem->i915->drm.dev,
>> mem->remap_addr,
>> mem->fake_mappable.size,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_FORCE_CONTIGUOUS);
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
>> index e5c2fdfc20e3..53d0cb327539 100644
>> --- a/drivers/gpu/drm/i915/gvt/gtt.c
>> +++ b/drivers/gpu/drm/i915/gvt/gtt.c
>> @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
>> trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
>>
>> dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
>> - PCI_DMA_BIDIRECTIONAL);
>> + DMA_BIDIRECTIONAL);
>>
>> radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
>>
>> @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
>> */
>> spt->shadow_page.type = type;
>> daddr = dma_map_page(kdev, spt->shadow_page.page,
>> - 0, 4096, PCI_DMA_BIDIRECTIONAL);
>> + 0, 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(kdev, daddr)) {
>> gvt_vgpu_err("fail to map dma addr\n");
>> ret = -EINVAL;
>> @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
>> return spt;
>>
>> err_unmap_dma:
>> - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
>> err_free_spt:
>> free_spt(spt);
>> return ERR_PTR(ret);
>> @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
>> return -ENOMEM;
>> }
>>
>> - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
>> - 4096, PCI_DMA_BIDIRECTIONAL);
>> + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, daddr)) {
>> gvt_vgpu_err("fail to dmamap scratch_pt\n");
>> __free_page(virt_to_page(scratch_pt));
>> @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
>> if (vgpu->gtt.scratch_pt[i].page != NULL) {
>> daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
>> I915_GTT_PAGE_SHIFT);
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>> __free_page(vgpu->gtt.scratch_pt[i].page);
>> vgpu->gtt.scratch_pt[i].page = NULL;
>> vgpu->gtt.scratch_pt[i].page_mfn = 0;
>> @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
>> }
>>
>> daddr = dma_map_page(dev, virt_to_page(page), 0,
>> - 4096, PCI_DMA_BIDIRECTIONAL);
>> + 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, daddr)) {
>> gvt_err("fail to dmamap scratch ggtt page\n");
>> __free_page(virt_to_page(page));
>> @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
>> ret = setup_spt_oos(gvt);
>> if (ret) {
>> gvt_err("fail to initialize SPT oos\n");
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>> __free_page(gvt->gtt.scratch_page);
>> return ret;
>> }
>> @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
>> dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
>> I915_GTT_PAGE_SHIFT);
>>
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>>
>> __free_page(gvt->gtt.scratch_page);
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
>> index 7efa386449d1..20b82fb036f8 100644
>> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
>> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
>> @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
>> return ret;
>>
>> /* Setup DMA mapping. */
>> - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
>> + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, *dma_addr)) {
>> gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
>> page_to_pfn(page), ret);
>> @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
>> {
>> struct device *dev = vgpu->gvt->gt->i915->drm.dev;
>>
>> - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
>> gvt_unpin_guest_page(vgpu, gfn, size);
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> index 36489be4896b..cd5f2348a187 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
>> do {
>> if (dma_map_sg_attrs(obj->base.dev->dev,
>> pages->sgl, pages->nents,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_SKIP_CPU_SYNC |
>> DMA_ATTR_NO_KERNEL_MAPPING |
>> DMA_ATTR_NO_WARN))
>> @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
>> usleep_range(100, 250);
>>
>> dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
>> - PCI_DMA_BIDIRECTIONAL);
>> + DMA_BIDIRECTIONAL);
>> }
>>
>> /**
>> --
>> 2.25.1
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
@ 2021-09-30 18:58 ` Christophe JAILLET
0 siblings, 0 replies; 10+ messages in thread
From: Christophe JAILLET @ 2021-09-30 18:58 UTC (permalink / raw)
To: Cai Huoqing, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
David Airlie, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
Le 30/09/2021 à 16:21, Daniel Vetter a écrit :
> On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
>> Replace direction definition PCI_DMA_BIDIRECTIONAL
>> with DMA_BIDIRECTIONAL, because it helps to enhance readability
>> and avoid possible inconsistency.
>>
>> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
>
> Applied to drm-intel-gt-next, thanks for the patch.
> -Daniel
Hi,
just in case, a similar patch received some (unrelated) comments a few
weeks ago. See [1].
Should it rings some bells to someone who know who knows what should be
done.
Just my 2c.
[1]:
https://lore.kernel.org/kernel-janitors/0cd61d5b-ac88-31e8-99ad-143af480416f@arm.com/
CJ
>
>> ---
>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
>> drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
>> drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
>> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
>> 4 files changed, 14 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> index a74b72f50cc9..afb35d2e5c73 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
>> mem->remap_addr = dma_map_resource(i915->drm.dev,
>> mem->region.start,
>> mem->fake_mappable.size,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_FORCE_CONTIGUOUS);
>> if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
>> drm_mm_remove_node(&mem->fake_mappable);
>> @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
>> dma_unmap_resource(mem->i915->drm.dev,
>> mem->remap_addr,
>> mem->fake_mappable.size,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_FORCE_CONTIGUOUS);
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
>> index e5c2fdfc20e3..53d0cb327539 100644
>> --- a/drivers/gpu/drm/i915/gvt/gtt.c
>> +++ b/drivers/gpu/drm/i915/gvt/gtt.c
>> @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
>> trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
>>
>> dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
>> - PCI_DMA_BIDIRECTIONAL);
>> + DMA_BIDIRECTIONAL);
>>
>> radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
>>
>> @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
>> */
>> spt->shadow_page.type = type;
>> daddr = dma_map_page(kdev, spt->shadow_page.page,
>> - 0, 4096, PCI_DMA_BIDIRECTIONAL);
>> + 0, 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(kdev, daddr)) {
>> gvt_vgpu_err("fail to map dma addr\n");
>> ret = -EINVAL;
>> @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
>> return spt;
>>
>> err_unmap_dma:
>> - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
>> err_free_spt:
>> free_spt(spt);
>> return ERR_PTR(ret);
>> @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
>> return -ENOMEM;
>> }
>>
>> - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
>> - 4096, PCI_DMA_BIDIRECTIONAL);
>> + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, daddr)) {
>> gvt_vgpu_err("fail to dmamap scratch_pt\n");
>> __free_page(virt_to_page(scratch_pt));
>> @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
>> if (vgpu->gtt.scratch_pt[i].page != NULL) {
>> daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
>> I915_GTT_PAGE_SHIFT);
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>> __free_page(vgpu->gtt.scratch_pt[i].page);
>> vgpu->gtt.scratch_pt[i].page = NULL;
>> vgpu->gtt.scratch_pt[i].page_mfn = 0;
>> @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
>> }
>>
>> daddr = dma_map_page(dev, virt_to_page(page), 0,
>> - 4096, PCI_DMA_BIDIRECTIONAL);
>> + 4096, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, daddr)) {
>> gvt_err("fail to dmamap scratch ggtt page\n");
>> __free_page(virt_to_page(page));
>> @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
>> ret = setup_spt_oos(gvt);
>> if (ret) {
>> gvt_err("fail to initialize SPT oos\n");
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>> __free_page(gvt->gtt.scratch_page);
>> return ret;
>> }
>> @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
>> dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
>> I915_GTT_PAGE_SHIFT);
>>
>> - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
>>
>> __free_page(gvt->gtt.scratch_page);
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
>> index 7efa386449d1..20b82fb036f8 100644
>> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
>> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
>> @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
>> return ret;
>>
>> /* Setup DMA mapping. */
>> - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
>> + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
>> if (dma_mapping_error(dev, *dma_addr)) {
>> gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
>> page_to_pfn(page), ret);
>> @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
>> {
>> struct device *dev = vgpu->gvt->gt->i915->drm.dev;
>>
>> - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
>> + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
>> gvt_unpin_guest_page(vgpu, gfn, size);
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> index 36489be4896b..cd5f2348a187 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
>> do {
>> if (dma_map_sg_attrs(obj->base.dev->dev,
>> pages->sgl, pages->nents,
>> - PCI_DMA_BIDIRECTIONAL,
>> + DMA_BIDIRECTIONAL,
>> DMA_ATTR_SKIP_CPU_SYNC |
>> DMA_ATTR_NO_KERNEL_MAPPING |
>> DMA_ATTR_NO_WARN))
>> @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
>> usleep_range(100, 250);
>>
>> dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
>> - PCI_DMA_BIDIRECTIONAL);
>> + DMA_BIDIRECTIONAL);
>> }
>>
>> /**
>> --
>> 2.25.1
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
2021-09-30 18:58 ` [Intel-gfx] " Christophe JAILLET
@ 2021-10-01 14:50 ` Daniel Vetter
-1 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2021-10-01 14:50 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Cai Huoqing, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
David Airlie, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
On Thu, Sep 30, 2021 at 08:58:15PM +0200, Christophe JAILLET wrote:
> Le 30/09/2021 à 16:21, Daniel Vetter a écrit :
> > On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
> > > Replace direction definition PCI_DMA_BIDIRECTIONAL
> > > with DMA_BIDIRECTIONAL, because it helps to enhance readability
> > > and avoid possible inconsistency.
> > >
> > > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> >
> > Applied to drm-intel-gt-next, thanks for the patch.
> > -Daniel
>
> Hi,
> just in case, a similar patch received some (unrelated) comments a few weeks
> ago. See [1].
>
> Should it rings some bells to someone who know who knows what should be
> done.
>
> Just my 2c.
>
> [1]: https://lore.kernel.org/kernel-janitors/0cd61d5b-ac88-31e8-99ad-143af480416f@arm.com/
Hm yeah there's some fishy stuff in here, but it's cc'ed to intel-gfx so
should get picked up there.
-Daniel
>
> CJ
>
>
> >
> > > ---
> > > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
> > > drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
> > > drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
> > > drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
> > > 4 files changed, 14 insertions(+), 15 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > index a74b72f50cc9..afb35d2e5c73 100644
> > > --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
> > > mem->remap_addr = dma_map_resource(i915->drm.dev,
> > > mem->region.start,
> > > mem->fake_mappable.size,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_FORCE_CONTIGUOUS);
> > > if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
> > > drm_mm_remove_node(&mem->fake_mappable);
> > > @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
> > > dma_unmap_resource(mem->i915->drm.dev,
> > > mem->remap_addr,
> > > mem->fake_mappable.size,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_FORCE_CONTIGUOUS);
> > > }
> > > diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
> > > index e5c2fdfc20e3..53d0cb327539 100644
> > > --- a/drivers/gpu/drm/i915/gvt/gtt.c
> > > +++ b/drivers/gpu/drm/i915/gvt/gtt.c
> > > @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
> > > trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
> > > dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
> > > - PCI_DMA_BIDIRECTIONAL);
> > > + DMA_BIDIRECTIONAL);
> > > radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
> > > @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> > > */
> > > spt->shadow_page.type = type;
> > > daddr = dma_map_page(kdev, spt->shadow_page.page,
> > > - 0, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + 0, 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(kdev, daddr)) {
> > > gvt_vgpu_err("fail to map dma addr\n");
> > > ret = -EINVAL;
> > > @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> > > return spt;
> > > err_unmap_dma:
> > > - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
> > > err_free_spt:
> > > free_spt(spt);
> > > return ERR_PTR(ret);
> > > @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
> > > return -ENOMEM;
> > > }
> > > - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
> > > - 4096, PCI_DMA_BIDIRECTIONAL);
> > > + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, daddr)) {
> > > gvt_vgpu_err("fail to dmamap scratch_pt\n");
> > > __free_page(virt_to_page(scratch_pt));
> > > @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
> > > if (vgpu->gtt.scratch_pt[i].page != NULL) {
> > > daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
> > > I915_GTT_PAGE_SHIFT);
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(vgpu->gtt.scratch_pt[i].page);
> > > vgpu->gtt.scratch_pt[i].page = NULL;
> > > vgpu->gtt.scratch_pt[i].page_mfn = 0;
> > > @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> > > }
> > > daddr = dma_map_page(dev, virt_to_page(page), 0,
> > > - 4096, PCI_DMA_BIDIRECTIONAL);
> > > + 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, daddr)) {
> > > gvt_err("fail to dmamap scratch ggtt page\n");
> > > __free_page(virt_to_page(page));
> > > @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> > > ret = setup_spt_oos(gvt);
> > > if (ret) {
> > > gvt_err("fail to initialize SPT oos\n");
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(gvt->gtt.scratch_page);
> > > return ret;
> > > }
> > > @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
> > > dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
> > > I915_GTT_PAGE_SHIFT);
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(gvt->gtt.scratch_page);
> > > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > index 7efa386449d1..20b82fb036f8 100644
> > > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
> > > return ret;
> > > /* Setup DMA mapping. */
> > > - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
> > > + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, *dma_addr)) {
> > > gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
> > > page_to_pfn(page), ret);
> > > @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
> > > {
> > > struct device *dev = vgpu->gvt->gt->i915->drm.dev;
> > > - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
> > > gvt_unpin_guest_page(vgpu, gfn, size);
> > > }
> > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > index 36489be4896b..cd5f2348a187 100644
> > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
> > > do {
> > > if (dma_map_sg_attrs(obj->base.dev->dev,
> > > pages->sgl, pages->nents,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_SKIP_CPU_SYNC |
> > > DMA_ATTR_NO_KERNEL_MAPPING |
> > > DMA_ATTR_NO_WARN))
> > > @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
> > > usleep_range(100, 250);
> > > dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
> > > - PCI_DMA_BIDIRECTIONAL);
> > > + DMA_BIDIRECTIONAL);
> > > }
> > > /**
> > > --
> > > 2.25.1
> > >
> >
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL
@ 2021-10-01 14:50 ` Daniel Vetter
0 siblings, 0 replies; 10+ messages in thread
From: Daniel Vetter @ 2021-10-01 14:50 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Cai Huoqing, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
David Airlie, Zhenyu Wang, Zhi Wang, intel-gfx, dri-devel,
linux-kernel, intel-gvt-dev
On Thu, Sep 30, 2021 at 08:58:15PM +0200, Christophe JAILLET wrote:
> Le 30/09/2021 à 16:21, Daniel Vetter a écrit :
> > On Sat, Sep 25, 2021 at 08:46:12PM +0800, Cai Huoqing wrote:
> > > Replace direction definition PCI_DMA_BIDIRECTIONAL
> > > with DMA_BIDIRECTIONAL, because it helps to enhance readability
> > > and avoid possible inconsistency.
> > >
> > > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> >
> > Applied to drm-intel-gt-next, thanks for the patch.
> > -Daniel
>
> Hi,
> just in case, a similar patch received some (unrelated) comments a few weeks
> ago. See [1].
>
> Should it rings some bells to someone who know who knows what should be
> done.
>
> Just my 2c.
>
> [1]: https://lore.kernel.org/kernel-janitors/0cd61d5b-ac88-31e8-99ad-143af480416f@arm.com/
Hm yeah there's some fishy stuff in here, but it's cc'ed to intel-gfx so
should get picked up there.
-Daniel
>
> CJ
>
>
> >
> > > ---
> > > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++--
> > > drivers/gpu/drm/i915/gvt/gtt.c | 17 ++++++++---------
> > > drivers/gpu/drm/i915/gvt/kvmgt.c | 4 ++--
> > > drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
> > > 4 files changed, 14 insertions(+), 15 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > index a74b72f50cc9..afb35d2e5c73 100644
> > > --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> > > @@ -32,7 +32,7 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem)
> > > mem->remap_addr = dma_map_resource(i915->drm.dev,
> > > mem->region.start,
> > > mem->fake_mappable.size,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_FORCE_CONTIGUOUS);
> > > if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) {
> > > drm_mm_remove_node(&mem->fake_mappable);
> > > @@ -62,7 +62,7 @@ static void release_fake_lmem_bar(struct intel_memory_region *mem)
> > > dma_unmap_resource(mem->i915->drm.dev,
> > > mem->remap_addr,
> > > mem->fake_mappable.size,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_FORCE_CONTIGUOUS);
> > > }
> > > diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
> > > index e5c2fdfc20e3..53d0cb327539 100644
> > > --- a/drivers/gpu/drm/i915/gvt/gtt.c
> > > +++ b/drivers/gpu/drm/i915/gvt/gtt.c
> > > @@ -745,7 +745,7 @@ static void ppgtt_free_spt(struct intel_vgpu_ppgtt_spt *spt)
> > > trace_spt_free(spt->vgpu->id, spt, spt->guest_page.type);
> > > dma_unmap_page(kdev, spt->shadow_page.mfn << I915_GTT_PAGE_SHIFT, 4096,
> > > - PCI_DMA_BIDIRECTIONAL);
> > > + DMA_BIDIRECTIONAL);
> > > radix_tree_delete(&spt->vgpu->gtt.spt_tree, spt->shadow_page.mfn);
> > > @@ -849,7 +849,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> > > */
> > > spt->shadow_page.type = type;
> > > daddr = dma_map_page(kdev, spt->shadow_page.page,
> > > - 0, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + 0, 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(kdev, daddr)) {
> > > gvt_vgpu_err("fail to map dma addr\n");
> > > ret = -EINVAL;
> > > @@ -865,7 +865,7 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_alloc_spt(
> > > return spt;
> > > err_unmap_dma:
> > > - dma_unmap_page(kdev, daddr, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(kdev, daddr, PAGE_SIZE, DMA_BIDIRECTIONAL);
> > > err_free_spt:
> > > free_spt(spt);
> > > return ERR_PTR(ret);
> > > @@ -2409,8 +2409,7 @@ static int alloc_scratch_pages(struct intel_vgpu *vgpu,
> > > return -ENOMEM;
> > > }
> > > - daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0,
> > > - 4096, PCI_DMA_BIDIRECTIONAL);
> > > + daddr = dma_map_page(dev, virt_to_page(scratch_pt), 0, 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, daddr)) {
> > > gvt_vgpu_err("fail to dmamap scratch_pt\n");
> > > __free_page(virt_to_page(scratch_pt));
> > > @@ -2461,7 +2460,7 @@ static int release_scratch_page_tree(struct intel_vgpu *vgpu)
> > > if (vgpu->gtt.scratch_pt[i].page != NULL) {
> > > daddr = (dma_addr_t)(vgpu->gtt.scratch_pt[i].page_mfn <<
> > > I915_GTT_PAGE_SHIFT);
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(vgpu->gtt.scratch_pt[i].page);
> > > vgpu->gtt.scratch_pt[i].page = NULL;
> > > vgpu->gtt.scratch_pt[i].page_mfn = 0;
> > > @@ -2741,7 +2740,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> > > }
> > > daddr = dma_map_page(dev, virt_to_page(page), 0,
> > > - 4096, PCI_DMA_BIDIRECTIONAL);
> > > + 4096, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, daddr)) {
> > > gvt_err("fail to dmamap scratch ggtt page\n");
> > > __free_page(virt_to_page(page));
> > > @@ -2755,7 +2754,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
> > > ret = setup_spt_oos(gvt);
> > > if (ret) {
> > > gvt_err("fail to initialize SPT oos\n");
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(gvt->gtt.scratch_page);
> > > return ret;
> > > }
> > > @@ -2779,7 +2778,7 @@ void intel_gvt_clean_gtt(struct intel_gvt *gvt)
> > > dma_addr_t daddr = (dma_addr_t)(gvt->gtt.scratch_mfn <<
> > > I915_GTT_PAGE_SHIFT);
> > > - dma_unmap_page(dev, daddr, 4096, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, daddr, 4096, DMA_BIDIRECTIONAL);
> > > __free_page(gvt->gtt.scratch_page);
> > > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > index 7efa386449d1..20b82fb036f8 100644
> > > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > > @@ -328,7 +328,7 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
> > > return ret;
> > > /* Setup DMA mapping. */
> > > - *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
> > > + *dma_addr = dma_map_page(dev, page, 0, size, DMA_BIDIRECTIONAL);
> > > if (dma_mapping_error(dev, *dma_addr)) {
> > > gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
> > > page_to_pfn(page), ret);
> > > @@ -344,7 +344,7 @@ static void gvt_dma_unmap_page(struct intel_vgpu *vgpu, unsigned long gfn,
> > > {
> > > struct device *dev = vgpu->gvt->gt->i915->drm.dev;
> > > - dma_unmap_page(dev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
> > > + dma_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL);
> > > gvt_unpin_guest_page(vgpu, gfn, size);
> > > }
> > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > index 36489be4896b..cd5f2348a187 100644
> > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > > @@ -30,7 +30,7 @@ int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
> > > do {
> > > if (dma_map_sg_attrs(obj->base.dev->dev,
> > > pages->sgl, pages->nents,
> > > - PCI_DMA_BIDIRECTIONAL,
> > > + DMA_BIDIRECTIONAL,
> > > DMA_ATTR_SKIP_CPU_SYNC |
> > > DMA_ATTR_NO_KERNEL_MAPPING |
> > > DMA_ATTR_NO_WARN))
> > > @@ -64,7 +64,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
> > > usleep_range(100, 250);
> > > dma_unmap_sg(i915->drm.dev, pages->sgl, pages->nents,
> > > - PCI_DMA_BIDIRECTIONAL);
> > > + DMA_BIDIRECTIONAL);
> > > }
> > > /**
> > > --
> > > 2.25.1
> > >
> >
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-10-01 14:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-25 12:46 [PATCH] drm/i915: Use direction definition DMA_BIDIRECTIONAL instead of PCI_DMA_BIDIRECTIONAL Cai Huoqing
2021-09-25 12:46 ` [Intel-gfx] " Cai Huoqing
2021-09-27 16:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-09-27 19:06 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-09-30 14:21 ` [PATCH] " Daniel Vetter
2021-09-30 14:21 ` [Intel-gfx] " Daniel Vetter
2021-09-30 18:58 ` Christophe JAILLET
2021-09-30 18:58 ` [Intel-gfx] " Christophe JAILLET
2021-10-01 14:50 ` Daniel Vetter
2021-10-01 14:50 ` [Intel-gfx] " Daniel Vetter
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.