gpu: drm: i915: Change return type to vm_fault_t
Subsystems (2)
PATCH v4 1/1 gpu: drm: i915: Change return type to vm_fault_t
Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type.
commit 1c8f422059ae ("mm: change return type to vm_fault_t")
Fixed one checkpatch.pl warning inside WARN_ONCE.
---
v2: Updated the change log
v3: Corrected variable name to err
v4: Fixed patchwork error by initialized ret
drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -51,6 +51,7 @@#include <drm/drm_gem.h> #include <drm/drm_auth.h> #include <drm/drm_cache.h> +#include <linux/mm_types.h> #include "i915_params.h" #include "i915_reg.h"
@@ -3363,7 +3364,7 @@ int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv, unsigned int flags);int __must_check i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); -int i915_gem_fault (struct vm_fault *vmf); +vm_fault_t i915_gem_fault (struct vm_fault *vmf); int i915_gem_object_wait(struct drm_i915_gem_object *obj, unsigned int flags, long timeout,
drivers/gpu/drm/i915/i915_gem.c +19 -19
@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;
@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;
@@ -1906,26 +1907,26 @@ int i915_gem_fault(struct vm_fault *vmf)* repeat the flush holding the lock in the normal manner to catch cases * where we are gazumped. */ - ret =i915_gem_object_wait (obj, + err =i915_gem_object_wait (obj,I915_WAIT_INTERRUPTIBLE ,MAX_SCHEDULE_TIMEOUT ,NULL ); -if (ret) +if (err) goto err; - ret =i915_gem_object_pin_pages (obj); -if (ret) + err =i915_gem_object_pin_pages (obj); +if (err) goto err;intel_runtime_pm_get (dev_priv); - ret =i915_mutex_lock_interruptible (dev); -if (ret) + err =i915_mutex_lock_interruptible (dev); +if (err) goto err_rpm;/* Access to snoopable pages through the GTT is incoherent. */ if (obj->cache_level !=I915_CACHE_NONE && !HAS_LLC (dev_priv)) { - ret = -EFAULT ; + err = -EFAULT ; goto err_unlock; }
@@ -1952,25 +1953,25 @@ int i915_gem_fault(struct vm_fault *vmf) vma =i915_gem_object_ggtt_pin (obj, &view,0 ,0 ,PIN_MAPPABLE ); }if (IS_ERR (vma)) { - ret =PTR_ERR (vma); + err =PTR_ERR (vma); goto err_unlock; } - ret =i915_gem_object_set_to_gtt_domain (obj, write); -if (ret) + err =i915_gem_object_set_to_gtt_domain (obj, write); +if (err) goto err_unpin; - ret =i915_vma_pin_fence (vma); -if (ret) + err =i915_vma_pin_fence (vma); +if (err) goto err_unpin;/* Finally, remap it using the new GTT offset */ - ret =remap_io_mapping (area, + err =remap_io_mapping (area, area->vm_start + (vma->ggtt_view.partial.offset <<PAGE_SHIFT ), (ggtt->gmadr.start + vma->node.start) >>PAGE_SHIFT ,min_t (u64, vma->size, area->vm_end - area->vm_start), &ggtt->iomap); -if (ret) +if (err) goto err_fence;/* Mark as being mmapped into userspace for later revocation */
@@ -1991,7 +1992,7 @@ int i915_gem_fault(struct vm_fault *vmf)intel_runtime_pm_put (dev_priv);i915_gem_object_unpin_pages (obj); err: -switch (ret) { +switch (err) {case -EIO :/* * We eat errors when the gpu is terminally wedged to avoid
@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ; }return ret;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Souptick Joarder (2018-05-16 20:12:20)
Quoted 36 lines
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.commit
1c8f422059ae("mm: change return type tovm_fault_t")Fixed one checkpatch.pl warning inside
WARN_ONCE.Signed-off-by Souptick Joarder <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c +3
-2@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;
drivers/gpu/drm/i915/i915_gem.c int i915_gem_fault(struct vm_fault *vmf) · line 2032
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem.c +1
-2@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ;
Even simpler would be to use e.g. return VM_FAULT_SIGBUS for each case above. No early initialisation of use-once variables allowing the compiler to do it's job. For a smaller patch, you can even skip the s/ret/err/
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Chris Wilson
Quoting Souptick Joarder (2018-05-16 20:12:20)
Quoted 33 lines
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.commit
1c8f422059ae("mm: change return type tovm_fault_t")Fixed one checkpatch.pl warning inside
WARN_ONCE.Signed-off-by Souptick Joarder <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c +3
-2@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;
Quoted 16 lines
drivers/gpu/drm/i915/i915_gem.c int i915_gem_fault(struct vm_fault *vmf) · line 2032
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +1
-2/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ;Even simpler would be to use e.g. return
VM_FAULT_SIGBUSfor each case above. No early initialisation of use-once variables allowing the compiler to do it's job. For a smaller patch, you can even skip the s/ret/err/
-Chris
Chris,
I prefer to use return once at the end of the function rather than writing multiple return statement (Current code is doing similar). But if you think other way, I can make that change :)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 52 lines · Souptick Joarder
Quoted 34 lines · Chris Wilson
Quoting Souptick Joarder (2018-05-16 20:12:20)
Quoted 33 lines
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.commit
1c8f422059ae("mm: change return type tovm_fault_t")Fixed one checkpatch.pl warning inside
WARN_ONCE.Signed-off-by Souptick Joarder <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c +3
-2@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;Quoted 16 lines
drivers/gpu/drm/i915/i915_gem.c int i915_gem_fault(struct vm_fault *vmf) · line 2032
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +1
-2/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ;Even simpler would be to use e.g. return
VM_FAULT_SIGBUSfor each case above. No early initialisation of use-once variables allowing the compiler to do it's job. For a smaller patch, you can even skip the s/ret/err/
-Chris
Quoted 4 lines
Chris,
I prefer to use return once at the end of the function rather than writing multiple return statement (Current code is doing similar). But if you think other way, I can make that change :)
If no further comment, we would like to get this patch in queue for 4.18
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 53 lines · Souptick Joarder
Quoted 52 lines · Souptick Joarder
Quoted 50 lines · Chris Wilson
Quoting Souptick Joarder (2018-05-16 20:12:20)
Quoted 36 lines
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.commit
1c8f422059ae("mm: change return type tovm_fault_t")Fixed one checkpatch.pl warning inside
WARN_ONCE.Signed-off-by Souptick Joarder <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c +3
-2@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;drivers/gpu/drm/i915/i915_gem.c int i915_gem_fault(struct vm_fault *vmf) · line 2032
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem.c +1
-2@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ;Even simpler would be to use e.g. return
VM_FAULT_SIGBUSfor each case above. No early initialisation of use-once variables allowing the compiler to do it's job. For a smaller patch, you can even skip the s/ret/err/
-Chris
Quoted 7 lines
Quoted 4 lines
Chris,
I prefer to use return once at the end of the function rather than writing multiple return statement (Current code is doing similar). But if you think other way, I can make that change :)If no further comment, we would like to get this patch in queue for 4.18
We need to get this patch in queue for 4.18.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 54 lines · Souptick Joarder
Quoted 53 lines · Souptick Joarder
Quoted 52 lines · Souptick Joarder
Quoted 50 lines · Chris Wilson
Quoting Souptick Joarder (2018-05-16 20:12:20)
Quoted 36 lines
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.commit
1c8f422059ae("mm: change return type tovm_fault_t")Fixed one checkpatch.pl warning inside
WARN_ONCE.Signed-off-by Souptick Joarder <[email protected]>---
drivers/gpu/drm/i915/i915_gem.c +3
-2@@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void)* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT)/* 1 MiB */ struct vm_area_struct *area = vmf->vma;@@ -1894,7 +1894,8 @@ int i915_gem_fault(struct vm_fault *vmf)struct i915_vma *vma;pgoff_t page_offset;unsigned int flags; -int ret; +int err; +vm_fault_t ret =VM_FAULT_SIGBUS ;/* We don't use vmf->pgoff since that has the fake offset */ page_offset = (vmf->address - area->vm_start) >>PAGE_SHIFT ;drivers/gpu/drm/i915/i915_gem.c int i915_gem_fault(struct vm_fault *vmf) · line 2032
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem.c +1
-2@@ -2027,8 +2028,7 @@ int i915_gem_fault(struct vm_fault *vmf) ret =VM_FAULT_SIGBUS ;break ;default : -WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; +WARN_ONCE (ret,"unhandled error in %s: %x\n" , __func__, err);break ;Even simpler would be to use e.g. return
VM_FAULT_SIGBUSfor each case above. No early initialisation of use-once variables allowing the compiler to do it's job. For a smaller patch, you can even skip the s/ret/err/
-Chris
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Chris,
I prefer to use return once at the end of the function rather than writing multiple return statement (Current code is doing similar). But if you think other way, I can make that change :)If no further comment, we would like to get this patch in queue for 4.18
For gpu drivers, that ship had sailed before you sent the patch. It'll be v4.19.
I'll let Chris comment if changes are needed or not.
BR,
Jani.
Quoted 6 lines
We need to get this patch in queue for 4.18.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for gpu: drm: i915: Change return type to vm_fault_t (rev4)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev4)
URL : https://patchwork.freedesktop.org/series/41893/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: gpu: drm: i915: Change return type to vm_fault_t -O:drivers/gpu/drm/i915/i915_gem.c:2080:32: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem.c:2080:32: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem.c:2081:32: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem.c:2081:32: warning: expression using sizeof(void) -drivers/gpu/drm/i915/selftests/../i915_drv.h:3663:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3664:16: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for gpu: drm: i915: Change return type to vm_fault_t (rev4)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev4)
URL : https://patchwork.freedesktop.org/series/41893/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4193 -> Patchwork_9023 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9023 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9023, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41893/revisions/4/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9023:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9023 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-4200u: PASS -> DMESG-FAIL (fdo#106103, fdo#102614)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-cnl-y3: PASS -> DMESG-WARN (fdo#104951)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-cfl-s3: FAIL (fdo#103481) -> PASS +1
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-cnl-psr: DMESG-WARN (fdo#104951) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (41 -> 36) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4193 -> Patchwork_9023
CI_DRM_4193: 9322e3903ce6c89bde0c24877fe730b808427caf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4485: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9023: 17edb8f2e563eea240ac304b11939cbdf1dc397e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4485: 62ef6b0db8967e7021fd3e0b57d03ff164b984fe @ git://anongit.freedesktop.org/piglit
== Linux commits ==
17edb8f2e563 gpu: drm: i915: Change return type to vm_fault_t
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9023/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for gpu: drm: i915: Change return type to vm_fault_t (rev4)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev4)
URL : https://patchwork.freedesktop.org/series/41893/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4193_full -> Patchwork_9023_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9023_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9023_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41893/revisions/4/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9023_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-bsd2:
shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9023_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_eio@in-flight-contexts-immediate:
shard-hsw: PASS -> DMESG-WARN (fdo#106523)
igt@gem_eio@in-flight-suspend:
shard-glk: PASS -> DMESG-WARN (fdo#106523)
igt@gem_eio@suspend:
shard-apl: PASS -> DMESG-WARN (fdo#106523) +1
igt@kms_cursor_crc@cursor-128x128-suspend:
shard-snb: PASS -> DMESG-WARN (fdo#102365)
igt@kms_flip@flip-vs-expired-vblank:
shard-hsw: PASS -> FAIL (fdo#105707)
==== Possible fixes ====
igt@gem_eio@execbuf:
shard-hsw: DMESG-WARN (fdo#106523) -> PASS
igt@gem_eio@in-flight-internal-10ms:
shard-apl: DMESG-WARN (fdo#106523) -> PASS +1
igt@gem_eio@in-flight-suspend:
shard-snb: DMESG-WARN (fdo#106523) -> PASS
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
shard-glk: FAIL (fdo#105703) -> PASS
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: FAIL (fdo#105454) -> PASS
igt@kms_flip@2x-plain-flip-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip@dpms-vs-vblank-race:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS +1 fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#105707 https://bugs.freedesktop.org/show_bug.cgi?id=105707
fdo#106523 https://bugs.freedesktop.org/show_bug.cgi?id=106523
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4193 -> Patchwork_9023
CI_DRM_4193: 9322e3903ce6c89bde0c24877fe730b808427caf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4485: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9023: 17edb8f2e563eea240ac304b11939cbdf1dc397e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4485: 62ef6b0db8967e7021fd3e0b57d03ff164b984fe @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9023/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Change i915_gem_fault() to return vm_fault_t
In reply to Souptick JoarderIn preparation for vm_fault_t becoming a distinct type, convert the fault handler (i915_gem_fault()) over to the new interface.
Based on a patch by Souptick Joarder
References: 1c8f422059ae ("mm: change return type to vm_fault_t")
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 21 +++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -40,6 +40,7 @@#include <linux/hash.h> #include <linux/intel-iommu.h> #include <linux/kref.h> +#include <linux/mm_types.h> #include <linux/perf_event.h> #include <linux/pm_qos.h> #include <linux/reservation.h>
@@ -3174,7 +3175,7 @@ int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,int __must_check i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_suspend_late (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); -int i915_gem_fault (struct vm_fault *vmf); +vm_fault_t i915_gem_fault (struct vm_fault *vmf); int i915_gem_object_wait(struct drm_i915_gem_object *obj, unsigned int flags, long timeout,
drivers/gpu/drm/i915/i915_gem.c +7 -14
@@ -1995,7 +1995,7 @@ compute_partial_view(struct drm_i915_gem_object *obj,* The current feature set supported by i915_gem_fault() and thus GTT mmaps * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). */ -int i915_gem_fault (struct vm_fault *vmf) +vm_fault_t i915_gem_fault (struct vm_fault *vmf) {#define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)struct vm_area_struct *area = vmf->vma;
@@ -2112,10 +2112,8 @@ int i915_gem_fault(struct vm_fault *vmf)* fail). But any other -EIO isn't ours (e.g. swap in failure) * and so needs to be reported. */ -if (!i915_terminally_wedged (&dev_priv->gpu_error)) { - ret =VM_FAULT_SIGBUS ; -break ; - } +if (!i915_terminally_wedged (&dev_priv->gpu_error)) +return VM_FAULT_SIGBUS ;case -EAGAIN :/* * EAGAIN means the gpu is hung and we'll wait for the error
@@ -2130,21 +2128,16 @@ int i915_gem_fault(struct vm_fault *vmf)* EBUSY is ok: this just means that another thread * already did the job. */ - ret =VM_FAULT_NOPAGE ; -break ; +return VM_FAULT_NOPAGE ;case -ENOMEM : - ret =VM_FAULT_OOM ; -break ; +return VM_FAULT_OOM ;case -ENOSPC :case -EFAULT : - ret =VM_FAULT_SIGBUS ; -break ; +return VM_FAULT_SIGBUS ;default :WARN_ONCE (ret,"unhandled error in i915_gem_fault: %i\n" , ret); - ret =VM_FAULT_SIGBUS ; -break ; +return VM_FAULT_SIGBUS ; } -return ret; }static void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj)
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Change i915_gem_fault() to return vm_fault_t
Quoted 10 lines · Chris Wilson
In preparation for
vm_fault_tbecoming a distinct type, convert the fault handler (i915_gem_fault()) over to the new interface.Based on a patch by Souptick Joarder
References:
1c8f422059ae("mm: change return type tovm_fault_t")Signed-off-by Chris Wilson <[email protected]>Cc Souptick Joarder <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Matthew Auld <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Change i915_gem_fault() to return vm_fault_t
Quoting Matthew Auld (2018-06-06 23:39:07)
Quoted 12 lines · Chris Wilson
Quoted 10 lines
In preparation for
vm_fault_tbecoming a distinct type, convert the fault handler (i915_gem_fault()) over to the new interface.Based on a patch by Souptick Joarder
References:
1c8f422059ae("mm: change return type tovm_fault_t")Signed-off-by Chris Wilson <[email protected]>Cc Souptick Joarder <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Matthew Auld <[email protected]>Reviewed-by Matthew Auld <[email protected]>
Thanks for the patch and review, pushed to dinq for 4.19. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for gpu: drm: i915: Change return type to vm_fault_t (rev5)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev5)
URL : https://patchwork.freedesktop.org/series/41893/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
8fdaea4385cb drm/i915: Change i915_gem_fault() to return vm_fault_t
-:11: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 1c8f422059ae ("mm: change return type to vm_fault_t")'
#11:
References: 1c8f422059ae ("mm: change return type to vm_fault_t")total: 1 errors, 0 warnings, 0 checks, 60 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for gpu: drm: i915: Change return type to vm_fault_t (rev5)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev5)
URL : https://patchwork.freedesktop.org/series/41893/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915: Change i915_gem_fault() to return vm_fault_t -drivers/gpu/drm/i915/selftests/../i915_drv.h:3668:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3669:16: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for gpu: drm: i915: Change return type to vm_fault_t (rev5)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev5)
URL : https://patchwork.freedesktop.org/series/41893/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4283 -> Patchwork_9225 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9225 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9225, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41893/revisions/5/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9225:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9225 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: PASS -> FAIL (fdo#102575)
==== Possible fixes ====
igt@gem_exec_suspend@basic-s4-devices:
fi-glk-j4005: DMESG-WARN (fdo#105719) -> PASS
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
fi-glk-j4005: FAIL (fdo#106765) -> PASS
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: DMESG-WARN (fdo#106000) -> PASS fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106765 https://bugs.freedesktop.org/show_bug.cgi?id=106765
== Participating hosts (41 -> 38) ==
Additional (1): fi-hsw-peppy
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4283 -> Patchwork_9225
CI_DRM_4283: fedd886d175fb5982b3c15c0786e8d18231261bf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4509: c8f1ae58e1b7da17af4722a5ce5a9cd8b9a34059 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9225: 8fdaea4385cb9064e240742a956b691b437add4c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
8fdaea4385cb drm/i915: Change i915_gem_fault() to return vm_fault_t
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9225/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for gpu: drm: i915: Change return type to vm_fault_t (rev5)
In reply to Souptick Joarder== Series Details ==
== Series Details ==
Series: gpu: drm: i915: Change return type to vm_fault_t (rev5)
URL : https://patchwork.freedesktop.org/series/41893/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4283_full -> Patchwork_9225_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9225_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9225_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41893/revisions/5/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9225_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-snb: PASS -> DMESG-FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-vebox:
shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9225_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-glk: PASS -> INCOMPLETE (fdo#103359, k.org#198133)
igt@drv_selftest@live_hangcheck:
shard-kbl: PASS -> DMESG-FAIL (fdo#106560)
igt@gem_eio@hibernate:
shard-snb: PASS -> INCOMPLETE (fdo#105411)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#106509, fdo#105454)
igt@kms_flip@2x-flip-vs-blocking-wf-vblank:
shard-hsw: PASS -> FAIL (fdo#103928)
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: PASS -> FAIL (fdo#100368) +1
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
==== Possible fixes ====
igt@drv_hangman@error-state-capture-render:
shard-snb: FAIL -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4283 -> Patchwork_9225
CI_DRM_4283: fedd886d175fb5982b3c15c0786e8d18231261bf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4509: c8f1ae58e1b7da17af4722a5ce5a9cd8b9a34059 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9225: 8fdaea4385cb9064e240742a956b691b437add4c @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9225/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx