Commit a163b895 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2024-11-15' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZzcsMT_FEqBE0cAW@fedora
parents ade5add0 6d9f9115

drivers/gpu/drm/xe/xe_guc_capture.c

+1 −4
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ read_reg_to_node(struct xe_hw_engine *hwe, const struct __guc_mmio_reg_descr_gro 
{

	int i;



	if (!list || list->num_regs == 0)

	if (!list || !list->list || list->num_regs == 0)

		return;



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

		u32 value;



		if (!list->list)

			return;



		if (list->type == GUC_STATE_CAPTURE_TYPE_ENGINE_INSTANCE) {

			value = xe_hw_engine_mmio_read32(hwe, desc.reg);

		} else {