diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2021-11-02 09:30:26 +0100 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2021-11-02 09:30:26 +0100 |
commit | 42ef83f2d169a9f90bca5d2d37aae1208a0392da (patch) | |
tree | 15ef8166affca355dfaf5acd7a1587e515cb5e0c | |
parent | ed24444220db9f9edc325a72bd11a52b8222bf70 (diff) | |
download | linux-rt-42ef83f2d169a9f90bca5d2d37aae1208a0392da.tar.gz |
[ANNOUNCE] v5.15-rt16v5.15-rt16-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r-- | patches/0001-drm-i915-selftests-Properly-reset-mock-object-proper.patch | 53 | ||||
-rw-r--r-- | patches/Add_localversion_for_-RT_release.patch | 2 | ||||
-rw-r--r-- | patches/series | 1 |
3 files changed, 1 insertions, 55 deletions
diff --git a/patches/0001-drm-i915-selftests-Properly-reset-mock-object-proper.patch b/patches/0001-drm-i915-selftests-Properly-reset-mock-object-proper.patch deleted file mode 100644 index 5812ad1cbbec..000000000000 --- a/patches/0001-drm-i915-selftests-Properly-reset-mock-object-proper.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Thu, 21 Oct 2021 22:20:48 +0200 -Subject: [PATCH 01/10] drm/i915/selftests: Properly reset mock object propers - for each test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -I forgot to do this properly in - -commit 6f11f37459d8f9f74ff1c299c0bedd50b458057a -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Fri Jul 23 10:34:55 2021 +0200 - - drm/plane: remove drm_helper_get_plane_damage_clips - -intel-gfx CI didn't spot this because we run each selftest in each own -invocations, which means reloading i915.ko. But if you just run all -the selftests in one go at boot-up, then it falls apart and eventually -we cross over the hardcoded limited of how many properties can be -attached to a single object. - -Fix this by resetting the property count. Nothing else to clean up -since it's all static storage anyway. - -Reported-and-tested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Fixes: 6f11f37459d8 ("drm/plane: remove drm_helper_get_plane_damage_clips") -Cc: José Roberto de Souza <jose.souza@intel.com> -Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> -Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> -Cc: Hans de Goede <hdegoede@redhat.com> -Cc: Daniel Vetter <daniel.vetter@intel.com> -Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -Cc: Maxime Ripard <mripard@kernel.org> -Cc: Thomas Zimmermann <tzimmermann@suse.de> -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Link: https://lore.kernel.org/r/20211021202048.2638668-1-daniel.vetter@ffwll.ch ---- - drivers/gpu/drm/selftests/test-drm_damage_helper.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/gpu/drm/selftests/test-drm_damage_helper.c -+++ b/drivers/gpu/drm/selftests/test-drm_damage_helper.c -@@ -30,6 +30,7 @@ static void mock_setup(struct drm_plane_ - mock_device.driver = &mock_driver; - mock_device.mode_config.prop_fb_damage_clips = &mock_prop; - mock_plane.dev = &mock_device; -+ mock_obj_props.count = 0; - mock_plane.base.properties = &mock_obj_props; - mock_prop.base.id = 1; /* 0 is an invalid id */ - mock_prop.dev = &mock_device; diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch index 2361800c1e6b..22146ab020cb 100644 --- a/patches/Add_localversion_for_-RT_release.patch +++ b/patches/Add_localversion_for_-RT_release.patch @@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt15 ++-rt16 diff --git a/patches/series b/patches/series index 49e122927596..6467f5571a62 100644 --- a/patches/series +++ b/patches/series @@ -199,7 +199,6 @@ random__Make_it_work_on_rt.patch ########################################################################### # DRM: ########################################################################### -0001-drm-i915-selftests-Properly-reset-mock-object-proper.patch 0002-drm-i915-Don-t-disable-interrupts-and-pretend-a-lock.patch 0003-drm-i915-Use-preempt_disable-enable_rt-where-recomme.patch 0004-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch |