Patch "drm/i915/selftest: fix intel_selftest_modify_policy argument types" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/i915/selftest: fix intel_selftest_modify_policy argument types

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-selftest-fix-intel_selftest_modify_policy-a.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d5ccb4d5960a63d7f209aa66e0c70bce239a9a5d
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date:   Tue Jan 17 17:37:29 2023 +0100

    drm/i915/selftest: fix intel_selftest_modify_policy argument types
    
    [ Upstream commit 2255bbcdc39d5b0311968f86614ae4f25fdd465d ]
    
    The definition of intel_selftest_modify_policy() does not match the
    declaration, as gcc-13 points out:
    
    drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c:29:5: error: conflicting types for 'intel_selftest_modify_policy' due to enum/integer mismatch; have 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, u32)' {aka 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, unsigned int)'} [-Werror=enum-int-mismatch]
       29 | int intel_selftest_modify_policy(struct intel_engine_cs *engine,
          |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c:11:
    drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.h:28:5: note: previous declaration of 'intel_selftest_modify_policy' with type 'int(struct intel_engine_cs *, struct intel_selftest_saved_policy *, enum selftest_scheduler_modify)'
       28 | int intel_selftest_modify_policy(struct intel_engine_cs *engine,
          |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Change the type in the definition to match.
    
    Fixes: 617e87c05c72 ("drm/i915/selftest: Fix hangcheck self test for GuC submission")
    Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
    Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
    Signed-off-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230117163743.1003219-1-arnd@xxxxxxxxxx
    (cherry picked from commit 8d7eb8ed3f83f248e01a4f548d9c500a950a2c2d)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
index 310fb83c527e..2990dd4d4a0d 100644
--- a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
+++ b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
@@ -28,8 +28,7 @@ struct intel_engine_cs *intel_selftest_find_any_engine(struct intel_gt *gt)
 
 int intel_selftest_modify_policy(struct intel_engine_cs *engine,
 				 struct intel_selftest_saved_policy *saved,
-				 u32 modify_type)
-
+				 enum selftest_scheduler_modify modify_type)
 {
 	int err;