drm/xe: Adjust tile_present mask when skipping rebinds
Subsystems (2)
Matthew Brost
maintainerPATCH 1/1 drm/xe: Adjust tile_present mask when skipping rebinds
If a rebind is skipped the tile_present mask needs to be updated for the newly created vma to properly reflect the state of the vma.
--- drivers/gpu/drm/xe/xe_vm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_vm.c +13 -2
@@ -2340,6 +2340,10 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op) op->flags |=XE_VMA_OP_COMMITTED ;break ;case DRM_GPUVA_OP_REMAP : + { +u8 tile_present = +gpuva_to_vma (op->base.remap.unmap->va)->tile_present; +prep_vma_destroy (vm,gpuva_to_vma (op->base.remap.unmap->va), true); op->flags |=XE_VMA_OP_COMMITTED ;
@@ -2348,15 +2352,21 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op) err |=xe_vm_insert_vma (vm, op->remap.prev);if (!err) op->flags |=XE_VMA_OP_PREV_COMMITTED ; -if (!err && op->remap.skip_prev) +if (!err && op->remap.skip_prev) { + op->remap.prev->tile_present = + tile_present; op->remap.prev =NULL ; + } }if (op->remap.next) { err |=xe_vm_insert_vma (vm, op->remap.next);if (!err) op->flags |=XE_VMA_OP_NEXT_COMMITTED ; -if (!err && op->remap.skip_next) +if (!err && op->remap.skip_next) { + op->remap.next->tile_present = + tile_present; op->remap.next =NULL ; + } }/* Adjust for partial unbind after removin VMA from VM */
@@ -2365,6 +2375,7 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op) op->base.remap.unmap->va->va.range = op->remap.range; }break ; + }case DRM_GPUVA_OP_UNMAP :prep_vma_destroy (vm,gpuva_to_vma (op->base.unmap.va), true); op->flags |=XE_VMA_OP_COMMITTED ;
Signature · 1 line
2.34.1
Patchwork
CI[Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Adjust tile_present mask when skipping rebinds
== Series Details ==
== Series Details ==
Series: drm/xe: Adjust tile_present mask when skipping rebinds
URL : https://patchwork.freedesktop.org/series/125826/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 76bba03c4 drm/xe/hwmon: Expose power1_max_interval === git am output follows ===
Applying: drm/xe: Adjust tile_present mask when skipping rebinds
Patchwork
CI[Intel-xe] ✗ CI.checkpatch: warning for drm/xe: Adjust tile_present mask when skipping rebinds
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: drm/xe: Adjust tile_present mask when skipping rebinds
URL : https://patchwork.freedesktop.org/series/125826/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master 63c2b6b160bca2df6efc7bc4cea6f442097d7854
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit eb2662a47c30b3bec482499cb81f96e50c3d2576
Author: Matthew Brost <[email protected]> Date: Tue Oct 31 11:50:14 2023 -0700
drm/xe: Adjust tile_present mask when skipping rebinds
If a rebind is skipped the tile_present mask needs to be updated for the newly created vma to properly reflect the state of the vma.
+ /mt/dim checkpatch 76bba03c4f90371e7b2da536b966a49c68d589b0 drm-inteleb2662a47 drm/xe: Adjust tile_present mask when skipping rebinds
-:9: WARNING:BAD_REPORTED_BY_LINK: Reported-by: should be immediately followed by Closes: with a URL to the report #9:
total: 0 errors, 1 warnings, 0 checks, 40 lines checked
Patchwork
CI[Intel-xe] ✓ CI.KUnit: success for drm/xe: Adjust tile_present mask when skipping rebinds
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: drm/xe: Adjust tile_present mask when skipping rebinds
URL : https://patchwork.freedesktop.org/series/125826/
State : success
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
stty: 'standard input': Inappropriate ioctl for device
[20:21:20] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [20:21:24] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make ARCH=um O=.kunit --jobs=48 [20:21:44] Starting KUnit Kernel (1/1)... [20:21:44] ============================================================ [20:21:44] ========================== xe_bo ========================== [20:21:44] [SKIPPED] xe_ccs_migrate_kunit [20:21:44] [SKIPPED] xe_bo_evict_kunit [20:21:44] ===================== [SKIPPED] xe_bo ====================== [20:21:44] ======================= xe_dma_buf ======================== [20:21:44] [SKIPPED] xe_dma_buf_kunit [20:21:44] =================== [SKIPPED] xe_dma_buf =================== [20:21:44] ======================= xe_migrate ======================== [20:21:44] [SKIPPED] xe_migrate_sanity_kunit [20:21:44] =================== [SKIPPED] xe_migrate =================== [20:21:44] ========================= xe_pci ========================== [20:21:44] [PASSED] xe_gmdid_graphics_ip [20:21:44] [PASSED] xe_gmdid_media_ip [20:21:44] ===================== [PASSED] xe_pci ====================== [20:21:44] ========================= xe_rtp ========================== [20:21:44] ================== xe_rtp_process_tests =================== [20:21:44] [PASSED] coalesce-same-reg [20:21:44] [PASSED] no-match-no-add [20:21:44] [PASSED] no-match-no-add-multiple-rules [20:21:44] [PASSED] two-regs-two-entries [20:21:44] [PASSED] clr-one-set-other [20:21:44] [PASSED] set-field [20:21:44] [PASSED] conflict-duplicate [20:21:44] [PASSED] conflict-not-disjoint [20:21:44] [PASSED] conflict-reg-type [20:21:44] ============== [PASSED] xe_rtp_process_tests =============== [20:21:44] ===================== [PASSED] xe_rtp ====================== [20:21:44] ========================== xe_wa ========================== [20:21:44] ======================== xe_wa_gt ========================= [20:21:44] [PASSED] TIGERLAKE (B0) [20:21:44] [PASSED] DG1 (A0) [20:21:44] [PASSED] DG1 (B0) [20:21:44] [PASSED] ALDERLAKE_S (A0) [20:21:44] [PASSED] ALDERLAKE_S (B0) [20:21:44] [PASSED] ALDERLAKE_S (C0) [20:21:44] [PASSED] ALDERLAKE_S (D0) [20:21:44] [PASSED] ALDERLAKE_P (A0) [20:21:44] [PASSED] ALDERLAKE_P (B0) [20:21:44] [PASSED] ALDERLAKE_P (C0) [20:21:44] [PASSED] ALDERLAKE_S_RPLS (D0) [20:21:44] [PASSED] ALDERLAKE_P_RPLU (E0) [20:21:44] [PASSED] DG2_G10 (A0) [20:21:44] [PASSED] DG2_G10 (A1) [20:21:44] [PASSED] DG2_G10 (B0) [20:21:44] [PASSED] DG2_G10 (C0) [20:21:44] [PASSED] DG2_G11 (A0) [20:21:44] [PASSED] DG2_G11 (B0) [20:21:44] [PASSED] DG2_G11 (B1) [20:21:44] [PASSED] DG2_G12 (A0) [20:21:44] [PASSED] DG2_G12 (A1) [20:21:44] [PASSED] PVC (B0) [20:21:44] [PASSED] PVC (B1) [20:21:44] [PASSED] PVC (C0) [20:21:44] ==================== [PASSED] xe_wa_gt ===================== [20:21:44] ====================== [PASSED] xe_wa ====================== [20:21:44] ============================================================ [20:21:44] Testing complete. Ran 39 tests: passed: 35, skipped: 4 [20:21:44] Elapsed time: 24.217s total, 4.190s configuring, 19.907s building, 0.097s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig [20:21:44] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [20:21:46] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make ARCH=um O=.kunit --jobs=48 [20:22:05] Starting KUnit Kernel (1/1)... [20:22:05] ============================================================ [20:22:05] ================== drm_test_pick_cmdline ================== [20:22:05] [PASSED] drm_test_pick_cmdline_res_1920_1080_60 [20:22:05] =============== drm_test_pick_cmdline_named =============== [20:22:05] [PASSED] NTSC [20:22:05] [PASSED] NTSC-J [20:22:05] [PASSED] PAL [20:22:05] [PASSED] PAL-M [20:22:05] =========== [PASSED] drm_test_pick_cmdline_named =========== [20:22:05] ============== [PASSED] drm_test_pick_cmdline ============== [20:22:05] ======================== drm_buddy ======================== [20:22:05] [PASSED] drm_test_buddy_alloc_limit [20:22:05] [PASSED] drm_test_buddy_alloc_range [20:22:05] [PASSED] drm_test_buddy_alloc_optimistic [20:22:05] [PASSED] drm_test_buddy_alloc_pessimistic [20:22:05] [PASSED] drm_test_buddy_alloc_smoke [20:22:05] [PASSED] drm_test_buddy_alloc_pathological [20:22:05] ==================== [PASSED] drm_buddy ==================== [20:22:05] =================== drm_cmdline_parser ==================== [20:22:05] [PASSED] drm_test_cmdline_force_d_only [20:22:05] [PASSED] drm_test_cmdline_force_D_only_dvi [20:22:05] [PASSED] drm_test_cmdline_force_D_only_hdmi [20:22:05] [PASSED] drm_test_cmdline_force_D_only_not_digital [20:22:05] [PASSED] drm_test_cmdline_force_e_only [20:22:05] [PASSED] drm_test_cmdline_res [20:22:05] [PASSED] drm_test_cmdline_res_vesa [20:22:05] [PASSED] drm_test_cmdline_res_vesa_rblank [20:22:05] [PASSED] drm_test_cmdline_res_rblank [20:22:05] [PASSED] drm_test_cmdline_res_bpp [20:22:05] [PASSED] drm_test_cmdline_res_refresh [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_margins [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_force_off [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_analog [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_digital [20:22:05] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced_margins_force_on [20:22:05] [PASSED] drm_test_cmdline_res_margins_force_on [20:22:05] [PASSED] drm_test_cmdline_res_vesa_margins [20:22:05] [PASSED] drm_test_cmdline_name [20:22:05] [PASSED] drm_test_cmdline_name_bpp [20:22:05] [PASSED] drm_test_cmdline_name_option [20:22:05] [PASSED] drm_test_cmdline_name_bpp_option [20:22:05] [PASSED] drm_test_cmdline_rotate_0 [20:22:05] [PASSED] drm_test_cmdline_rotate_90 [20:22:05] [PASSED] drm_test_cmdline_rotate_180 [20:22:05] [PASSED] drm_test_cmdline_rotate_270 [20:22:05] [PASSED] drm_test_cmdline_hmirror [20:22:05] [PASSED] drm_test_cmdline_vmirror [20:22:05] [PASSED] drm_test_cmdline_margin_options [20:22:05] [PASSED] drm_test_cmdline_multiple_options [20:22:05] [PASSED] drm_test_cmdline_bpp_extra_and_option [20:22:05] [PASSED] drm_test_cmdline_extra_and_option [20:22:05] [PASSED] drm_test_cmdline_freestanding_options [20:22:05] [PASSED] drm_test_cmdline_freestanding_force_e_and_options [20:22:05] [PASSED] drm_test_cmdline_panel_orientation [20:22:05] ================ drm_test_cmdline_invalid ================= [20:22:05] [PASSED] margin_only [20:22:05] [PASSED] interlace_only [20:22:05] [PASSED] res_missing_x [20:22:05] [PASSED] res_missing_y [20:22:05] [PASSED] res_bad_y [20:22:05] [PASSED] res_missing_y_bpp [20:22:05] [PASSED] res_bad_bpp [20:22:05] [PASSED] res_bad_refresh [20:22:05] [PASSED] res_bpp_refresh_force_on_off [20:22:05] [PASSED] res_invalid_mode [20:22:05] [PASSED] res_bpp_wrong_place_mode [20:22:05] [PASSED] name_bpp_refresh [20:22:05] [PASSED] name_refresh [20:22:05] [PASSED] name_refresh_wrong_mode [20:22:05] [PASSED] name_refresh_invalid_mode [20:22:05] [PASSED] rotate_multiple [20:22:05] [PASSED] rotate_invalid_val [20:22:05] [PASSED] rotate_truncated [20:22:05] [PASSED] invalid_option [20:22:05] [PASSED] invalid_tv_option [20:22:05] [PASSED] truncated_tv_option [20:22:05] ============ [PASSED] drm_test_cmdline_invalid ============= [20:22:05] =============== drm_test_cmdline_tv_options =============== [20:22:05] [PASSED] NTSC [20:22:05] [PASSED] NTSC_443 [20:22:05] [PASSED] NTSC_J [20:22:05] [PASSED] PAL [20:22:05] [PASSED] PAL_M [20:22:05] [PASSED] PAL_N [20:22:05] [PASSED] SECAM [20:22:05] =========== [PASSED] drm_test_cmdline_tv_options =========== [20:22:05] =============== [PASSED] drm_cmdline_parser ================ [20:22:05] ================ drm_get_tv_mode_from_name ================ [20:22:05] ========== drm_test_get_tv_mode_from_name_valid =========== [20:22:05] [PASSED] NTSC [20:22:05] [PASSED] NTSC-443 [20:22:05] [PASSED] NTSC-J [20:22:05] [PASSED] PAL [20:22:05] [PASSED] PAL-M [20:22:05] [PASSED] PAL-N [20:22:05] [PASSED] SECAM [20:22:05] ====== [PASSED] drm_test_get_tv_mode_from_name_valid ======= [20:22:05] [PASSED] drm_test_get_tv_mode_from_name_truncated [20:22:05] ============ [PASSED] drm_get_tv_mode_from_name ============ [20:22:05] ==================== drm_damage_helper ==================== [20:22:05] [PASSED] drm_test_damage_iter_no_damage [20:22:05] [PASSED] drm_test_damage_iter_no_damage_fractional_src [20:22:05] [PASSED] drm_test_damage_iter_no_damage_src_moved [20:22:05] [PASSED] drm_test_damage_iter_no_damage_fractional_src_moved [20:22:05] [PASSED] drm_test_damage_iter_no_damage_not_visible [20:22:05] [PASSED] drm_test_damage_iter_no_damage_no_crtc [20:22:05] [PASSED] drm_test_damage_iter_no_damage_no_fb [20:22:05] [PASSED] drm_test_damage_iter_simple_damage [20:22:05] [PASSED] drm_test_damage_iter_single_damage [20:22:05] [PASSED] drm_test_damage_iter_single_damage_intersect_src [20:22:05] [PASSED] drm_test_damage_iter_single_damage_outside_src [20:22:05] [PASSED] drm_test_damage_iter_single_damage_fractional_src [20:22:05] [PASSED] drm_test_damage_iter_single_damage_intersect_fractional_src [20:22:05] [PASSED] drm_test_damage_iter_single_damage_outside_fractional_src [20:22:05] [PASSED] drm_test_damage_iter_single_damage_src_moved [20:22:05] [PASSED] drm_test_damage_iter_single_damage_fractional_src_moved [20:22:05] [PASSED] drm_test_damage_iter_damage [20:22:05] [PASSED] drm_test_damage_iter_damage_one_intersect [20:22:05] [PASSED] drm_test_damage_iter_damage_one_outside [20:22:05] [PASSED] drm_test_damage_iter_damage_src_moved [20:22:05] [PASSED] drm_test_damage_iter_damage_not_visible [20:22:05] ================ [PASSED] drm_damage_helper ================ [20:22:05] ==================== drm_dp_mst_helper ==================== [20:22:05] ============== drm_test_dp_mst_calc_pbn_mode ============== [20:22:05] [PASSED] Clock 154000 BPP 30 DSC disabled [20:22:05] [PASSED] Clock 234000 BPP 30 DSC disabled [20:22:05] [PASSED] Clock 297000 BPP 24 DSC disabled [20:22:05] [PASSED] Clock 332880 BPP 24 DSC enabled [20:22:05] [PASSED] Clock 324540 BPP 24 DSC enabled [20:22:05] ========== [PASSED] drm_test_dp_mst_calc_pbn_mode ========== [20:22:05] ========= drm_test_dp_mst_sideband_msg_req_decode ========= [20:22:05] [PASSED] DP_ENUM_PATH_RESOURCES with port number [20:22:05] [PASSED] DP_POWER_UP_PHY with port number [20:22:05] [PASSED] DP_POWER_DOWN_PHY with port number [20:22:05] [PASSED] DP_ALLOCATE_PAYLOAD with SDP stream sinks [20:22:05] [PASSED] DP_ALLOCATE_PAYLOAD with port number [20:22:05] [PASSED] DP_ALLOCATE_PAYLOAD with VCPI [20:22:05] [PASSED] DP_ALLOCATE_PAYLOAD with PBN [20:22:05] [PASSED] DP_QUERY_PAYLOAD with port number [20:22:05] [PASSED] DP_QUERY_PAYLOAD with VCPI [20:22:05] [PASSED] DP_REMOTE_DPCD_READ with port number [20:22:05] [PASSED] DP_REMOTE_DPCD_READ with DPCD address [20:22:05] [PASSED] DP_REMOTE_DPCD_READ with max number of bytes [20:22:05] [PASSED] DP_REMOTE_DPCD_WRITE with port number [20:22:05] [PASSED] DP_REMOTE_DPCD_WRITE with DPCD address [20:22:05] [PASSED] DP_REMOTE_DPCD_WRITE with data array [20:22:05] [PASSED] DP_REMOTE_I2C_READ with port number [20:22:05] [PASSED] DP_REMOTE_I2C_READ with I2C device ID [20:22:05] [PASSED] DP_REMOTE_I2C_READ with transactions array [20:22:05] [PASSED] DP_REMOTE_I2C_WRITE with port number [20:22:05] [PASSED] DP_REMOTE_I2C_WRITE with I2C device ID [20:22:05] [PASSED] DP_REMOTE_I2C_WRITE with data array [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream ID [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with client ID [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream event [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with valid stream event [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream behavior [20:22:05] [PASSED] DP_QUERY_STREAM_ENC_STATUS with a valid stream behavior [20:22:05] ===== [PASSED] drm_test_dp_mst_sideband_msg_req_decode ===== [20:22:05] ================ [PASSED] drm_dp_mst_helper ================ [20:22:05] ================= drm_format_helper_test ================== [20:22:05] ============== drm_test_fb_xrgb8888_to_gray8 ============== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ========== [PASSED] drm_test_fb_xrgb8888_to_gray8 ========== [20:22:05] ============= drm_test_fb_xrgb8888_to_rgb332 ============== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb332 ========== [20:22:05] ============= drm_test_fb_xrgb8888_to_rgb565 ============== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb565 ========== [20:22:05] ============ drm_test_fb_xrgb8888_to_xrgb1555 ============= [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======== [PASSED] drm_test_fb_xrgb8888_to_xrgb1555 ========= [20:22:05] ============ drm_test_fb_xrgb8888_to_argb1555 ============= [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======== [PASSED] drm_test_fb_xrgb8888_to_argb1555 ========= [20:22:05] ============ drm_test_fb_xrgb8888_to_rgba5551 ============= [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======== [PASSED] drm_test_fb_xrgb8888_to_rgba5551 ========= [20:22:05] ============= drm_test_fb_xrgb8888_to_rgb888 ============== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb888 ========== [20:22:05] ============ drm_test_fb_xrgb8888_to_argb8888 ============= [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======== [PASSED] drm_test_fb_xrgb8888_to_argb8888 ========= [20:22:05] =========== drm_test_fb_xrgb8888_to_xrgb2101010 =========== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======= [PASSED] drm_test_fb_xrgb8888_to_xrgb2101010 ======= [20:22:05] =========== drm_test_fb_xrgb8888_to_argb2101010 =========== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ======= [PASSED] drm_test_fb_xrgb8888_to_argb2101010 ======= [20:22:05] ============== drm_test_fb_xrgb8888_to_mono =============== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ========== [PASSED] drm_test_fb_xrgb8888_to_mono =========== [20:22:05] ==================== drm_test_fb_swab ===================== [20:22:05] [PASSED] single_pixel_source_buffer [20:22:05] [PASSED] single_pixel_clip_rectangle [20:22:05] [PASSED] well_known_colors [20:22:05] [PASSED] destination_pitch [20:22:05] ================ [PASSED] drm_test_fb_swab ================= [20:22:05] ================= drm_test_fb_clip_offset ================= [20:22:05] [PASSED] pass through [20:22:05] [PASSED] horizontal offset [20:22:05] [PASSED] vertical offset [20:22:05] [PASSED] horizontal and vertical offset [20:22:05] [PASSED] horizontal offset (custom pitch) [20:22:05] [PASSED] vertical offset (custom pitch) [20:22:05] [PASSED] horizontal and vertical offset (custom pitch) [20:22:05] ============= [PASSED] drm_test_fb_clip_offset ============= [20:22:05] ============== drm_test_fb_build_fourcc_list ============== [20:22:05] [PASSED] no native formats [20:22:05] [PASSED] XRGB8888 as native format [20:22:05] [PASSED] remove duplicates [20:22:05] [PASSED] convert alpha formats [20:22:05] [PASSED] random formats [20:22:05] ========== [PASSED] drm_test_fb_build_fourcc_list ========== [20:22:05] =================== drm_test_fb_memcpy ==================== [20:22:05] [PASSED] single_pixel_source_buffer: XR24 little-endian (0x34325258) [20:22:05] [PASSED] single_pixel_source_buffer: XRA8 little-endian (0x38415258) [20:22:05] [PASSED] single_pixel_source_buffer: YU24 little-endian (0x34325559) [20:22:05] [PASSED] single_pixel_clip_rectangle: XB24 little-endian (0x34324258) [20:22:05] [PASSED] single_pixel_clip_rectangle: XRA8 little-endian (0x38415258) [20:22:05] [PASSED] single_pixel_clip_rectangle: YU24 little-endian (0x34325559) [20:22:05] [PASSED] well_known_colors: XB24 little-endian (0x34324258) [20:22:05] [PASSED] well_known_colors: XRA8 little-endian (0x38415258) [20:22:05] [PASSED] well_known_colors: YU24 little-endian (0x34325559) [20:22:05] [PASSED] destination_pitch: XB24 little-endian (0x34324258) [20:22:05] [PASSED] destination_pitch: XRA8 little-endian (0x38415258) [20:22:05] [PASSED] destination_pitch: YU24 little-endian (0x34325559) [20:22:05] =============== [PASSED] drm_test_fb_memcpy ================ [20:22:05] ============= [PASSED] drm_format_helper_test ============== [20:22:05] ======================= drm_format ======================== [20:22:05] [PASSED] drm_test_format_block_width_invalid [20:22:05] [PASSED] drm_test_format_block_width_one_plane [20:22:05] [PASSED] drm_test_format_block_width_two_plane [20:22:05] [PASSED] drm_test_format_block_width_three_plane [20:22:05] [PASSED] drm_test_format_block_width_tiled [20:22:05] [PASSED] drm_test_format_block_height_invalid [20:22:05] [PASSED] drm_test_format_block_height_one_plane [20:22:05] [PASSED] drm_test_format_block_height_two_plane [20:22:05] [PASSED] drm_test_format_block_height_three_plane [20:22:05] [PASSED] drm_test_format_block_height_tiled [20:22:05] [PASSED] drm_test_format_min_pitch_invalid [20:22:05] [PASSED] drm_test_format_min_pitch_one_plane_8bpp [20:22:05] [PASSED] drm_test_format_min_pitch_one_plane_16bpp [20:22:05] [PASSED] drm_test_format_min_pitch_one_plane_24bpp [20:22:05] [PASSED] drm_test_format_min_pitch_one_plane_32bpp [20:22:05] [PASSED] drm_test_format_min_pitch_two_plane [20:22:05] [PASSED] drm_test_format_min_pitch_three_plane_8bpp [20:22:05] [PASSED] drm_test_format_min_pitch_tiled [20:22:05] =================== [PASSED] drm_format ==================== [20:22:05] ===================== drm_framebuffer ===================== [20:22:05] =============== drm_test_framebuffer_create =============== [20:22:05] [PASSED] ABGR8888 normal sizes [20:22:05] [PASSED] ABGR8888 max sizes [20:22:05] [PASSED] ABGR8888 pitch greater than min required [20:22:05] [PASSED] ABGR8888 pitch less than min required [20:22:05] [PASSED] ABGR8888 Invalid width [20:22:05] [PASSED] ABGR8888 Invalid buffer handle [20:22:05] [PASSED] No pixel format [20:22:05] [PASSED] ABGR8888 Width 0 [20:22:05] [PASSED] ABGR8888 Height 0 [20:22:05] [PASSED] ABGR8888 Out of bound height * pitch combination [20:22:05] [PASSED] ABGR8888 Large buffer offset [20:22:05] [PASSED] ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers [20:22:05] [PASSED] ABGR8888 Valid buffer modifier [20:22:05] [PASSED] ABGR8888 Invalid buffer modifier(DRM_FORMAT_MOD_SAMSUNG_64_32_TILE) [20:22:05] [PASSED] ABGR8888 Extra pitches without DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] ABGR8888 Extra pitches with DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] NV12 Normal sizes [20:22:05] [PASSED] NV12 Max sizes [20:22:05] [PASSED] NV12 Invalid pitch [20:22:05] [PASSED] NV12 Invalid modifier/missing DRM_MODE_FB_MODIFIERS flag [20:22:05] [PASSED] NV12 different modifier per-plane [20:22:05] [PASSED] NV12 with DRM_FORMAT_MOD_SAMSUNG_64_32_TILE [20:22:05] [PASSED] NV12 Valid modifiers without DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] NV12 Modifier for inexistent plane [20:22:05] [PASSED] NV12 Handle for inexistent plane [20:22:05] [PASSED] NV12 Handle for inexistent plane without DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] YVU420 DRM_MODE_FB_MODIFIERS set without modifier [20:22:05] [PASSED] YVU420 Normal sizes [20:22:05] [PASSED] YVU420 Max sizes [20:22:05] [PASSED] YVU420 Invalid pitch [20:22:05] [PASSED] YVU420 Different pitches [20:22:05] [PASSED] YVU420 Different buffer offsets/pitches [20:22:05] [PASSED] YVU420 Modifier set just for plane 0, without DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] YVU420 Modifier set just for planes 0, 1, without DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] YVU420 Modifier set just for plane 0, 1, with DRM_MODE_FB_MODIFIERS [20:22:05] [PASSED] YVU420 Valid modifier [20:22:05] [PASSED] YVU420 Different modifiers per plane [20:22:05] [PASSED] YVU420 Modifier for inexistent plane [20:22:05] [PASSED] X0L2 Normal sizes [20:22:05] [PASSED] X0L2 Max sizes [20:22:05] [PASSED] X0L2 Invalid pitch [20:22:05] [PASSED] X0L2 Pitch greater than minimum required [20:22:05] [PASSED] X0L2 Handle for inexistent plane [20:22:05] [PASSED] X0L2 Offset for inexistent plane, without DRM_MODE_FB_MODIFIERS set [20:22:05] [PASSED] X0L2 Modifier without DRM_MODE_FB_MODIFIERS set [20:22:05] [PASSED] X0L2 Valid modifier [20:22:05] [PASSED] X0L2 Modifier for inexistent plane [20:22:05] =========== [PASSED] drm_test_framebuffer_create =========== [20:22:05] ================= [PASSED] drm_framebuffer ================= [20:22:05] ==================== drm-test-managed ===================== [20:22:05] [PASSED] drm_test_managed_run_action [20:22:05] ================ [PASSED] drm-test-managed ================= [20:22:05] ========================= drm_mm ========================== [20:22:05] [PASSED] drm_test_mm_init [20:22:05] [PASSED] drm_test_mm_debug [20:22:15] [PASSED] drm_test_mm_reserve [20:22:26] [PASSED] drm_test_mm_insert [20:22:26] [PASSED] drm_test_mm_replace [20:22:26] [PASSED] drm_test_mm_insert_range [20:22:26] [PASSED] drm_test_mm_frag [20:22:26] [PASSED] drm_test_mm_align [20:22:26] [PASSED] drm_test_mm_align32 [20:22:27] [PASSED] drm_test_mm_align64 [20:22:27] [PASSED] drm_test_mm_evict [20:22:27] [PASSED] drm_test_mm_evict_range [20:22:27] [PASSED] drm_test_mm_topdown [20:22:27] [PASSED] drm_test_mm_bottomup [20:22:27] [PASSED] drm_test_mm_lowest [20:22:27] [PASSED] drm_test_mm_highest [20:22:28] [PASSED] drm_test_mm_color [20:22:28] [PASSED] drm_test_mm_color_evict [20:22:28] [PASSED] drm_test_mm_color_evict_range [20:22:28] ===================== [PASSED] drm_mm ====================== [20:22:28] =================== drm_modes_analog_tv =================== [20:22:28] [PASSED] drm_test_modes_analog_tv_ntsc_480i [20:22:28] [PASSED] drm_test_modes_analog_tv_ntsc_480i_inlined [20:22:28] [PASSED] drm_test_modes_analog_tv_pal_576i [20:22:28] [PASSED] drm_test_modes_analog_tv_pal_576i_inlined [20:22:28] =============== [PASSED] drm_modes_analog_tv =============== [20:22:28] ==================== drm_plane_helper ===================== [20:22:28] =============== drm_test_check_plane_state ================ [20:22:28] [PASSED] clipping_simple [20:22:28] [PASSED] clipping_rotate_reflect [20:22:28] [PASSED] positioning_simple [20:22:28] [PASSED] upscaling [20:22:28] [PASSED] downscaling [20:22:28] [PASSED] rounding1 [20:22:28] [PASSED] rounding2 [20:22:28] [PASSED] rounding3 [20:22:28] [PASSED] rounding4 [20:22:28] =========== [PASSED] drm_test_check_plane_state ============ [20:22:28] =========== drm_test_check_invalid_plane_state ============ [20:22:28] [PASSED] positioning_invalid [20:22:28] [PASSED] upscaling_invalid [20:22:28] [PASSED] downscaling_invalid [20:22:28] ======= [PASSED] drm_test_check_invalid_plane_state ======== [20:22:28] ================ [PASSED] drm_plane_helper ================= [20:22:28] ============ drm_connector_helper_tv_get_modes ============ [20:22:28] ====== drm_test_connector_helper_tv_get_modes_check ======= [20:22:28] [PASSED] None [20:22:28] [PASSED] PAL [20:22:28] [PASSED] NTSC [20:22:28] [PASSED] Both, NTSC Default [20:22:28] [PASSED] Both, PAL Default [20:22:28] [PASSED] Both, NTSC Default, with PAL on command-line [20:22:28] [PASSED] Both, PAL Default, with NTSC on command-line [20:22:28] == [PASSED] drm_test_connector_helper_tv_get_modes_check === [20:22:28] ======== [PASSED] drm_connector_helper_tv_get_modes ======== [20:22:28] ======================== drm_rect ========================= [20:22:28] [PASSED] drm_test_rect_clip_scaled_div_by_zero [20:22:28] [PASSED] drm_test_rect_clip_scaled_not_clipped [20:22:28] [PASSED] drm_test_rect_clip_scaled_clipped [20:22:28] [PASSED] drm_test_rect_clip_scaled_signed_vs_unsigned [20:22:28] ================= drm_test_rect_intersect ================= [20:22:28] [PASSED] top-left x bottom-right: 2x2+1+1 x 2x2+0+0 [20:22:28] [PASSED] top-right x bottom-left: 2x2+0+0 x 2x2+1-1 [20:22:28] [PASSED] bottom-left x top-right: 2x2+1-1 x 2x2+0+0 [20:22:28] [PASSED] bottom-right x top-left: 2x2+0+0 x 2x2+1+1 [20:22:28] [PASSED] right x left: 2x1+0+0 x 3x1+1+0 [20:22:28] [PASSED] left x right: 3x1+1+0 x 2x1+0+0 [20:22:28] [PASSED] up x bottom: 1x2+0+0 x 1x3+0-1 [20:22:28] [PASSED] bottom x up: 1x3+0-1 x 1x2+0+0 [20:22:28] [PASSED] touching corner: 1x1+0+0 x 2x2+1+1 [20:22:28] [PASSED] touching side: 1x1+0+0 x 1x1+1+0 [20:22:28] [PASSED] equal rects: 2x2+0+0 x 2x2+0+0 [20:22:28] [PASSED] inside another: 2x2+0+0 x 1x1+1+1 [20:22:28] [PASSED] far away: 1x1+0+0 x 1x1+3+6 [20:22:28] [PASSED] points intersecting: 0x0+5+10 x 0x0+5+10 [20:22:28] [PASSED] points not intersecting: 0x0+0+0 x 0x0+5+10 [20:22:28] ============= [PASSED] drm_test_rect_intersect ============= [20:22:28] ================ drm_test_rect_calc_hscale ================ [20:22:28] [PASSED] normal use [20:22:28] [PASSED] out of max range [20:22:28] [PASSED] out of min range [20:22:28] [PASSED] zero dst [20:22:28] [PASSED] negative src [20:22:28] [PASSED] negative dst [20:22:28] ============ [PASSED] drm_test_rect_calc_hscale ============ [20:22:28] ================ drm_test_rect_calc_vscale ================ [20:22:28] [PASSED] normal use [20:22:28] [PASSED] out of max range [20:22:28] [PASSED] out of min range [20:22:28] [PASSED] zero dst [20:22:28] [PASSED] negative src [20:22:28] [PASSED] negative dst [20:22:28] ============ [PASSED] drm_test_rect_calc_vscale ============ [20:22:28] ================== drm_test_rect_rotate =================== [20:22:28] [PASSED] reflect-x [20:22:28] [PASSED] reflect-y [20:22:28] [PASSED] rotate-0 [20:22:28] [PASSED] rotate-90 [20:22:28] [PASSED] rotate-180 [20:22:28] [PASSED] rotate-270 [20:22:28] ============== [PASSED] drm_test_rect_rotate =============== [20:22:28] ================ drm_test_rect_rotate_inv ================= [20:22:28] [PASSED] reflect-x [20:22:28] [PASSED] reflect-y [20:22:28] [PASSED] rotate-0 [20:22:28] [PASSED] rotate-90 [20:22:28] [PASSED] rotate-180 [20:22:28] [PASSED] rotate-270 [20:22:28] ============ [PASSED] drm_test_rect_rotate_inv ============= stty: 'standard input': Inappropriate ioctl for device [20:22:28] ==================== [PASSED] drm_rect ===================== [20:22:28] ======================== drm_exec ========================= [20:22:28] [PASSED] sanitycheck [20:22:28] [PASSED] test_lock [20:22:28] [PASSED] test_lock_unlock [20:22:28] [PASSED] test_duplicates [20:22:28] [PASSED] test_prepare [20:22:28] [PASSED] test_prepare_array [20:22:28] [PASSED] test_multiple_loops [20:22:28] ==================== [PASSED] drm_exec ===================== [20:22:28] ============================================================ [20:22:28] Testing complete. Ran 368 tests: passed: 368 [20:22:28] Elapsed time: 44.306s total, 1.659s configuring, 19.105s building, 23.539s running
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
Quoted 6 lines · Matthew Brost
If a rebind is skipped the
tile_presentmask needs to be updated for the
newly created vma to properly reflect the state of the vma.Reported-by <[email protected]>Signed-off-by Matthew Brost <[email protected]>
Quoted 61 lines
---
drivers/gpu/drm/xe/xe_vm.c | 15 +++++++++++++--1 file changed, 13 insertions(+), 2 deletions(-)drivers/gpu/drm/xe/xe_vm.c +0
-0@@ -2340,6 +2340,10 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op) op->flags |= XE_VMA_OP_COMMITTED; break;case
DRM_GPUVA_OP_REMAP:
+ {
+ u8tile_present=
+ gpuva_to_vma(op->base.remap.unmap->va)-Quoted 1 line
tile_present;+
prep_vma_destroy(vm, gpuva_to_vma(op-Quoted 1 line
base.remap.unmap->va),true);
op->flags |=XE_VMA_OP_COMMITTED;drivers/gpu/drm/xe/xe_vm.c +0
-0@@ -2348,15 +2352,21 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op) err |= xe_vm_insert_vma(vm, op->remap.prev); if (!err)op->flags |=
XE_VMA_OP_PREV_COMMITTED;
- if (!err &&op->remap.skip_prev) + if (!err &&op->remap.skip_prev) { + op->remap.prev->tile_present = + tile_present;op->remap.prev= NULL;
+ }
}
if (op->remap.next) {
err |=xe_vm_insert_vma(vm, op->remap.next); if (!err)
op->flags |=XE_VMA_OP_NEXT_COMMITTED;
- if (!err &&op->remap.skip_next) + if (!err &&op->remap.skip_next) { + op->remap.next->tile_present = + tile_present;op->remap.next= NULL;
+ }
}
/* Adjust for partial unbind after removin VMA from VM */drivers/gpu/drm/xe/xe_vm.c +0
-0@@ -2365,6 +2375,7 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op)op->base.remap.unmap->va->va.range = op-
Quoted 1 line
remap.range;
}
break;
+ }
caseDRM_GPUVA_OP_UNMAP:
prep_vma_destroy(vm,gpuva_to_vma(op->base.unmap.va), true);
op->flags |=XE_VMA_OP_COMMITTED;