Skip to content

Commit 79f9efa

Browse files
committed
Merge tag 'drm-misc-fixes-2025-02-13' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Some locking fixes for the HDMI infrastructure tests, an unitialized mutex fix for host1x, an unitialized variable fix for panthor, and a config selection fix for hibmc. Signed-off-by: Dave Airlie <[email protected]> From: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20250213-brilliant-terrier-from-hell-d06dd5@houat
2 parents a64dcfb + e00a2e5 commit 79f9efa

File tree

7 files changed

+110
-100
lines changed

7 files changed

+110
-100
lines changed

drivers/gpu/drm/display/drm_dp_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2544,7 +2544,7 @@ u8 drm_dp_dsc_sink_bpp_incr(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE])
25442544
{
25452545
u8 bpp_increment_dpcd = dsc_dpcd[DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT];
25462546

2547-
switch (bpp_increment_dpcd) {
2547+
switch (bpp_increment_dpcd & DP_DSC_BITS_PER_PIXEL_MASK) {
25482548
case DP_DSC_BITS_PER_PIXEL_1_16:
25492549
return 16;
25502550
case DP_DSC_BITS_PER_PIXEL_1_8:

drivers/gpu/drm/hisilicon/hibmc/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ config DRM_HISI_HIBMC
44
depends on DRM && PCI
55
depends on MMU
66
select DRM_CLIENT_SELECTION
7+
select DRM_DISPLAY_HELPER
8+
select DRM_DISPLAY_DP_HELPER
79
select DRM_KMS_HELPER
810
select DRM_VRAM_HELPER
911
select DRM_TTM

drivers/gpu/drm/panthor/panthor_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,7 @@ static void panthor_query_group_priorities_info(struct drm_file *file,
802802
{
803803
int prio;
804804

805+
memset(arg, 0, sizeof(*arg));
805806
for (prio = PANTHOR_GROUP_PRIORITY_REALTIME; prio >= 0; prio--) {
806807
if (!group_priority_permit(file, prio))
807808
arg->allowed_mask |= BIT(prio);

0 commit comments

Comments
 (0)