232 lines
9.4 KiB
Diff
232 lines
9.4 KiB
Diff
From e5e77ad2223f662e1615266d8ef39a8db7e65a70 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
|
|
Date: Thu, 19 Nov 2020 09:22:32 +0100
|
|
Subject: HID: quirks: Add Apple Magic Trackpad 2 to hid_have_special_driver
|
|
list
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The Apple Magic Trackpad 2 is handled by the magicmouse driver. And
|
|
there were severe stability issues when both drivers (hid-generic and
|
|
hid-magicmouse) were loaded for this device.
|
|
|
|
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=210241
|
|
|
|
Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
|
|
---
|
|
drivers/hid/hid-quirks.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
|
index bf7ecab5d9e5..142e9dae2837 100644
|
|
--- a/drivers/hid/hid-quirks.c
|
|
+++ b/drivers/hid/hid-quirks.c
|
|
@@ -478,6 +478,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
|
#if IS_ENABLED(CONFIG_HID_MAGICMOUSE)
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
|
|
+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
|
|
#endif
|
|
#if IS_ENABLED(CONFIG_HID_MAYFLASH)
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
|
|
--
|
|
cgit v1.2.3-1-gf6bb5
|
|
|
|
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
From: Tk-Glitch <ti3nou@gmail.com>
|
|
Date: Wed, 3 Feb 2021 11:20:12 +0200
|
|
Subject: Revert "cpufreq: Avoid configuring old governors as default with intel_pstate"
|
|
|
|
This is an undesirable behavior for us since our aggressive ondemand performs
|
|
better than schedutil for gaming when using intel_pstate in passive mode.
|
|
Also it interferes with the option to select the desired default governor we have.
|
|
|
|
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
|
|
index 2c7171e0b0010..85de313ddec29 100644
|
|
--- a/drivers/cpufreq/Kconfig
|
|
+++ b/drivers/cpufreq/Kconfig
|
|
@@ -71,7 +71,6 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
|
|
|
|
config CPU_FREQ_DEFAULT_GOV_ONDEMAND
|
|
bool "ondemand"
|
|
- depends on !(X86_INTEL_PSTATE && SMP)
|
|
select CPU_FREQ_GOV_ONDEMAND
|
|
select CPU_FREQ_GOV_PERFORMANCE
|
|
help
|
|
@@ -83,7 +84,6 @@ config CPU_FREQ_DEFAULT_GOV_ONDEMAND
|
|
|
|
config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
|
|
bool "conservative"
|
|
- depends on !(X86_INTEL_PSTATE && SMP)
|
|
select CPU_FREQ_GOV_CONSERVATIVE
|
|
select CPU_FREQ_GOV_PERFORMANCE
|
|
help
|
|
|
|
From 3a88b77d3cb9f9cd8a8aee052ab479b73aeb2e80 Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
|
Date: Sat, 13 Jan 2024 15:29:25 +0100
|
|
Subject: [PATCH] arch/Kconfig: Default to maximum amount of ASLR bits
|
|
|
|
To mitigate https://zolutal.github.io/aslrnt/; do this with a patch to
|
|
avoid having to enable `CONFIG_EXPERT`.
|
|
---
|
|
arch/Kconfig | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/Kconfig b/arch/Kconfig
|
|
index f4b210ab061291..837d0dbb28ea08 100644
|
|
--- a/arch/Kconfig
|
|
+++ b/arch/Kconfig
|
|
@@ -1032,7 +1032,7 @@ config ARCH_MMAP_RND_BITS
|
|
int "Number of bits to use for ASLR of mmap base address" if EXPERT
|
|
range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX
|
|
default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT
|
|
- default ARCH_MMAP_RND_BITS_MIN
|
|
+ default ARCH_MMAP_RND_BITS_MAX
|
|
depends on HAVE_ARCH_MMAP_RND_BITS
|
|
help
|
|
This value can be used to select the number of bits to use to
|
|
@@ -1066,7 +1066,7 @@ config ARCH_MMAP_RND_COMPAT_BITS
|
|
int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT
|
|
range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX
|
|
default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT
|
|
- default ARCH_MMAP_RND_COMPAT_BITS_MIN
|
|
+ default ARCH_MMAP_RND_COMPAT_BITS_MAX
|
|
depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
|
|
help
|
|
This value can be used to select the number of bits to use to
|
|
|
|
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
|
|
index 180ac47868c2..42bf097b36b7 100644
|
|
--- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c
|
|
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
|
|
@@ -300,7 +300,6 @@ void dc_state_destruct(struct dc_state *state)
|
|
state->phantom_plane_count = 0;
|
|
|
|
state->stream_mask = 0;
|
|
- memset(&state->res_ctx, 0, sizeof(state->res_ctx));
|
|
memset(&state->pp_display_cfg, 0, sizeof(state->pp_display_cfg));
|
|
memset(&state->dcn_bw_vars, 0, sizeof(state->dcn_bw_vars));
|
|
state->clk_mgr = NULL;
|
|
|
|
From 299b81f3e619aea3ceda77d7c42842a496b34a53 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jung <admin@ptr1337.dev>
|
|
Date: Thu, 21 Mar 2024 19:00:50 +0100
|
|
Subject: [PATCH] cachy: move AMD_PRIVATE_COLOR to Kconfig
|
|
|
|
Co-authored-by: PedroHLC <root@pedrohlc.com>
|
|
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
|
---
|
|
drivers/gpu/drm/amd/display/Kconfig | 6 ++++++
|
|
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
|
|
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +-
|
|
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 6 +++---
|
|
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +++---
|
|
5 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
|
|
index 901d1961b73927..05c49141f5802f 100644
|
|
--- a/drivers/gpu/drm/amd/display/Kconfig
|
|
+++ b/drivers/gpu/drm/amd/display/Kconfig
|
|
@@ -51,4 +51,10 @@ config DRM_AMD_SECURE_DISPLAY
|
|
This option enables the calculation of crc of specific region via
|
|
debugfs. Cooperate with specific DMCU FW.
|
|
|
|
+config AMD_PRIVATE_COLOR
|
|
+ bool "Enable KMS color management by AMD for AMD"
|
|
+ default n
|
|
+ help
|
|
+ This option extends the KMS color management API with AMD driver-specific properties to enhance the color management support on AMD Steam Deck.
|
|
+
|
|
endmenu
|
|
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
index 59d2eee72a3297..0a4e75de95c257 100644
|
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
@@ -4078,7 +4078,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
|
|
return r;
|
|
}
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
if (amdgpu_dm_create_color_properties(adev))
|
|
return -ENOMEM;
|
|
#endif
|
|
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
|
|
index c87b64e464ed5c..6fe07243adc3d5 100644
|
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
|
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
|
|
@@ -97,7 +97,7 @@ static inline struct fixed31_32 amdgpu_dm_fixpt_from_s3132(__u64 x)
|
|
return val;
|
|
}
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
/* Pre-defined Transfer Functions (TF)
|
|
*
|
|
* AMD driver supports pre-defined mathematical functions for transferring
|
|
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
|
|
index 6e715ef3a5566e..11c7199ec3b348 100644
|
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
|
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
|
|
@@ -290,7 +290,7 @@ static int amdgpu_dm_crtc_late_register(struct drm_crtc *crtc)
|
|
}
|
|
#endif
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
/**
|
|
* dm_crtc_additional_color_mgmt - enable additional color properties
|
|
* @crtc: DRM CRTC
|
|
@@ -372,7 +372,7 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
|
|
#if defined(CONFIG_DEBUG_FS)
|
|
.late_register = amdgpu_dm_crtc_late_register,
|
|
#endif
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
.atomic_set_property = amdgpu_dm_atomic_crtc_set_property,
|
|
.atomic_get_property = amdgpu_dm_atomic_crtc_get_property,
|
|
#endif
|
|
@@ -551,7 +551,7 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
|
|
|
|
drm_mode_crtc_set_gamma_size(&acrtc->base, MAX_COLOR_LEGACY_LUT_ENTRIES);
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
dm_crtc_additional_color_mgmt(&acrtc->base);
|
|
#endif
|
|
return 0;
|
|
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
|
|
index 8a4c40b4c27e4f..779880c6457553 100644
|
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
|
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
|
|
@@ -1468,7 +1468,7 @@ static void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane,
|
|
drm_atomic_helper_plane_destroy_state(plane, state);
|
|
}
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
static void
|
|
dm_atomic_plane_attach_color_mgmt_properties(struct amdgpu_display_manager *dm,
|
|
struct drm_plane *plane)
|
|
@@ -1659,7 +1659,7 @@ static const struct drm_plane_funcs dm_plane_funcs = {
|
|
.atomic_duplicate_state = amdgpu_dm_plane_drm_plane_duplicate_state,
|
|
.atomic_destroy_state = amdgpu_dm_plane_drm_plane_destroy_state,
|
|
.format_mod_supported = amdgpu_dm_plane_format_mod_supported,
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
.atomic_set_property = dm_atomic_plane_set_property,
|
|
.atomic_get_property = dm_atomic_plane_get_property,
|
|
#endif
|
|
@@ -1742,7 +1742,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
|
|
|
|
drm_plane_helper_add(plane, &dm_plane_helper_funcs);
|
|
|
|
-#ifdef AMD_PRIVATE_COLOR
|
|
+#ifdef CONFIG_AMD_PRIVATE_COLOR
|
|
dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
|
|
#endif
|
|
/* Create (reset) the plane state */
|