On Thu Aug 27 15:33:09 2026 +0300, Antti Laakso wrote:
> Later we need to abstract ipu7 firmware abi structs same way
> we have it now for ipu6. Renaming union per ipu helps to make
> the split more clear.
>
> Signed-off-by: Antti Laakso <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 4 ++--
drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 4 ++--
drivers/media/pci/intel/ipu6/ipu6-isys.c | 4 ++--
drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
index fabaed63df0c..529973860e9e 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
@@ -316,7 +316,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video
*av,
if (!msg)
return -ENOMEM;
- buf = &msg->fw_msg.frame;
+ buf = &msg->ipu6.frame;
ipu6_isys_buf_to_fw_frame_buf(buf, stream, bl);
ipu6_fw_isys_dump_frame_buff_set(dev, buf,
stream->nr_output_pins);
@@ -396,7 +396,7 @@ static void buf_queue(struct vb2_buffer *vb)
goto out;
}
- buf = &msg->fw_msg.frame;
+ buf = &msg->ipu6.frame;
ipu6_isys_buf_to_fw_frame_buf(buf, stream, &bl);
ipu6_fw_isys_dump_frame_buff_set(dev, buf, stream->nr_output_pins);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index 89eb265737d7..c925386a1e98 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -533,7 +533,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av,
if (!msg)
return -ENOMEM;
- stream_cfg = &msg->fw_msg.stream;
+ stream_cfg = &msg->ipu6.stream;
stream_cfg->src = stream->stream_source;
stream_cfg->vc = stream->vc;
stream_cfg->isl_use = 0;
@@ -590,7 +590,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av,
ret = -ENOMEM;
goto out_put_stream_opened;
}
- buf = &msg->fw_msg.frame;
+ buf = &msg->ipu6.frame;
ipu6_isys_buf_to_fw_frame_buf(buf, stream, bl);
ipu6_isys_buffer_list_queue(bl,
IPU6_ISYS_BUFFER_LIST_FL_ACTIVE, 0);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 8af891081bd3..8f2d361b89f6 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -1003,7 +1003,7 @@ struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct
ipu6_isys_stream *stream)
msg = list_last_entry(&isys->framebuflist, struct isys_fw_msgs, head);
list_move(&msg->head, &isys->framebuflist_fw);
spin_unlock_irqrestore(&isys->listlock, flags);
- memset(&msg->fw_msg, 0, sizeof(msg->fw_msg));
+ memset(&msg->ipu6, 0, sizeof(msg->ipu6));
return msg;
}
@@ -1029,7 +1029,7 @@ void ipu6_put_fw_msg_buf(struct ipu6_isys *isys,
uintptr_t data)
return;
spin_lock_irqsave(&isys->listlock, flags);
- msg = container_of(ptr, struct isys_fw_msgs, fw_msg.dummy);
+ msg = container_of(ptr, struct isys_fw_msgs, ipu6.dummy);
list_move(&msg->head, &isys->framebuflist);
spin_unlock_irqrestore(&isys->listlock, flags);
}
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h
b/drivers/media/pci/intel/ipu6/ipu6-isys.h
index 0b139ab24431..abcd5e1cbc2c 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h
@@ -169,7 +169,7 @@ struct isys_fw_msgs {
u64 dummy;
struct ipu6_fw_isys_frame_buff_set_abi frame;
struct ipu6_fw_isys_stream_cfg_data_abi stream;
- } fw_msg;
+ } ipu6;
struct list_head head;
dma_addr_t dma_addr;
};
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
