| Message ID | 20230605102903.924283-3-hpa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove #ifdef ISP2401 and unifying sh_css_sp_group structure | expand |
Hi, On Mon, Jun 5, 2023 at 7:11 PM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > On Mon, Jun 05, 2023 at 06:29:02PM +0800, Kate Hsuan wrote: > > Pick up the necessary part of sp_group configuration for both model and > > then copy those parts into a tempetory buffer. This buffer is finally > > written to the ISP with correct length. > > > > Signed-off-by: Kate Hsuan <hpa@redhat.com> > > --- > > .../staging/media/atomisp/pci/sh_css_params.c | 37 ++++++++++++++++++- > > 1 file changed, 35 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c > > index 588f2adab058..2913d9d6d226 100644 > > --- a/drivers/staging/media/atomisp/pci/sh_css_params.c > > +++ b/drivers/staging/media/atomisp/pci/sh_css_params.c > > @@ -3720,10 +3720,43 @@ struct ia_css_shading_table *ia_css_get_shading_table(struct ia_css_stream > > > > ia_css_ptr sh_css_store_sp_group_to_ddr(void) > > { > > + u8 *write_buf; > > + u8 *buf_ptr; > > + > > IA_CSS_ENTER_LEAVE_PRIVATE("void"); > > + > > + write_buf = kzalloc(sizeof(u8) * 8192, GFP_KERNEL); > > Please add a check for allocation failure. > > regards, > dan carpenter Thank you for reviewing this. I will fix it in the v2 patch. > > > > + > > + buf_ptr = write_buf; > > + if (IS_ISP2401) { > > + memcpy(buf_ptr, &sh_css_sp_group.config, sizeof(u8) * 5); > > + buf_ptr += (sizeof(u8) * 5); > > + memset(buf_ptr, 0, 3); > > + buf_ptr += 3; /* Padding 3 bytes for struct sh_css_sp_config*/ > > + } else { > > + memcpy(buf_ptr, &sh_css_sp_group.config, sizeof(sh_css_sp_group.config)); > > + buf_ptr += sizeof(sh_css_sp_group.config); > > + } >
diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c index 588f2adab058..2913d9d6d226 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_params.c +++ b/drivers/staging/media/atomisp/pci/sh_css_params.c @@ -3720,10 +3720,43 @@ struct ia_css_shading_table *ia_css_get_shading_table(struct ia_css_stream ia_css_ptr sh_css_store_sp_group_to_ddr(void) { + u8 *write_buf; + u8 *buf_ptr; + IA_CSS_ENTER_LEAVE_PRIVATE("void"); + + write_buf = kzalloc(sizeof(u8) * 8192, GFP_KERNEL); + + buf_ptr = write_buf; + if (IS_ISP2401) { + memcpy(buf_ptr, &sh_css_sp_group.config, sizeof(u8) * 5); + buf_ptr += (sizeof(u8) * 5); + memset(buf_ptr, 0, 3); + buf_ptr += 3; /* Padding 3 bytes for struct sh_css_sp_config*/ + } else { + memcpy(buf_ptr, &sh_css_sp_group.config, sizeof(sh_css_sp_group.config)); + buf_ptr += sizeof(sh_css_sp_group.config); + } + + memcpy(buf_ptr, &sh_css_sp_group.pipe, sizeof(sh_css_sp_group.pipe)); + buf_ptr += sizeof(sh_css_sp_group.pipe); + + if (IS_ISP2401) { + memcpy(buf_ptr, &sh_css_sp_group.pipe_io, sizeof(sh_css_sp_group.pipe_io)); + buf_ptr += sizeof(sh_css_sp_group.pipe_io); + memcpy(buf_ptr, &sh_css_sp_group.pipe_io_status, + sizeof(sh_css_sp_group.pipe_io_status)); + buf_ptr += sizeof(sh_css_sp_group.pipe_io_status); + } + + memcpy(buf_ptr, &sh_css_sp_group.debug, sizeof(sh_css_sp_group.debug)); + buf_ptr += sizeof(sh_css_sp_group.debug); + hmm_store(xmem_sp_group_ptrs, - &sh_css_sp_group, - sizeof(struct sh_css_sp_group)); + write_buf, + buf_ptr - write_buf); + + kfree(write_buf); return xmem_sp_group_ptrs; }
Pick up the necessary part of sp_group configuration for both model and then copy those parts into a tempetory buffer. This buffer is finally written to the ISP with correct length. Signed-off-by: Kate Hsuan <hpa@redhat.com> --- .../staging/media/atomisp/pci/sh_css_params.c | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-)