Skip to content

Commit a163b89

Browse files
committed
Merge tag 'drm-xe-next-fixes-2024-11-15' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
Driver Changes: - Fix a NULL pointer deref (Everest K.C.) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/ZzcsMT_FEqBE0cAW@fedora
2 parents ade5add + 6d9f911 commit a163b89

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/gpu/drm/xe/xe_guc_capture.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ read_reg_to_node(struct xe_hw_engine *hwe, const struct __guc_mmio_reg_descr_gro
15311531
{
15321532
int i;
15331533

1534-
if (!list || list->num_regs == 0)
1534+
if (!list || !list->list || list->num_regs == 0)
15351535
return;
15361536

15371537
if (!regs)
@@ -1541,9 +1541,6 @@ read_reg_to_node(struct xe_hw_engine *hwe, const struct __guc_mmio_reg_descr_gro
15411541
struct __guc_mmio_reg_descr desc = list->list[i];
15421542
u32 value;
15431543

1544-
if (!list->list)
1545-
return;
1546-
15471544
if (list->type == GUC_STATE_CAPTURE_TYPE_ENGINE_INSTANCE) {
15481545
value = xe_hw_engine_mmio_read32(hwe, desc.reg);
15491546
} else {

0 commit comments

Comments
 (0)