openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-05-01 09:37:02 +00:00
Code Issues Projects Releases Wiki Activity

drm/i915/dmc: Fix an unlikely NULL pointer deference at probe

Browse Source 
From Imre Deak
0b35d11fbbcfd1079c8489282a341944228835e3 in linux-6.18.y/6.18.20
ac57eb3b7d2ad649025b5a0fa207315f755ac4f6 in mainline linux
This commit is contained in:
jsg
2026-03-25 23:44:32 +00:00
parent d4530f2f4c
commit 5aafb9241b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/pci/drm/i915/display/intel_display_power_well.c
View File

@@ -796,7 +796,7 @@ void gen9_set_dc_state(struct intel_display *display, u32 state)
power_domains->dc_state, val & mask);
enable_dc6 = state & DC_STATE_EN_UPTO_DC6;
dc6_was_enabled = val & DC_STATE_EN_UPTO_DC6;
dc6_was_enabled = power_domains->dc_state & DC_STATE_EN_UPTO_DC6;
if (!dc6_was_enabled && enable_dc6)
intel_dmc_update_dc6_allowed_count(display, true);

3
sys/dev/pci/drm/i915/display/intel_dmc.c
View File

@@ -1571,8 +1571,7 @@ static bool intel_dmc_get_dc6_allowed_count(struct intel_display *display, u32 *
return false;
mutex_lock(&power_domains->lock);
dc6_enabled = intel_de_read(display, DC_STATE_EN) &
DC_STATE_EN_UPTO_DC6;
dc6_enabled = power_domains->dc_state & DC_STATE_EN_UPTO_DC6;
if (dc6_enabled)
intel_dmc_update_dc6_allowed_count(display, false);