media: atomisp: Various hmm and other cleanups
Subsystems (4)
v2 cover media: atomisp: Various hmm and other cleanups
Hi All,
Here is v2 of my atomisp hmm (and other) cleanups series. As mentioned in the coverletter of v1, this is part of slowly working towards porting the code to videobuf2 to add/fix mmap support.
v2 addresses a few small remarks from Andy and adds Andy's Reviewed-by to all the patches, thank you Andy!
Regards,
Hans
Hans de Goede (40):
media: atomisp: remove the unused RAW_BUF_STRIDE macro
media: atomisp: remove unused ia_css_frame_allocate_contiguous*()
functions
media: atomisp: drop contiguous argument from
ia_css_frame_allocate_with_buffer_size()
media: atomisp: drop contiguous argument from
frame_allocate_with_data()
media: atomisp: drop contiguous argument from frame_create()
media: atomisp: drop IA_CSS_FRAME_FORMAT_MIPI support from
ia_css_frame_init_planes()
media: atomisp: drop contiguous flag from struct ia_css_frame
media: atomisp: drop ATOMISP_MAP_FLAG_CONTIGUOUS
media: atomisp: remove hmm_pool_[un]register()
media: atomisp: remove dynamic and reserved pool code
media: atomisp: remove hmm pool code
media: atomisp: remove hmm_mem_stats
media: atomisp: remove pool related kernel cmdline options
media: atomisp: remove unused attribute argument from
ia_css_frame_map()
media: atomisp: drop hmm_page_type
media: atomisp: removed unused hmm_bo_get_page_info() function
media: atomisp: remove bogus comment above hmm_bo_allocated()
prototype
media: atomisp: remove private acceleration ioctls
media: atomisp: remove atomisp_acc.c
media: atomisp: remove unused atomisp_*css_* functions
media: atomisp: asc.acc.pipeline is always NULL
media: atomisp: remove no longer used atomisp_css_acc_done() function
media: atomisp: remove atomisp_is_acc_enabled()
media: atomisp: drop unused ATOMISP_ACC_FW_LOAD_* defines
media: atomisp: drop ATOMISP_MAP_FLAG_CLEARED
media: atomisp: drop unused ATOMISP_MAP_FLAG_* flags
media: atomisp: remove unused hmm address translation functions
media: atomisp: add hmm_create_from_userdata() helper
media: atomisp: Simplify hmm_alloc() calls
media: atomisp: drop highmem var/arg from the hmm code
media: atomisp: drop HMM_BO_SHARE type
media: atomisp: remove hmm_page_object
media: atomisp: fix __get_frame_info() error handling
media: atomisp: add error checking to atomisp_create_pipes_stream()
media: atomisp: add error logging to
atomisp_destroy_pipes_stream_force()
media: atomisp: use atomisp_create_pipes_stream() in more places
media: atomisp: use atomisp_css_update_stream() in more places
media: atomisp: use atomisp_destroy_pipes_stream_force() in more
places
media: atomisp: remove force argument from
__destroy_[stream[s]|pipe[s]]()media: atomisp: Add a notes.txt file
drivers/staging/media/atomisp/Makefile | 3 - .../staging/media/atomisp/include/hmm/hmm.h | 32 +- .../media/atomisp/include/hmm/hmm_bo.h | 37 +- .../media/atomisp/include/hmm/hmm_common.h | 26 - .../media/atomisp/include/hmm/hmm_pool.h | 116 ---- .../media/atomisp/include/linux/atomisp.h | 146 ---- drivers/staging/media/atomisp/notes.txt | 30 + .../staging/media/atomisp/pci/atomisp_acc.c | 625 ------------------ .../staging/media/atomisp/pci/atomisp_acc.h | 120 ---- .../staging/media/atomisp/pci/atomisp_cmd.c | 33 +- .../media/atomisp/pci/atomisp_compat.h | 29 +- .../media/atomisp/pci/atomisp_compat_css20.c | 365 ++-------- .../atomisp/pci/atomisp_compat_ioctl32.h | 58 -- .../staging/media/atomisp/pci/atomisp_drvfs.c | 7 +- .../staging/media/atomisp/pci/atomisp_fops.c | 13 - .../staging/media/atomisp/pci/atomisp_ioctl.c | 73 +- .../staging/media/atomisp/pci/atomisp_ioctl.h | 1 - .../media/atomisp/pci/atomisp_subdev.c | 3 - .../media/atomisp/pci/atomisp_subdev.h | 10 - .../staging/media/atomisp/pci/atomisp_v4l2.c | 32 - drivers/staging/media/atomisp/pci/hmm/hmm.c | 186 +----- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 261 ++------ .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 234 ------- .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 253 ------- .../media/atomisp/pci/ia_css_frame_public.h | 40 -- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../pci/isp/modes/interface/isp_const.h | 6 - .../pci/runtime/debug/src/ia_css_debug.c | 2 - .../runtime/frame/interface/ia_css_frame.h | 7 +- .../atomisp/pci/runtime/frame/src/frame.c | 105 +-- .../pci/runtime/isp_param/src/isp_param.c | 2 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 3 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 2 +- drivers/staging/media/atomisp/pci/sh_css.c | 5 - .../media/atomisp/pci/sh_css_firmware.c | 2 +- .../staging/media/atomisp/pci/sh_css_mipi.c | 3 +- .../staging/media/atomisp/pci/sh_css_params.c | 47 +- 38 files changed, 205 insertions(+), 2716 deletions(-) delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_pool.h create mode 100644 drivers/staging/media/atomisp/notes.txt delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.h delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
Signature · 1 line
2.36.0
PATCH v2 1/40 media: atomisp: remove the unused RAW_BUF_STRIDE macro
I noticed that the RAW_BUF_STRIDE macro is using the removed SH_CSS_BINARY_ID_POST_ISP define, which should be a problem except that the RAW_BUF_STRIDE macro itself is not used at all, remove it.
--- .../media/atomisp/pci/isp/modes/interface/isp_const.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h +0 -6
@@ -145,12 +145,6 @@ more details.#define RAW_BUF_LINES ((ENABLE_RAW_BINNING || ENABLE_FIXED_BAYER_DS) ? 4 : 2) -#define RAW_BUF_STRIDE \ - (BINARY_ID == SH_CSS_BINARY_ID_POST_ISP ? MAX_VECTORS_PER_INPUT_CHUNK : \ - ISP_NUM_STRIPES > 1 ? MAX_VECTORS_PER_INPUT_STRIPE + _ISP_EXTRA_PADDING_VECS : \ - !ENABLE_CONTINUOUS ? MAX_VECTORS_PER_INPUT_LINE : \ - MAX_VECTORS_PER_INPUT_CHUNK) -/* [isp vmem] table size[vectors] per line per color (GR,R,B,GB), multiples of NWAY */ #define ISP2400_SCTBL_VECTORS_PER_LINE_PER_COLOR \
Signature · 1 line
2.36.0
PATCH v2 2/40 media: atomisp: remove unused ia_css_frame_allocate_contiguous*() functions
In reply to Hans de Goedeia_css_frame_allocate_contiguous() and ia_css_frame_allocate_contiguous_from_info() are not used anywhere, remove them.
--- .../media/atomisp/pci/ia_css_frame_public.h | 38 ---------------- .../atomisp/pci/runtime/frame/src/frame.c | 43 ------------------- 2 files changed, 81 deletions(-)
drivers/staging/media/atomisp/pci/ia_css_frame_public.h +0 -38
@@ -245,44 +245,6 @@ ia_css_frame_allocate_from_info(struct ia_css_frame **frame,void ia_css_frame_free (struct ia_css_frame *frame); -/* @brief Allocate a contiguous CSS frame structure -* -* @param frame The allocated frame. -* @param width The width (in pixels) of the frame. -* @param height The height (in lines) of the frame. -* @param format The frame format. -* @param stride The padded stride, in pixels. -* @param raw_bit_depth The raw bit depth, in bits. -* @return The error code. -* -* Contiguous frame allocation, only for FPGA display driver which needs -* physically contiguous memory. -* Deprecated. -*/ -int -ia_css_frame_allocate_contiguous (struct ia_css_frame **frame, -unsigned int width, -unsigned int height, -enum ia_css_frame_format format, -unsigned int stride, -unsigned int raw_bit_depth); - -/* @brief Allocate a contiguous CSS frame from a frame info structure. -* -* @param frame The allocated frame. -* @param[in] info The frame info structure. -* @return The error code. -* -* Allocate a frame using the resolution and format from a frame info struct. -* This is a convenience function, implemented on top of -* ia_css_frame_allocate_contiguous(). -* Only for FPGA display driver which needs physically contiguous memory. -* Deprecated. -*/ -int -ia_css_frame_allocate_contiguous_from_info (struct ia_css_frame **frame, -const struct ia_css_frame_info *info); -/* @brief Allocate a CSS frame structure using a frame info structure. * * @param frame The allocated frame.
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +0 -43
49 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 3/40 media: atomisp: drop contiguous argument from ia_css_frame_allocate_with_buffer_size()
In reply to Hans de GoedeDrop the contiguous argument from ia_css_frame_allocate_with_buffer_size() its only caller always passes false.
--- .../atomisp/pci/runtime/frame/interface/ia_css_frame.h | 7 ++----- .../staging/media/atomisp/pci/runtime/frame/src/frame.c | 8 +++----- drivers/staging/media/atomisp/pci/sh_css_mipi.c | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-)
drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h +2 -5
@@ -109,16 +109,13 @@ void ia_css_frame_free_multiple(unsigned int num_frames,* * @param frame The allocated frame. * @param[in] size_bytes The frame size in bytes. -* @param[in] contiguous Allocate memory physically contiguously or not. * @return The error code. * * Allocate a frame using the given size in bytes. * The frame structure is partially null initialized. */ -int ia_css_frame_allocate_with_buffer_size ( -struct ia_css_frame **frame, -const unsigned int size_bytes, -const bool contiguous); +int ia_css_frame_allocate_with_buffer_size (struct ia_css_frame **frame, +const unsigned int size_bytes);/* @brief Check whether 2 frames are same type *
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +3 -5
@@ -486,16 +486,14 @@ void ia_css_frame_free_multiple(unsigned int num_frames, } } -int ia_css_frame_allocate_with_buffer_size ( -struct ia_css_frame **frame, -const unsigned int buffer_size_bytes, -const bool contiguous) +int ia_css_frame_allocate_with_buffer_size (struct ia_css_frame **frame, +const unsigned int buffer_size_bytes) {/* AM: Body coppied from frame_allocate_with_data(). */ int err;struct ia_css_frame *me =frame_create (0 ,0 ,IA_CSS_FRAME_FORMAT_NUM ,/* Not valid format yet */ -0 ,0 , contiguous, false); +0 ,0 , false, false);if (!me)return -ENOMEM ;
drivers/staging/media/atomisp/pci/sh_css_mipi.c +1 -2
@@ -431,8 +431,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,/* allocate new frame */ err =ia_css_frame_allocate_with_buffer_size ( &my_css.mipi_frames[port][i], - my_css.mipi_frame_size[port] *HIVE_ISP_DDR_WORD_BYTES , - false); + my_css.mipi_frame_size[port] *HIVE_ISP_DDR_WORD_BYTES );if (err) {for (j =0 ; j < i; j++) {if (my_css.mipi_frames[port][j]) {
Signature · 1 line
2.36.0
PATCH v2 4/40 media: atomisp: drop contiguous argument from frame_allocate_with_data()
In reply to Hans de GoedeDrop the contiguous argument from frame_allocate_with_data() its only caller always passes false.
--- .../media/atomisp/pci/runtime/frame/src/frame.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +4 -6
@@ -77,8 +77,7 @@ static int frame_allocate_with_data(struct ia_css_frame **frame,unsigned int height, enum ia_css_frame_format format, unsigned int padded_width, - unsigned int raw_bit_depth, - bool contiguous); + unsigned int raw_bit_depth); static struct ia_css_frame *frame_create(unsigned int width, unsigned int height,
@@ -137,7 +136,7 @@ int ia_css_frame_allocate(struct ia_css_frame **frame, width, height, format, padded_width, raw_bit_depth); err =frame_allocate_with_data (frame, width, height, format, - padded_width, raw_bit_depth, false); + padded_width, raw_bit_depth);if ((*frame) && err ==0 ) ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
@@ -773,8 +772,7 @@ static int frame_allocate_with_data(struct ia_css_frame **frame,unsigned int height, enum ia_css_frame_format format, unsigned int padded_width, - unsigned int raw_bit_depth, - bool contiguous) + unsigned int raw_bit_depth) { int err; struct ia_css_frame *me = frame_create(width,
@@ -782,7 +780,7 @@ static int frame_allocate_with_data(struct ia_css_frame **frame, format, padded_width, raw_bit_depth, - contiguous, + false, true);if (!me)
Signature · 1 line
2.36.0
PATCH v2 5/40 media: atomisp: drop contiguous argument from frame_create()
In reply to Hans de GoedeDrop the contiguous argument from frame_create()
all callers always passes false.
--- .../staging/media/atomisp/pci/runtime/frame/src/frame.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +2 -6
@@ -84,7 +84,6 @@ static struct ia_css_frame *frame_create(unsigned int width,enum ia_css_frame_format format, unsigned int padded_width, unsigned int raw_bit_depth, - bool contiguous, bool valid); static unsigned
@@ -215,7 +214,6 @@ int ia_css_frame_create_from_info(struct ia_css_frame **frame, info->format, info->padded_width, info->raw_bit_depth, - false, false);if (!me) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
@@ -492,7 +490,7 @@ int ia_css_frame_allocate_with_buffer_size(struct ia_css_frame **frame,int err;struct ia_css_frame *me =frame_create (0 ,0 ,IA_CSS_FRAME_FORMAT_NUM ,/* Not valid format yet */ -0 ,0 , false, false); +0 ,0 , false);if (!me)return -ENOMEM ;
@@ -780,7 +778,6 @@ static int frame_allocate_with_data(struct ia_css_frame **frame, format, padded_width, raw_bit_depth, - false, true);if (!me)
@@ -810,7 +807,6 @@ static struct ia_css_frame *frame_create(unsigned int width,enum ia_css_frame_format format, unsigned int padded_width, unsigned int raw_bit_depth, - bool contiguous, bool valid) { struct ia_css_frame *me = kvmalloc(sizeof(*me), GFP_KERNEL);
@@ -824,7 +820,7 @@ static struct ia_css_frame *frame_create(unsigned int width, me->info.format = format; me->info.padded_width = padded_width; me->info.raw_bit_depth = raw_bit_depth; - me->contiguous = contiguous; + me->contiguous = false; me->valid = valid; me->data_bytes =0 ; me->data = mmgr_NULL;
Signature · 1 line
2.36.0
PATCH v2 6/40 media: atomisp: drop IA_CSS_FRAME_FORMAT_MIPI support from ia_css_frame_init_planes()
In reply to Hans de GoedeNothing ever sets the format to IA_CSS_FRAME_FORMAT_MIPI and frame_init_mipi_plane() is the only code-path which ever sets frame->contiguous to true.
Drop A_CSS_FRAME_FORMAT_MIPI support from ia_css_frame_init_planes() as part of the removal of contiguous alloc support from the frame code.
--- .../atomisp/pci/runtime/frame/src/frame.c | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-)
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +3 -27
@@ -48,12 +48,6 @@ static void frame_init_raw_single_plane(unsigned int subpixels_per_line, unsigned int bits_per_pixel); -static void frame_init_mipi_plane (struct ia_css_frame *frame, -struct ia_css_frame_plane *plane, -unsigned int height, -unsigned int subpixels_per_line, -unsigned int bytes_per_pixel); - static void frame_init_nv_planes(struct ia_css_frame *frame, unsigned int horizontal_decimation, unsigned int vertical_decimation,
@@ -297,11 +291,9 @@ int ia_css_frame_init_planes(struct ia_css_frame *frame)switch (frame->info.format) {case IA_CSS_FRAME_FORMAT_MIPI : -frame_init_mipi_plane (frame, &frame->planes.raw, - frame->info.res.height, - frame->info.padded_width, - frame->info.raw_bit_depth <=8 ?1 :2 ); -break ; +dev_err (atomisp_dev, +"%s: unexpected use of IA_CSS_FRAME_FORMAT_MIPI\n" , __func__); +return -EINVAL ;case IA_CSS_FRAME_FORMAT_RAW_PACKED : frame_init_raw_single_plane(frame, &frame->planes.raw, frame->info.res.height,
@@ -622,22 +614,6 @@ static void frame_init_raw_single_plane(return ; } -static void frame_init_mipi_plane (struct ia_css_frame *frame, -struct ia_css_frame_plane *plane, -unsigned int height, -unsigned int subpixels_per_line, -unsigned int bytes_per_pixel) -{ -unsigned int stride; - - stride = subpixels_per_line * bytes_per_pixel; - frame->data_bytes =8388608 ;/* 8*1024*1024 */ - frame->valid = false; - frame->contiguous = true; -frame_init_plane (plane, subpixels_per_line, stride, height,0 ); -return ; -} - static void frame_init_nv_planes(struct ia_css_frame *frame, unsigned int horizontal_decimation, unsigned int vertical_decimation,
Signature · 1 line
2.36.0
PATCH v2 7/40 media: atomisp: drop contiguous flag from struct ia_css_frame
In reply to Hans de GoedeDrop the contiguous flag from struct ia_css_frame, it is always false / not used.
--- drivers/staging/media/atomisp/pci/ia_css_frame_public.h | 1 - .../media/atomisp/pci/runtime/debug/src/ia_css_debug.c | 2 -- drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c | 6 +----- drivers/staging/media/atomisp/pci/sh_css.c | 5 ----- 4 files changed, 1 insertion(+), 13 deletions(-)
drivers/staging/media/atomisp/pci/ia_css_frame_public.h +0 -1
@@ -169,7 +169,6 @@ struct ia_css_frame {/** exposure id, see ia_css_event_public.h for more detail */ u32 isp_config_id;/** Unique ID to track which config was actually applied to a particular frame */ bool valid;/** First video output frame is not valid */ -bool contiguous;/** memory is allocated physically contiguously */ union {unsigned int _initialisation_dummy;struct ia_css_frame_plane raw;
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +0 -2
@@ -1305,8 +1305,6 @@ void ia_css_debug_frame_print(const struct ia_css_frame *frame,ia_css_debug_dtrace (2 ," padded width = %d\n" , frame->info.padded_width);ia_css_debug_dtrace (2 ," format = %d\n" , frame->info.format); -ia_css_debug_dtrace (2 ," is contiguous = %s\n" , - frame->contiguous ?"yes" :"no" );switch (frame->info.format) {case IA_CSS_FRAME_FORMAT_NV12 :case IA_CSS_FRAME_FORMAT_NV16 :
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +1 -5
@@ -732,10 +732,7 @@ static int frame_allocate_buffer_data(struct ia_css_frame *frame)IA_CSS_ENTER_LEAVE_PRIVATE ("frame->data_bytes=%d\n" , frame->data_bytes);#endif frame->data =hmm_alloc (frame->data_bytes, -HMM_BO_PRIVATE ,0 ,NULL , - frame->contiguous ? -ATOMISP_MAP_FLAG_CONTIGUOUS :0 ); - +HMM_BO_PRIVATE ,0 ,NULL ,0 );if (frame->data == mmgr_NULL)return -ENOMEM ;return 0 ;
@@ -796,7 +793,6 @@ static struct ia_css_frame *frame_create(unsigned int width, me->info.format = format; me->info.padded_width = padded_width; me->info.raw_bit_depth = raw_bit_depth; - me->contiguous = false; me->valid = valid; me->data_bytes =0 ; me->data = mmgr_NULL;
drivers/staging/media/atomisp/pci/sh_css.c +0 -5
@@ -3075,7 +3075,6 @@ init_vf_frameinfo_defaults(struct ia_css_pipe *pipe,assert (vf_frame);sh_css_pipe_get_viewfinder_frame_info (pipe, &vf_frame->info, idx); - vf_frame->contiguous = false; vf_frame->flash_state =IA_CSS_FRAME_FLASH_STATE_NONE ;ia_css_pipeline_get_sp_thread_id (ia_css_pipe_get_pipe_num (pipe), &thread_id);ia_css_query_internal_queue_id (IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME + idx, thread_id, &queue_id);
@@ -3257,7 +3256,6 @@ init_in_frameinfo_memory_defaults(struct ia_css_pipe *pipe, in_frame->info.raw_bit_depth =ia_css_pipe_util_pipe_input_format_bpp (pipe);ia_css_frame_info_set_width (&in_frame->info, pipe->stream->config.input_config.input_res.width,0 ); - in_frame->contiguous = false; in_frame->flash_state =IA_CSS_FRAME_FLASH_STATE_NONE ;ia_css_pipeline_get_sp_thread_id (ia_css_pipe_get_pipe_num (pipe), &thread_id);ia_css_query_internal_queue_id (IA_CSS_BUFFER_TYPE_INPUT_FRAME , thread_id, &queue_id);
@@ -3285,7 +3283,6 @@ init_out_frameinfo_defaults(struct ia_css_pipe *pipe,assert (out_frame);sh_css_pipe_get_output_frame_info (pipe, &out_frame->info, idx); - out_frame->contiguous = false; out_frame->flash_state =IA_CSS_FRAME_FLASH_STATE_NONE ;ia_css_pipeline_get_sp_thread_id (ia_css_pipe_get_pipe_num (pipe), &thread_id);ia_css_query_internal_queue_id (IA_CSS_BUFFER_TYPE_OUTPUT_FRAME + idx, thread_id, &queue_id);
@@ -7176,7 +7173,6 @@ create_host_copy_pipeline(struct ia_css_pipe *pipe,ia_css_pipeline_clean (me);/* Construct out_frame info */ - out_frame->contiguous = false; out_frame->flash_state =IA_CSS_FRAME_FLASH_STATE_NONE ; if (copy_on_sp(pipe) &&
@@ -7226,7 +7222,6 @@ create_host_isyscopy_capture_pipeline(struct ia_css_pipe *pipe) err =sh_css_pipe_get_output_frame_info (pipe, &out_frame->info,0 );if (err)return err; - out_frame->contiguous = false; out_frame->flash_state =IA_CSS_FRAME_FLASH_STATE_NONE ;ia_css_pipeline_get_sp_thread_id (ia_css_pipe_get_pipe_num (pipe), &thread_id);ia_css_query_internal_queue_id (IA_CSS_BUFFER_TYPE_OUTPUT_FRAME , thread_id, &queue_id);
Signature · 1 line
2.36.0
PATCH v2 8/40 media: atomisp: drop ATOMISP_MAP_FLAG_CONTIGUOUS
In reply to Hans de GoedeDrop the ATOMISP_MAP_FLAG_CONTIGUOUS hmm_alloc flag. After the contiguous flag removal done in previous patches in this series it is never set.
And hmm_alloc already did a WARN_ON on the flag and otherwise ignored it, proving that contiguous support was already never used.
--- drivers/staging/media/atomisp/include/linux/atomisp.h | 3 +-- drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/media/atomisp/include/linux/atomisp.h +1 -2
@@ -915,8 +915,7 @@ struct atomisp_acc_map {#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ #define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ -#define ATOMISP_MAP_FLAG_CONTIGUOUS 0x0004 -#define ATOMISP_MAP_FLAG_CLEARED 0x0008 +#define ATOMISP_MAP_FLAG_CLEARED 0x0004struct atomisp_acc_state {__u32 flags;/* Flags, see list below */
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -2
@@ -230,8 +230,6 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type,bool cached = attrs &ATOMISP_MAP_FLAG_CACHED ;int ret; -WARN_ON (attrs &ATOMISP_MAP_FLAG_CONTIGUOUS ); -/* * Check if we are initialized. In the ideal world we wouldn't need * this but we can tackle it once the driver is a lot cleaner
Signature · 1 line
2.36.0
PATCH v2 9/40 media: atomisp: remove hmm_pool_[un]register()
In reply to Hans de GoedeThese are no-ops, so lets remove them.
--- .../staging/media/atomisp/include/hmm/hmm.h | 3 -- .../staging/media/atomisp/pci/atomisp_fops.c | 9 ---- .../staging/media/atomisp/pci/atomisp_v4l2.c | 10 ----- drivers/staging/media/atomisp/pci/hmm/hmm.c | 42 ------------------- 4 files changed, 64 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +0 -3
@@ -32,9 +32,6 @@#define mmgr_NULL ((ia_css_ptr)0)#define mmgr_EXCEPTION ((ia_css_ptr) - 1) -int hmm_pool_register (unsigned int pool_size,enum hmm_pool_type pool_type); -void hmm_pool_unregister (enum hmm_pool_type pool_type); -int hmm_init (void );void hmm_cleanup (void );
drivers/staging/media/atomisp/pci/atomisp_fops.c +0 -9
@@ -865,12 +865,6 @@ static int atomisp_open(struct file *file) goto error; } -if (dypool_enable) { - ret =hmm_pool_register (dypool_pgnr,HMM_POOL_TYPE_DYNAMIC ); -if (ret) -dev_err (isp->dev,"Failed to register dynamic memory pool.\n" ); - } -/* Init ISP */ if (atomisp_css_init (isp)) { ret = -EINVAL ;
@@ -910,7 +904,6 @@ static int atomisp_open(struct file *file)atomisp_css_uninit (isp);pm_runtime_put (vdev->v4l2_dev->dev); error: -hmm_pool_unregister (HMM_POOL_TYPE_DYNAMIC );rt_mutex_unlock (&isp->mutex);return ret; }
@@ -1032,8 +1025,6 @@ static int atomisp_release(struct file *file) isp->css_env.isp_css_fw.bytes =0 ; } -hmm_pool_unregister (HMM_POOL_TYPE_DYNAMIC ); - ret =v4l2_subdev_call (isp->flash, core, s_power,0 );if (ret <0 && ret != -ENODEV && ret != -ENOIOCTLCMD )dev_warn (isp->dev,"Failed to power-off flash\n" );
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -10
@@ -1771,12 +1771,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ipm_runtime_allow (&pdev->dev);hmm_init_mem_stat (repool_pgnr, dypool_enable, dypool_pgnr); - err =hmm_pool_register (repool_pgnr,HMM_POOL_TYPE_RESERVED ); -if (err) { -dev_err (&pdev->dev,"Failed to register reserved memory pool.\n" ); - goto hmm_pool_fail; - } -/* Init ISP memory management */ hmm_init ();
@@ -1813,8 +1807,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idevm_free_irq (&pdev->dev, pdev->irq, isp); request_irq_fail:hmm_cleanup (); -hmm_pool_unregister (HMM_POOL_TYPE_RESERVED ); -hmm_pool_fail:pm_runtime_get_noresume (&pdev->dev);destroy_workqueue (isp->wdt_work_queue); wdt_work_queue_fail:
@@ -1885,8 +1877,6 @@ static void atomisp_pci_remove(struct pci_dev *pdev)atomisp_file_input_cleanup (isp);release_firmware (isp->firmware); - -hmm_pool_unregister (HMM_POOL_TYPE_RESERVED ); }static const struct pci_device_id atomisp_pci_tbl[] = {
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -42
48 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 10/40 media: atomisp: remove dynamic and reserved pool code
In reply to Hans de GoedeThere are no callers of this code atm; and looking at the atomisp memory-management code if anything we want to make it simpler and not re-introduce use of these pools, so remove the pool code.
--- drivers/staging/media/atomisp/Makefile | 2 - .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 234 ---------------- .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 253 ------------------ 3 files changed, 489 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
drivers/staging/media/atomisp/Makefile +0 -2
@@ -45,9 +45,7 @@ atomisp-objs += \ pci/camera/pipe/src/pipe_util.o \ pci/camera/util/src/util.o \ pci/hmm/hmm_bo.o \ - pci/hmm/hmm_dynamic_pool.o \ pci/hmm/hmm.o \ - pci/hmm/hmm_reserved_pool.o \ pci/ia_css_device_access.o \ pci/ia_css_isp_configs.o \ pci/ia_css_isp_states.o \
drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c deleted +0 -234
234 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c deleted +0 -253
253 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 11/40 media: atomisp: remove hmm pool code
In reply to Hans de GoedeSince we never register any pools, this is all dead code, remove it.
--- .../staging/media/atomisp/include/hmm/hmm.h | 3 +- .../media/atomisp/include/hmm/hmm_bo.h | 3 - .../media/atomisp/include/hmm/hmm_pool.h | 116 ------------------ drivers/staging/media/atomisp/pci/hmm/hmm.c | 52 -------- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 79 +----------- 5 files changed, 8 insertions(+), 245 deletions(-) delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_pool.h
drivers/staging/media/atomisp/include/hmm/hmm.h +2 -1
@@ -26,7 +26,8 @@#include <linux/slab.h> #include <linux/mm.h> -#include "hmm/hmm_pool.h" +#include "hmm_common.h" +#include "hmm/hmm_bo.h" #include "ia_css_types.h" #define mmgr_NULL ((ia_css_ptr)0)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -3
@@ -280,9 +280,6 @@ void hmm_bo_vunmap(struct hmm_buffer_object *bo);int hmm_bo_mmap (struct vm_area_struct *vma,struct hmm_buffer_object *bo); -extern struct hmm_pool dynamic_pool; -extern struct hmm_pool reserved_pool; -/* * find the buffer object by its virtual address vaddr. * return NULL if no such buffer object found.
drivers/staging/media/atomisp/include/hmm/hmm_pool.h deleted +0 -116
116 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -52
77 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +6 -73
137 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 12/40 media: atomisp: remove hmm_mem_stats
In reply to Hans de GoedeWithout pool support the (optional) debug logging done by these is not really meaningful, drop it all.
--- .../staging/media/atomisp/include/hmm/hmm.h | 8 ----- .../media/atomisp/include/hmm/hmm_common.h | 26 -------------- .../staging/media/atomisp/pci/atomisp_drvfs.c | 7 +--- .../staging/media/atomisp/pci/atomisp_v4l2.c | 1 - drivers/staging/media/atomisp/pci/hmm/hmm.c | 36 ------------------- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 6 ---- 6 files changed, 1 insertion(+), 83 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +0 -8
@@ -87,14 +87,6 @@ ia_css_ptr hmm_host_vaddr_to_hrt_vaddr(const void *ptr);*/ int hmm_mmap (struct vm_area_struct *vma,ia_css_ptr virt); -/* show memory statistic -*/ -void hmm_show_mem_stat (const char *func,const int line); - -/* init memory statistic -*/ -void hmm_init_mem_stat (int res_pgnr,int dyc_en,int dyc_pgnr); -extern bool dypool_enable;extern unsigned int dypool_pgnr;extern struct hmm_bo_device bo_device;
drivers/staging/media/atomisp/include/hmm/hmm_common.h +0 -26
@@ -68,30 +68,4 @@ #define check_null_return_void(ptr, fmt, arg ...) \ var_equal_return_void(ptr, NULL, fmt, ## arg) -/* hmm_mem_stat is used to trace the hmm mem used by ISP pipe. The unit is page -* number. -* -* res_size: reserved mem pool size, being allocated from system at system boot time. -* res_size >= res_cnt. -* sys_size: system mem pool size, being allocated from system at camera running time. -* dyc_size: dynamic mem pool size. -* dyc_thr: dynamic mem pool high watermark. -* dyc_size <= dyc_thr. -* usr_size: user ptr mem size. -* -* res_cnt: track the mem allocated from reserved pool at camera running time. -* tol_cnt: track the total mem used by ISP pipe at camera running time. -*/ -struct _hmm_mem_stat { -int res_size; -int sys_size; -int dyc_size; -int dyc_thr; -int usr_size; -int res_cnt; -int tol_cnt; -}; - -extern struct _hmm_mem_stat hmm_mem_stat; -#endif
drivers/staging/media/atomisp/pci/atomisp_drvfs.c +1 -6
@@ -45,10 +45,8 @@ struct _iunit_debug {#define OPTION_BIN_LIST BIT(0)#define OPTION_BIN_RUN BIT(1) -#define OPTION_MEM_STAT BIT(2)#define OPTION_VALID (OPTION_BIN_LIST \ - | OPTION_BIN_RUN \ - | OPTION_MEM_STAT) + | OPTION_BIN_RUN)static struct _iunit_debug iunit_debug = { .dbglvl =0 ,
@@ -81,9 +79,6 @@ static inline int iunit_dump_dbgopt(struct atomisp_device *isp, goto opt_err; } } - -if (opt &OPTION_MEM_STAT ) -hmm_show_mem_stat (__func__, __LINE__); }else { ret = -EINVAL ;dev_err (isp->dev,"%s dump nothing[ret=%d]\n" , __func__, ret);
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -1
@@ -1770,7 +1770,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ipm_runtime_put_noidle (&pdev->dev);pm_runtime_allow (&pdev->dev); -hmm_init_mem_stat (repool_pgnr, dypool_enable, dypool_pgnr);/* Init ISP memory management */ hmm_init ();
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -36
@@ -38,7 +38,6 @@struct hmm_bo_device bo_device;static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;static bool hmm_initialized; -struct _hmm_mem_stat hmm_mem_stat;/* * p: private
@@ -209,8 +208,6 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, goto bind_err; } - hmm_mem_stat.tol_cnt += pgnr; -if (attrs &ATOMISP_MAP_FLAG_CLEARED )hmm_set (bo->start,0 , bytes);
@@ -246,8 +243,6 @@ void hmm_free(ia_css_ptr virt)return ; } - hmm_mem_stat.tol_cnt -= bo->pgnr; -hmm_bo_unbind (bo);hmm_bo_free_pages (bo);hmm_bo_unref (bo);
@@ -627,34 +622,3 @@ ia_css_ptr hmm_host_vaddr_to_hrt_vaddr(const void *ptr) ptr);return 0 ; } - -void hmm_show_mem_stat (const char *func,const int line) -{ -pr_info ("tol_cnt=%d usr_size=%d res_size=%d res_cnt=%d sys_size=%d dyc_thr=%d dyc_size=%d.\n" , - hmm_mem_stat.tol_cnt, - hmm_mem_stat.usr_size, hmm_mem_stat.res_size, - hmm_mem_stat.res_cnt, hmm_mem_stat.sys_size, - hmm_mem_stat.dyc_thr, hmm_mem_stat.dyc_size); -} - -void hmm_init_mem_stat (int res_pgnr,int dyc_en,int dyc_pgnr) -{ - hmm_mem_stat.res_size = res_pgnr; -/* If reserved mem pool is not enabled, set its "mem stat" values as -1. */ -if (hmm_mem_stat.res_size ==0 ) { - hmm_mem_stat.res_size =-1 ; - hmm_mem_stat.res_cnt =-1 ; - } - -/* If dynamic memory pool is not enabled, set its "mem stat" values as -1. */ -if (!dyc_en) { - hmm_mem_stat.dyc_size =-1 ; - hmm_mem_stat.dyc_thr =-1 ; - }else { - hmm_mem_stat.dyc_size =0 ; - hmm_mem_stat.dyc_thr = dyc_pgnr; - } - hmm_mem_stat.usr_size =0 ; - hmm_mem_stat.sys_size =0 ; - hmm_mem_stat.tol_cnt =0 ; -}
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +0 -6
@@ -651,7 +651,6 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo,*/ if (!ret) {__free_pages (bo->page_obj[i].page,0 ); - hmm_mem_stat.sys_size--; }break ; }
@@ -762,7 +761,6 @@ static int alloc_private_pages(struct hmm_buffer_object *bo, } pgnr -= blk_pgnr; - hmm_mem_stat.sys_size += blk_pgnr;/* * if order is not reduced this time, clear
@@ -796,8 +794,6 @@ static void free_user_pages(struct hmm_buffer_object *bo, {int i; - hmm_mem_stat.usr_size -= bo->pgnr; -if (bo->mem_type ==HMM_BO_MEM_TYPE_PFN ) {unpin_user_pages (bo->pages, page_nr); }else {
@@ -870,8 +866,6 @@ static int alloc_user_pages(struct hmm_buffer_object *bo, bo->pgnr, bo->mem_type == HMM_BO_MEM_TYPE_USER ? "user" : "pfn", page_nr); - hmm_mem_stat.usr_size += bo->pgnr; -/* can be written by caller, not forced */ if (page_nr != bo->pgnr) { dev_err(atomisp_dev,
Signature · 1 line
2.36.0
PATCH v2 13/40 media: atomisp: remove pool related kernel cmdline options
In reply to Hans de GoedeSince we have removed the hmm pools these are completely meaningless now.
--- drivers/staging/media/atomisp/include/hmm/hmm.h | 2 -- .../staging/media/atomisp/pci/atomisp_v4l2.c | 17 ----------------- 2 files changed, 19 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +0 -2
@@ -87,8 +87,6 @@ ia_css_ptr hmm_host_vaddr_to_hrt_vaddr(const void *ptr);*/ int hmm_mmap (struct vm_area_struct *vma,ia_css_ptr virt); -extern bool dypool_enable; -extern unsigned int dypool_pgnr;extern struct hmm_bo_device bo_device;#endif
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -17
@@ -59,23 +59,6 @@ static uint skip_fwload;module_param (skip_fwload, uint,0644 );MODULE_PARM_DESC (skip_fwload,"Skip atomisp firmware load" ); -/* set reserved memory pool size in page */ -static unsigned int repool_pgnr =32768 ; -module_param (repool_pgnr, uint,0644 ); -MODULE_PARM_DESC (repool_pgnr, -"Set the reserved memory pool size in page (default:32768)" ); - -/* set dynamic memory pool size in page */ -unsigned int dypool_pgnr =UINT_MAX ; -module_param (dypool_pgnr, uint,0644 ); -MODULE_PARM_DESC (dypool_pgnr, -"Set the dynamic memory pool size in page (default: unlimited)" ); - -bool dypool_enable = true; -module_param (dypool_enable, bool,0644 ); -MODULE_PARM_DESC (dypool_enable, -"dynamic memory pool enable/disable (default:enabled)" ); -/* memory optimization: deferred firmware loading */ bool defer_fw_load;module_param (defer_fw_load, bool,0644 );
Signature · 1 line
2.36.0
PATCH v2 14/40 media: atomisp: remove unused attribute argument from ia_css_frame_map()
In reply to Hans de Goedeia_css_frame_map() has only one caller which passes a hardcoded 0 for the attribute argument, drop it.
--- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 2 +- drivers/staging/media/atomisp/pci/ia_css_frame_public.h | 1 - drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +1 -1
@@ -1371,7 +1371,7 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) ret =ia_css_frame_map (&handle, &frame_info, (void __user *)buf->m.userptr, -0 , pgnr); + pgnr);if (ret) {dev_err (isp->dev,"Failed to map user buffer\n" ); goto error;
drivers/staging/media/atomisp/pci/ia_css_frame_public.h +0 -1
@@ -295,7 +295,6 @@ int ia_css_frame_map(struct ia_css_frame **frame, const struct ia_css_frame_info *info, const void __user *data, - u16 attribute, unsigned int pgnr);/* @brief Unmap a CSS frame structure.
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +1 -4
@@ -146,7 +146,6 @@ int ia_css_frame_allocate(struct ia_css_frame **frame,int ia_css_frame_map (struct ia_css_frame **frame,const struct ia_css_frame_info *info,const void __user *data, -u16 attribute,unsigned int pgnr) {int err =0 ;
@@ -172,9 +171,7 @@ int ia_css_frame_map(struct ia_css_frame **frame, goto error; } - me->data =hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data, - attribute &ATOMISP_MAP_FLAG_CACHED ); - + me->data =hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data,0 );if (me->data == mmgr_NULL) err = -EINVAL ;
Signature · 1 line
2.36.0
PATCH v2 15/40 media: atomisp: drop hmm_page_type
In reply to Hans de GoedeSince the hmm-pool code has been removed this now always gets set to HMM_PAGE_TYPE_GENERAL, so just remove it.
--- .../media/atomisp/include/hmm/hmm_bo.h | 7 ---- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 42 +++++++------------ 2 files changed, 15 insertions(+), 34 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -7
@@ -81,12 +81,6 @@ enum hmm_bo_type { HMM_BO_LAST, }; -enum hmm_page_type { -HMM_PAGE_TYPE_RESERVED , -HMM_PAGE_TYPE_DYNAMIC , -HMM_PAGE_TYPE_GENERAL , -}; -#define HMM_BO_MASK 0x1#define HMM_BO_FREE 0x0#define HMM_BO_ALLOCED 0x1
@@ -123,7 +117,6 @@ struct hmm_bo_device {struct hmm_page_object {struct page *page; -enum hmm_page_type type; };struct hmm_buffer_object {
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +15 -27
63 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 16/40 media: atomisp: removed unused hmm_bo_get_page_info() function
In reply to Hans de Goedehmm_bo_get_page_info() is not used anywhere, remove it.
--- .../media/atomisp/include/hmm/hmm_bo.h | 6 ----- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 26 ------------------- 2 files changed, 32 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -6
@@ -232,12 +232,6 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo,void hmm_bo_free_pages (struct hmm_buffer_object *bo);int hmm_bo_page_allocated (struct hmm_buffer_object *bo); -/* -* get physical page info of the bo. -*/ -int hmm_bo_get_page_info (struct hmm_buffer_object *bo, -struct hmm_page_object **page_obj,int *pgnr); -/* * bind/unbind the physical pages to a virtual address space. */
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +0 -26
@@ -975,32 +975,6 @@ int hmm_bo_page_allocated(struct hmm_buffer_object *bo)return bo->status &HMM_BO_PAGE_ALLOCED ; } -/* -* get physical page info of the bo. -*/ -int hmm_bo_get_page_info (struct hmm_buffer_object *bo, -struct hmm_page_object **page_obj,int *pgnr) -{ -check_bo_null_return (bo, -EINVAL ); - -mutex_lock (&bo->mutex); - -check_bo_status_yes_goto (bo,HMM_BO_PAGE_ALLOCED , status_err); - - *page_obj = bo->page_obj; - *pgnr = bo->pgnr; - -mutex_unlock (&bo->mutex); - -return 0 ; - -status_err: -dev_err (atomisp_dev, -"buffer object not page allocated yet.\n" ); -mutex_unlock (&bo->mutex); -return -EINVAL ; -} -/* * bind the physical pages to a virtual address space. */
Signature · 1 line
2.36.0
PATCH v2 17/40 media: atomisp: remove bogus comment above hmm_bo_allocated() prototype
In reply to Hans de GoedeThe comment documenting hmm_bo_allocated() was copied (and not modified) from the comment documenting hmm_bo_alloc(), so there are 2 copies of the hmm_bo_alloc() documentation.
Remove the copy of the comment above the hmm_bo_allocated() prototype.
--- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -7
@@ -211,13 +211,6 @@ void hmm_bo_ref(struct hmm_buffer_object *bo);*/ void hmm_bo_unref (struct hmm_buffer_object *bo); -/* -* allocate/free physical pages for the bo. will try to alloc mem -* from highmem if from_highmem is set, and type indicate that the -* pages will be allocated by using video driver (for share buffer) -* or by ISP driver itself. -*/ -int hmm_bo_allocated (struct hmm_buffer_object *bo);/*
Signature · 1 line
2.36.0
PATCH v2 18/40 media: atomisp: remove private acceleration ioctls
In reply to Hans de GoedeThese ioctls allow userspace to load custom programs into the ISP, which:
a) Seems dangerous
b) Cannot be used by opensource userspace since there is no FOSS code to create such programs
b) These seem to be unused even by the Android closed source camera code (they don't show up in a strace of the camera app)
So removing these seems be a good idea. Another reason to remove these is that atomisp_acc_map() is the only user of the userptr functionality in hmm_alloc(), so it gets in the way of further cleanups / simplification of the hmm code.
--- .../media/atomisp/include/linux/atomisp.h | 129 ------ .../staging/media/atomisp/pci/atomisp_acc.c | 394 ------------------ .../staging/media/atomisp/pci/atomisp_acc.h | 58 --- .../atomisp/pci/atomisp_compat_ioctl32.h | 58 --- .../staging/media/atomisp/pci/atomisp_ioctl.c | 38 -- 5 files changed, 677 deletions(-)
drivers/staging/media/atomisp/include/linux/atomisp.h +0 -129
@@ -740,24 +740,6 @@ enum atomisp_frame_status { ATOMISP_FRAME_STATUS_FLASH_FAILED, }; -enum atomisp_acc_type { -ATOMISP_ACC_STANDALONE ,/* Stand-alone acceleration */ -ATOMISP_ACC_OUTPUT ,/* Accelerator stage on output frame */ -ATOMISP_ACC_VIEWFINDER /* Accelerator stage on viewfinder frame */ -}; - -enum atomisp_acc_arg_type { -ATOMISP_ACC_ARG_SCALAR_IN ,/* Scalar input argument */ -ATOMISP_ACC_ARG_SCALAR_OUT ,/* Scalar output argument */ -ATOMISP_ACC_ARG_SCALAR_IO ,/* Scalar in/output argument */ -ATOMISP_ACC_ARG_PTR_IN ,/* Pointer input argument */ -ATOMISP_ACC_ARG_PTR_OUT ,/* Pointer output argument */ -ATOMISP_ACC_ARG_PTR_IO ,/* Pointer in/output argument */ -ATOMISP_ARG_PTR_NOFLUSH ,/* Pointer argument will not be flushed */ -ATOMISP_ARG_PTR_STABLE ,/* Pointer input argument that is stable */ -ATOMISP_ACC_ARG_FRAME /* Frame argument */ -}; -/* ISP memories, isp2400 */ enum atomisp_acc_memory {ATOMISP_ACC_MEMORY_PMEM0 =0 ,
@@ -836,56 +818,6 @@ enum atomisp_burst_capture_options {#define EXT_ISP_SHOT_MODE_ANIMATED_PHOTO 10#define EXT_ISP_SHOT_MODE_SPORTS 11 -struct atomisp_sp_arg { -enum atomisp_acc_arg_type type;/* Type of SP argument */ -void *value;/* Value of SP argument */ -unsigned int size;/* Size of SP argument */ -}; - -/* Acceleration API */ - -/* For CSS 1.0 only */ -struct atomisp_acc_fw_arg { -unsigned int fw_handle; -unsigned int index; -void __user *value; -size_t size; -}; - -/* -* Set arguments after first mapping with ATOMISP_IOC_ACC_S_MAPPED_ARG. -*/ -struct atomisp_acc_s_mapped_arg { -unsigned int fw_handle; -__u32 memory;/* one of enum atomisp_acc_memory */ -size_t length; -unsigned long css_ptr; -}; - -struct atomisp_acc_fw_abort { -unsigned int fw_handle; -/* Timeout in us */ -unsigned int timeout; -}; - -struct atomisp_acc_fw_load { -unsigned int size; -unsigned int fw_handle; -void __user *data; -}; - -/* -* Load firmware to specified pipeline. -*/ -struct atomisp_acc_fw_load_to_pipe { -__u32 flags;/* Flags, see below for valid values */ -unsigned int fw_handle;/* Handle, filled by kernel. */ -__u32 size;/* Firmware binary size */ -void __user *data;/* Pointer to firmware */ -__u32 type;/* Binary type */ -__u32 reserved[3 ];/* Set to zero */ -}; -/* * Set Senor run mode */
@@ -905,24 +837,10 @@ struct atomisp_s_runmode {#define ATOMISP_ACC_FW_LOAD_TYPE_VIEWFINDER 2/* Stage on viewfinder */ #define ATOMISP_ACC_FW_LOAD_TYPE_STANDALONE 3/* Stand-alone acceleration */ -struct atomisp_acc_map { -__u32 flags;/* Flags, see list below */ -__u32 length;/* Length of data in bytes */ -void __user *user_ptr;/* Pointer into user space */ -unsigned long css_ptr;/* Pointer into CSS address space */ -__u32 reserved[4 ];/* Set to zero */ -}; -#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ #define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ #define ATOMISP_MAP_FLAG_CLEARED 0x0004 -struct atomisp_acc_state { -__u32 flags;/* Flags, see list below */ -#define ATOMISP_STATE_FLAG_ENABLE ATOMISP_ACC_FW_LOAD_FL_ENABLE -unsigned int fw_handle; -}; -struct atomisp_update_exposure {unsigned int gain;unsigned int digi_gain;
@@ -1090,29 +1008,6 @@ struct atomisp_sensor_ae_bracketing_lut {#define ATOMISP_IOC_S_3A_CONFIG \ _IOW('v', BASE_VIDIOC_PRIVATE + 23, struct atomisp_3a_config) -/* Accelerate ioctls */ -#define ATOMISP_IOC_ACC_LOAD \ - _IOWR('v', BASE_VIDIOC_PRIVATE + 24, struct atomisp_acc_fw_load) - -#define ATOMISP_IOC_ACC_UNLOAD \ - _IOWR('v', BASE_VIDIOC_PRIVATE + 24, unsigned int) - -/* For CSS 1.0 only */ -#define ATOMISP_IOC_ACC_S_ARG \ - _IOW('v', BASE_VIDIOC_PRIVATE + 24, struct atomisp_acc_fw_arg) - -#define ATOMISP_IOC_ACC_START \ - _IOW('v', BASE_VIDIOC_PRIVATE + 24, unsigned int) - -#define ATOMISP_IOC_ACC_WAIT \ - _IOW('v', BASE_VIDIOC_PRIVATE + 25, unsigned int) - -#define ATOMISP_IOC_ACC_ABORT \ - _IOW('v', BASE_VIDIOC_PRIVATE + 25, struct atomisp_acc_fw_abort) - -#define ATOMISP_IOC_ACC_DESTAB \ - _IOW('v', BASE_VIDIOC_PRIVATE + 25, struct atomisp_acc_fw_arg) -/* sensor OTP memory read */ #define ATOMISP_IOC_G_SENSOR_PRIV_INT_DATA \ _IOWR('v', BASE_VIDIOC_PRIVATE + 26, struct v4l2_private_int_data)
@@ -1132,24 +1027,6 @@ struct atomisp_sensor_ae_bracketing_lut {#define ATOMISP_IOC_G_MOTOR_PRIV_INT_DATA \ _IOWR('v', BASE_VIDIOC_PRIVATE + 29, struct v4l2_private_int_data) -/* -* Ioctls to map and unmap user buffers to CSS address space for acceleration. -* User fills fields length and user_ptr and sets other fields to zero, -* kernel may modify the flags and sets css_ptr. -*/ -#define ATOMISP_IOC_ACC_MAP \ - _IOWR('v', BASE_VIDIOC_PRIVATE + 30, struct atomisp_acc_map) - -/* User fills fields length, user_ptr, and css_ptr and zeroes other fields. */ -#define ATOMISP_IOC_ACC_UNMAP \ - _IOW('v', BASE_VIDIOC_PRIVATE + 30, struct atomisp_acc_map) - -#define ATOMISP_IOC_ACC_S_MAPPED_ARG \ - _IOW('v', BASE_VIDIOC_PRIVATE + 30, struct atomisp_acc_s_mapped_arg) - -#define ATOMISP_IOC_ACC_LOAD_TO_PIPE \ - _IOWR('v', BASE_VIDIOC_PRIVATE + 31, struct atomisp_acc_fw_load_to_pipe) -#define ATOMISP_IOC_S_PARAMETERS \ _IOW('v', BASE_VIDIOC_PRIVATE + 32, struct atomisp_parameters)
@@ -1183,12 +1060,6 @@ struct atomisp_sensor_ae_bracketing_lut {#define ATOMISP_IOC_S_EXPOSURE_WINDOW \ _IOW('v', BASE_VIDIOC_PRIVATE + 40, struct atomisp_ae_window) -#define ATOMISP_IOC_S_ACC_STATE \ - _IOW('v', BASE_VIDIOC_PRIVATE + 41, struct atomisp_acc_state) - -#define ATOMISP_IOC_G_ACC_STATE \ - _IOR('v', BASE_VIDIOC_PRIVATE + 41, struct atomisp_acc_state) -#define ATOMISP_IOC_INJECT_A_FAKE_EVENT \ _IOW('v', BASE_VIDIOC_PRIVATE + 42, int)
drivers/staging/media/atomisp/pci/atomisp_acc.c +0 -394
421 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_acc.h +0 -58
68 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.h +0 -58
88 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +0 -38
@@ -3118,38 +3118,6 @@ static long atomisp_vidioc_default(struct file *file, void *fh, err = -EINVAL ;break ; -case ATOMISP_IOC_ACC_LOAD : - err =atomisp_acc_load (asd, arg); -break ; - -case ATOMISP_IOC_ACC_LOAD_TO_PIPE : - err =atomisp_acc_load_to_pipe (asd, arg); -break ; - -case ATOMISP_IOC_ACC_UNLOAD : - err =atomisp_acc_unload (asd, arg); -break ; - -case ATOMISP_IOC_ACC_START : - err =atomisp_acc_start (asd, arg); -break ; - -case ATOMISP_IOC_ACC_WAIT : - err =atomisp_acc_wait (asd, arg); -break ; - -case ATOMISP_IOC_ACC_MAP : - err =atomisp_acc_map (asd, arg); -break ; - -case ATOMISP_IOC_ACC_UNMAP : - err =atomisp_acc_unmap (asd, arg); -break ; - -case ATOMISP_IOC_ACC_S_MAPPED_ARG : - err =atomisp_acc_s_mapped_arg (asd, arg); -break ; -case ATOMISP_IOC_S_ISP_SHD_TAB : err =atomisp_set_shading_table (asd, arg);break ;
@@ -3198,12 +3166,6 @@ static long atomisp_vidioc_default(struct file *file, void *fh,case ATOMISP_IOC_S_EXPOSURE_WINDOW : err =atomisp_s_ae_window (asd, arg);break ; -case ATOMISP_IOC_S_ACC_STATE : - err =atomisp_acc_set_state (asd, arg); -break ; -case ATOMISP_IOC_G_ACC_STATE : - err =atomisp_acc_get_state (asd, arg); -break ;case ATOMISP_IOC_INJECT_A_FAKE_EVENT : err =atomisp_inject_a_fake_event (asd, arg);break ;
Signature · 1 line
2.36.0
PATCH v2 19/40 media: atomisp: remove atomisp_acc.c
In reply to Hans de GoedeWith the ACC ioctls removed sd->acc.fw is always empty turning the atomisp_acc.c code into no-ops, remove it.
--- drivers/staging/media/atomisp/Makefile | 1 - .../staging/media/atomisp/pci/atomisp_acc.c | 231 ------------------ .../staging/media/atomisp/pci/atomisp_acc.h | 62 ----- .../staging/media/atomisp/pci/atomisp_cmd.c | 26 -- .../media/atomisp/pci/atomisp_compat_css20.c | 8 +- .../staging/media/atomisp/pci/atomisp_fops.c | 4 - .../staging/media/atomisp/pci/atomisp_ioctl.c | 9 +- .../media/atomisp/pci/atomisp_subdev.c | 3 - .../media/atomisp/pci/atomisp_subdev.h | 4 - .../staging/media/atomisp/pci/atomisp_v4l2.c | 4 - 10 files changed, 5 insertions(+), 347 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.h
drivers/staging/media/atomisp/Makefile +0 -1
@@ -13,7 +13,6 @@ atomisp = $(srctree)/drivers/staging/media/atomisp/ # SPDX-License-Identifier: GPL-2.0 atomisp-objs += \ - pci/atomisp_acc.o \ pci/atomisp_cmd.o \ pci/atomisp_compat_css20.o \ pci/atomisp_csi2.o \
drivers/staging/media/atomisp/pci/atomisp_acc.c deleted +0 -231
231 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_acc.h deleted +0 -62
62 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_cmd.c +0 -26
@@ -42,7 +42,6 @@#include "atomisp_ioctl.h" #include "atomisp-regs.h" #include "atomisp_tables.h" -#include "atomisp_acc.h" #include "atomisp_compat.h" #include "atomisp_subdev.h" #include "atomisp_dfs_tables.h"
@@ -1302,34 +1301,11 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout)for (i =0 ; i < isp->num_of_streams; i++) {struct atomisp_sub_device *asd = &isp->asd[i]; -struct ia_css_pipeline *acc_pipeline; -struct ia_css_pipe *acc_pipe =NULL ;if (asd->streaming !=ATOMISP_DEVICE_STREAMING_ENABLED && !asd->stream_prepared)continue ; -/* -* AtomISP::waitStageUpdate is blocked when WDT happens. -* By calling acc_done() for all loaded fw_handles, -* HAL will be unblocked. -*/ - acc_pipe = asd->stream_env[i].pipes[IA_CSS_PIPE_ID_ACC ]; -if (acc_pipe) { - acc_pipeline =ia_css_pipe_get_pipeline (acc_pipe); -if (acc_pipeline) { -struct ia_css_pipeline_stage *stage; - -for (stage = acc_pipeline->stages; stage; - stage = stage->next) { -const struct ia_css_fw_info *fw; - - fw = stage->firmware; -atomisp_acc_done (asd, fw->handle); - } - } - } - depth_cnt++;if (asd->delayed_init ==ATOMISP_DELAYED_INIT_QUEUED )
@@ -1350,8 +1326,6 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout)dev_warn (isp->dev,"can't stop streaming on sensor!\n" ); -atomisp_acc_unload_extensions (asd); -atomisp_clear_css_buffer_counters (asd); css_pipe_id =atomisp_get_css_pipe_id (asd);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +3 -5
@@ -31,7 +31,6 @@#include "atomisp-regs.h" #include "atomisp_fops.h" #include "atomisp_ioctl.h" -#include "atomisp_acc.h" #include "ia_css_debug.h" #include "ia_css_isp_param.h"
@@ -1118,8 +1117,8 @@ int atomisp_css_start(struct atomisp_sub_device *asd, ret = -EINVAL ; goto stream_err; } -/* in_reset == true, extension firmwares are reloaded after the recovery */ -atomisp_acc_load_extensions (asd); +/* Invalidate caches. FIXME: should flush only necessary buffers */ +wbinvd (); }/*
@@ -4211,8 +4210,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, css_pipe_done[asd->index] = true;break ;case IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE : -dev_dbg (isp->dev,"event: acc stage done" ); -atomisp_acc_done (asd, current_event.event.fw_handle); +dev_warn (isp->dev,"unexpected event: acc stage done" );break ;default : dev_dbg(isp->dev, "unhandled css stored event: 0x%x\n",
drivers/staging/media/atomisp/pci/atomisp_fops.c +0 -4
@@ -38,8 +38,6 @@#include "type_support.h" #include "device_access/device_access.h" -#include "atomisp_acc.h" -#define ISP_LEFT_PAD 128/* equal to 2*NWAY */ /*
@@ -1014,8 +1012,6 @@ static int atomisp_release(struct file *file)if (atomisp_dev_users (isp)) goto done; -atomisp_acc_release (asd); -atomisp_destroy_pipes_stream_force (asd);atomisp_css_uninit (isp);
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +2 -7
@@ -25,7 +25,6 @@#include <media/v4l2-event.h> #include <media/videobuf-vmalloc.h> -#include "atomisp_acc.h" #include "atomisp_cmd.h" #include "atomisp_common.h" #include "atomisp_fops.h"
@@ -1913,11 +1912,8 @@ static int atomisp_streamon(struct file *file, void *fh, css_pipe_id =atomisp_get_css_pipe_id (asd); - ret =atomisp_acc_load_extensions (asd); -if (ret <0 ) { -dev_err (isp->dev,"acc extension failed to load\n" ); - goto out; - } +/* Invalidate caches. FIXME: should flush only necessary buffers */ +wbinvd ();if (asd->params.css_update_params_needed) {atomisp_apply_css_parameters (asd, &asd->params.css_param);
@@ -2154,7 +2150,6 @@ int __atomisp_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) video, s_stream, 0);rt_mutex_lock (&isp->mutex); -atomisp_acc_unload_extensions (asd); }spin_lock_irqsave (&isp->lock, flags);
drivers/staging/media/atomisp/pci/atomisp_subdev.c +0 -3
@@ -1081,9 +1081,6 @@ static void atomisp_init_acc_pipe(struct atomisp_sub_device *asd, { pipe->asd = asd; pipe->isp = asd->isp; -INIT_LIST_HEAD (&asd->acc.fw); -INIT_LIST_HEAD (&asd->acc.memory_maps); -ida_init (&asd->acc.ida); }/*
drivers/staging/media/atomisp/pci/atomisp_subdev.h +0 -4
@@ -323,11 +323,7 @@ struct atomisp_sub_device {struct v4l2_ctrl *disable_dz;struct { -struct list_head fw; -struct list_head memory_maps;struct ia_css_pipe *pipeline; -bool extension_mode; -struct ida ida;struct completion acc_done;void *acc_stages; } acc;
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -4
@@ -37,7 +37,6 @@#include "atomisp_file.h" #include "atomisp_ioctl.h" #include "atomisp_internal.h" -#include "atomisp_acc.h" #include "atomisp-regs.h" #include "atomisp_dfs_tables.h" #include "atomisp_drvfs.h"
@@ -1792,7 +1791,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ipm_runtime_get_noresume (&pdev->dev);destroy_workqueue (isp->wdt_work_queue); wdt_work_queue_fail: -atomisp_acc_cleanup (isp);atomisp_unregister_entities (isp); register_entities_fail:atomisp_uninitialize_modules (isp);
@@ -1843,8 +1841,6 @@ static void atomisp_pci_remove(struct pci_dev *pdev)atomisp_drvfs_exit (); -atomisp_acc_cleanup (isp); -ia_css_unload_firmware ();hmm_cleanup ();
Signature · 1 line
2.36.0
PATCH v2 20/40 media: atomisp: remove unused atomisp_*css_* functions
In reply to Hans de GoedeWith the removal of the ACC ioctls and atomisp_acc.c a whole bunch of atomisp_*css_* functions is no longer used, remove them.
--- .../media/atomisp/pci/atomisp_compat.h | 25 -- .../media/atomisp/pci/atomisp_compat_css20.c | 217 ------------------ .../media/atomisp/pci/atomisp_subdev.h | 1 - 3 files changed, 243 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat.h +0 -25
@@ -442,33 +442,8 @@ int atomisp_css_get_dis_stat(struct atomisp_sub_device *asd,int atomisp_css_update_stream (struct atomisp_sub_device *asd); -int atomisp_css_create_acc_pipe (struct atomisp_sub_device *asd); - -int atomisp_css_start_acc_pipe (struct atomisp_sub_device *asd); - -int atomisp_css_stop_acc_pipe (struct atomisp_sub_device *asd); - -void atomisp_css_destroy_acc_pipe (struct atomisp_sub_device *asd); - -int atomisp_css_load_acc_extension (struct atomisp_sub_device *asd, -struct ia_css_fw_info *fw, -enum ia_css_pipe_id pipe_id, -unsigned int type); - -void atomisp_css_unload_acc_extension (struct atomisp_sub_device *asd, -struct ia_css_fw_info *fw, -enum ia_css_pipe_id pipe_id); - -int atomisp_css_wait_acc_finish (struct atomisp_sub_device *asd); -void atomisp_css_acc_done (struct atomisp_sub_device *asd); -int atomisp_css_load_acc_binary (struct atomisp_sub_device *asd, -struct ia_css_fw_info *fw, -unsigned int index); - -void atomisp_css_unload_acc_binary (struct atomisp_sub_device *asd); -struct atomisp_acc_fw ;int atomisp_css_set_acc_parameters (struct atomisp_acc_fw *acc_fw);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +0 -217
229 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_subdev.h +0 -1
@@ -325,7 +325,6 @@ struct atomisp_sub_device {struct {struct ia_css_pipe *pipeline;struct completion acc_done; -void *acc_stages; } acc;struct atomisp_subdev_params params;
Signature · 1 line
2.36.0
PATCH v2 21/40 media: atomisp: asc.acc.pipeline is always NULL
In reply to Hans de GoedeWith the removal of the ACC ioctls and atomisp_acc.c asc.acc.pipeline never gets set, so it is always NULL.
Remove asc.acc.pipeline and drop checks for it being NULL / !NULL.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 3 --- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 3 +-- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 6 ------ drivers/staging/media/atomisp/pci/atomisp_subdev.h | 1 - 4 files changed, 1 insertion(+), 12 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +0 -3
@@ -1888,9 +1888,6 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr) && isp->sw_contex.file_input)v4l2_subdev_call (isp->inputs[asd->input_curr].camera, video, s_stream,1 ); -/* FIXME! FIX ACC implementation */ -if (asd->acc.pipeline && css_pipe_done[asd->index]) -atomisp_css_acc_done (asd); }dev_dbg (isp->dev,"<%s\n" , __func__);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +1 -2
@@ -3857,8 +3857,7 @@ static struct atomisp_sub_device *__get_atomisp_subdev(for (i =0 ; i < isp->num_of_streams; i++) { asd = &isp->asd[i]; -if (asd->streaming ==ATOMISP_DEVICE_STREAMING_DISABLED && - !asd->acc.pipeline) +if (asd->streaming ==ATOMISP_DEVICE_STREAMING_DISABLED )continue ;for (j =0 ; j <ATOMISP_INPUT_STREAM_NUM ; j++) { stream_env = &asd->stream_env[j];
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +0 -6
@@ -626,12 +626,6 @@ unsigned int atomisp_streaming_count(struct atomisp_device *isp)unsigned int atomisp_is_acc_enabled (struct atomisp_device *isp) { -unsigned int i; - -for (i =0 ; i < isp->num_of_streams; i++) -if (isp->asd[i].acc.pipeline) -return 1 ; -return 0 ; }
drivers/staging/media/atomisp/pci/atomisp_subdev.h +0 -1
@@ -323,7 +323,6 @@ struct atomisp_sub_device {struct v4l2_ctrl *disable_dz;struct { -struct ia_css_pipe *pipeline;struct completion acc_done; } acc;
Signature · 1 line
2.36.0
PATCH v2 22/40 media: atomisp: remove no longer used atomisp_css_acc_done() function
In reply to Hans de Goedeatomisp_css_acc_done() is no longer used anywhere, remove it.
--- drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 -- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 5 ----- drivers/staging/media/atomisp/pci/atomisp_subdev.h | 4 ---- 3 files changed, 11 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat.h +0 -2
@@ -442,8 +442,6 @@ int atomisp_css_get_dis_stat(struct atomisp_sub_device *asd,int atomisp_css_update_stream (struct atomisp_sub_device *asd); -void atomisp_css_acc_done (struct atomisp_sub_device *asd); -struct atomisp_acc_fw ;int atomisp_css_set_acc_parameters (struct atomisp_acc_fw *acc_fw);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +0 -5
@@ -3823,11 +3823,6 @@ void atomisp_css_set_cont_prev_start_time(struct atomisp_device *isp,return ; } -void atomisp_css_acc_done (struct atomisp_sub_device *asd) -{ -complete (&asd->acc.acc_done); -} -/* Set the ACC binary arguments */ int atomisp_css_set_acc_parameters (struct atomisp_acc_fw *acc_fw) {
drivers/staging/media/atomisp/pci/atomisp_subdev.h +0 -4
@@ -322,10 +322,6 @@ struct atomisp_sub_device {struct v4l2_ctrl *disable_dz; -struct { -struct completion acc_done; - } acc; -struct atomisp_subdev_params params;struct atomisp_stream_env stream_env[ATOMISP_INPUT_STREAM_NUM ];
Signature · 1 line
2.36.0
PATCH v2 23/40 media: atomisp: remove atomisp_is_acc_enabled()
In reply to Hans de Goedeatomisp_is_acc_enabled() always returns false now, remove it.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 4 ++-- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 5 ----- drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +2 -2
@@ -538,7 +538,7 @@ irqreturn_t atomisp_isr(int irq, void *dev)clear_irq_reg (isp); -if (!atomisp_streaming_count (isp) && !atomisp_is_acc_enabled (isp)) +if (!atomisp_streaming_count (isp)) goto out_nowake;for (i =0 ; i < isp->num_of_streams; i++) {
@@ -1837,7 +1837,7 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr)spin_lock_irqsave (&isp->lock, flags); -if (!atomisp_streaming_count (isp) && !atomisp_is_acc_enabled (isp)) { +if (!atomisp_streaming_count (isp)) {spin_unlock_irqrestore (&isp->lock, flags);return IRQ_HANDLED ; }
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +0 -5
@@ -624,11 +624,6 @@ unsigned int atomisp_streaming_count(struct atomisp_device *isp)return sum; } -unsigned int atomisp_is_acc_enabled (struct atomisp_device *isp) -{ -return 0 ; -} -/* * get input are used to get current primary/secondary camera */
drivers/staging/media/atomisp/pci/atomisp_ioctl.h +0 -1
@@ -57,7 +57,6 @@ extern const struct v4l2_ioctl_ops atomisp_file_ioctl_ops;unsigned int atomisp_streaming_count (struct atomisp_device *isp); -unsigned int atomisp_is_acc_enabled (struct atomisp_device *isp);/* compat_ioctl for 32bit userland app and 64bit kernel */ long atomisp_compat_ioctl32 (struct file *file,unsigned int cmd,unsigned long arg);
Signature · 1 line
2.36.0
PATCH v2 24/40 media: atomisp: drop unused ATOMISP_ACC_FW_LOAD_* defines
In reply to Hans de GoedeDrop the ATOMISP_ACC_FW_LOAD_* defines, these are no longer used anywhere.
--- .../staging/media/atomisp/include/linux/atomisp.h | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/media/atomisp/include/linux/atomisp.h +0 -12
@@ -825,18 +825,6 @@ struct atomisp_s_runmode {__u32 mode; }; -#define ATOMISP_ACC_FW_LOAD_FL_PREVIEW BIT(0) -#define ATOMISP_ACC_FW_LOAD_FL_COPY BIT(1) -#define ATOMISP_ACC_FW_LOAD_FL_VIDEO BIT(2) -#define ATOMISP_ACC_FW_LOAD_FL_CAPTURE BIT(3) -#define ATOMISP_ACC_FW_LOAD_FL_ACC BIT(4) -#define ATOMISP_ACC_FW_LOAD_FL_ENABLE BIT(16) - -#define ATOMISP_ACC_FW_LOAD_TYPE_NONE 0/* Normal binary: don't use */ -#define ATOMISP_ACC_FW_LOAD_TYPE_OUTPUT 1/* Stage on output */ -#define ATOMISP_ACC_FW_LOAD_TYPE_VIEWFINDER 2/* Stage on viewfinder */ -#define ATOMISP_ACC_FW_LOAD_TYPE_STANDALONE 3/* Stand-alone acceleration */ -#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ #define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ #define ATOMISP_MAP_FLAG_CLEARED 0x0004
Signature · 1 line
2.36.0
PATCH v2 25/40 media: atomisp: drop ATOMISP_MAP_FLAG_CLEARED
In reply to Hans de GoedeThis flag is only used by one hmm_alloc() caller, drop it and make the caller call hmm_set(ptr, 0, size) itself to do the clearing.
--- .../media/atomisp/include/linux/atomisp.h | 1 - drivers/staging/media/atomisp/pci/hmm/hmm.c | 3 --- .../staging/media/atomisp/pci/sh_css_params.c | 18 ++++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-)
drivers/staging/media/atomisp/include/linux/atomisp.h +0 -1
@@ -827,7 +827,6 @@ struct atomisp_s_runmode {#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ #define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ -#define ATOMISP_MAP_FLAG_CLEARED 0x0004struct atomisp_update_exposure {unsigned int gain;
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -3
@@ -208,9 +208,6 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, goto bind_err; } -if (attrs &ATOMISP_MAP_FLAG_CLEARED ) -hmm_set (bo->start,0 , bytes); -dev_dbg (atomisp_dev,"%s: pages: 0x%08x (%zu bytes), type: %d from highmem %d, user ptr %p, cached %d\n" , __func__, bo->start, bytes, type, from_highmem, userptr, cached);
drivers/staging/media/atomisp/pci/sh_css_params.c +10 -8
@@ -2587,13 +2587,11 @@ sh_css_params_init(void) xmem_sp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 ,hmm_alloc (sizeof (struct sh_css_sp_stage ), -HMM_BO_PRIVATE ,0 ,NULL , -ATOMISP_MAP_FLAG_CLEARED )); +HMM_BO_PRIVATE ,0 ,NULL ,0 )); xmem_isp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 ,hmm_alloc (sizeof (struct sh_css_sp_stage ), -HMM_BO_PRIVATE ,0 ,NULL , -ATOMISP_MAP_FLAG_CLEARED )); +HMM_BO_PRIVATE ,0 ,NULL ,0 ));if ((xmem_sp_stage_ptrs[p][i] == mmgr_NULL) || (xmem_isp_stage_ptrs[p][i] == mmgr_NULL)) {
@@ -2601,6 +2599,9 @@ sh_css_params_init(void)IA_CSS_LEAVE_ERR_PRIVATE (-ENOMEM );return -ENOMEM ; } + +hmm_set (xmem_sp_stage_ptrs[p][i],0 ,sizeof (struct sh_css_sp_stage )); +hmm_set (xmem_isp_stage_ptrs[p][i],0 ,sizeof (struct sh_css_sp_stage )); } }
@@ -2612,12 +2613,10 @@ sh_css_params_init(void) sp_ddr_ptrs =ia_css_refcount_increment (-1 ,hmm_alloc (CEIL_MUL (sizeof (struct sh_css_ddr_address_map ),HIVE_ISP_DDR_WORD_BYTES ), -HMM_BO_PRIVATE ,0 ,NULL , -ATOMISP_MAP_FLAG_CLEARED )); +HMM_BO_PRIVATE ,0 ,NULL ,0 )); xmem_sp_group_ptrs =ia_css_refcount_increment (-1 ,hmm_alloc (sizeof (struct sh_css_sp_group ), -HMM_BO_PRIVATE ,0 ,NULL , -ATOMISP_MAP_FLAG_CLEARED )); +HMM_BO_PRIVATE ,0 ,NULL ,0 ));if ((sp_ddr_ptrs == mmgr_NULL) || (xmem_sp_group_ptrs == mmgr_NULL)) {
@@ -2625,6 +2624,9 @@ sh_css_params_init(void)IA_CSS_LEAVE_ERR_PRIVATE (-ENOMEM );return -ENOMEM ; } +hmm_set (sp_ddr_ptrs,0 ,CEIL_MUL (sizeof (struct sh_css_ddr_address_map ), +HIVE_ISP_DDR_WORD_BYTES )); +hmm_set (xmem_sp_group_ptrs,0 ,sizeof (struct sh_css_sp_group ));IA_CSS_LEAVE_ERR_PRIVATE (0 );return 0 ; }
Signature · 1 line
2.36.0
PATCH v2 26/40 media: atomisp: drop unused ATOMISP_MAP_FLAG_* flags
In reply to Hans de GoedeDrop the ATOMISP_MAP_FLAG_CACHED flag, it is never set anywhere; also drop the matching "cached" parameter to hmm[_bo]_alloc which value was derived form the never set flag.
Drop the ATOMISP_MAP_FLAG_NOFLUSH, it is not used anywhere.
--- .../media/atomisp/include/hmm/hmm_bo.h | 2 +- .../media/atomisp/include/linux/atomisp.h | 3 -- drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 ++--- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 31 +++++++++---------- 4 files changed, 18 insertions(+), 25 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +1 -1
@@ -221,7 +221,7 @@ int hmm_bo_allocated(struct hmm_buffer_object *bo);*/ int hmm_bo_alloc_pages (struct hmm_buffer_object *bo,enum hmm_bo_type type,int from_highmem, -const void __user *userptr,bool cached); +const void __user *userptr);void hmm_bo_free_pages (struct hmm_buffer_object *bo);int hmm_bo_page_allocated (struct hmm_buffer_object *bo);
drivers/staging/media/atomisp/include/linux/atomisp.h +0 -3
@@ -825,9 +825,6 @@ struct atomisp_s_runmode {__u32 mode; }; -#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ -#define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ -struct atomisp_update_exposure {unsigned int gain;unsigned int digi_gain;
drivers/staging/media/atomisp/pci/hmm/hmm.c +3 -4
@@ -174,7 +174,6 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, {unsigned int pgnr;struct hmm_buffer_object *bo; -bool cached = attrs &ATOMISP_MAP_FLAG_CACHED ;int ret;/*
@@ -195,7 +194,7 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, }/* Allocate pages for memory */ - ret =hmm_bo_alloc_pages (bo, type, from_highmem, userptr, cached); + ret =hmm_bo_alloc_pages (bo, type, from_highmem, userptr);if (ret) {dev_err (atomisp_dev,"hmm_bo_alloc_pages failed.\n" ); goto alloc_page_err;
@@ -209,8 +208,8 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, }dev_dbg (atomisp_dev, -"%s: pages: 0x%08x (%zu bytes), type: %d from highmem %d, user ptr %p, cached %d\n" , - __func__, bo->start, bytes, type, from_highmem, userptr, cached); +"%s: pages: 0x%08x (%zu bytes), type: %d from highmem %d, user ptr %p\n" , + __func__, bo->start, bytes, type, from_highmem, userptr);return bo->start;
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +14 -17
@@ -651,8 +651,7 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo,/*Allocate pages which will be used only by ISP*/ static int alloc_private_pages (struct hmm_buffer_object *bo, -int from_highmem, -bool cached) +int from_highmem) {int ret;unsigned int pgnr, order, blk_pgnr, alloc_pgnr;
@@ -730,19 +729,17 @@ static int alloc_private_pages(struct hmm_buffer_object *bo, }else { blk_pgnr =order_to_nr (order); -if (!cached) { -/* -* set memory to uncacheable -- UC_MINUS -*/ - ret =set_pages_uc (pages, blk_pgnr); -if (ret) { -dev_err (atomisp_dev, -"set page uncacheablefailed.\n" ); +/* +* set memory to uncacheable -- UC_MINUS +*/ + ret =set_pages_uc (pages, blk_pgnr); +if (ret) { +dev_err (atomisp_dev, +"set page uncacheablefailed.\n" ); -__free_pages (pages, order); +__free_pages (pages, order); - goto cleanup; - } + goto cleanup; }for (j =0 ; j < blk_pgnr; j++, i++) {
@@ -797,7 +794,7 @@ static void free_user_pages(struct hmm_buffer_object *bo,* Convert user space virtual address into pages list */ static int alloc_user_pages (struct hmm_buffer_object *bo, -const void __user *userptr,bool cached) +const void __user *userptr) {int page_nr;int i;
@@ -895,7 +892,7 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,*/ int hmm_bo_alloc_pages (struct hmm_buffer_object *bo,enum hmm_bo_type type,int from_highmem, -const void __user *userptr,bool cached) +const void __user *userptr) {int ret = -EINVAL ;
@@ -909,9 +906,9 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo,* add HMM_BO_USER type */ if (type ==HMM_BO_PRIVATE ) { - ret =alloc_private_pages (bo, from_highmem, cached); + ret =alloc_private_pages (bo, from_highmem); }else if (type ==HMM_BO_USER ) { - ret =alloc_user_pages (bo, userptr, cached); + ret =alloc_user_pages (bo, userptr); }else {dev_err (atomisp_dev,"invalid buffer type.\n" ); ret = -EINVAL ;
Signature · 1 line
2.36.0
PATCH v2 27/40 media: atomisp: remove unused hmm address translation functions
In reply to Hans de Goedehmm_isp_vaddr_to_host_vaddr() and hmm_host_vaddr_to_hrt_vaddr() are unused, remove them.
--- .../staging/media/atomisp/include/hmm/hmm.h | 11 ---------- drivers/staging/media/atomisp/pci/hmm/hmm.c | 20 ------------------- 2 files changed, 31 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +0 -11
@@ -66,17 +66,6 @@ void hmm_vunmap(ia_css_ptr virt);*/ void hmm_flush_vmap (ia_css_ptr virt); -/* -* Address translation from ISP shared memory address to kernel virtual address -* if the memory is not vmmaped, then do it. -*/ -void *hmm_isp_vaddr_to_host_vaddr (ia_css_ptr ptr,bool cached); - -/* -* Address translation from kernel virtual address to ISP shared memory address -*/ -ia_css_ptr hmm_host_vaddr_to_hrt_vaddr (const void *ptr); -/* * map ISP memory starts with virt to specific vma. *
drivers/staging/media/atomisp/pci/hmm/hmm.c +0 -20
@@ -598,23 +598,3 @@ void hmm_vunmap(ia_css_ptr virt)hmm_bo_vunmap (bo); } - -void *hmm_isp_vaddr_to_host_vaddr (ia_css_ptr ptr,bool cached) -{ -return hmm_vmap (ptr, cached); -/* vmunmap will be done in hmm_bo_release() */ -} - -ia_css_ptr hmm_host_vaddr_to_hrt_vaddr (const void *ptr) -{ -struct hmm_buffer_object *bo; - - bo =hmm_bo_device_search_vmap_start (&bo_device, ptr); -if (bo) -return bo->start; - -dev_err (atomisp_dev, -"can not find buffer object whose kernel virtual address is %p\n" , - ptr); -return 0 ; -}
Signature · 1 line
2.36.0
PATCH v2 28/40 media: atomisp: add hmm_create_from_userdata() helper
In reply to Hans de GoedeMost hmm_alloc() callers want BO_PRIVATE type memory.
Add a hmm_create_from_userdata() helper for other cases so that the hmm_alloc() calls for all the callers who don't want this can be simplied.
--- drivers/staging/media/atomisp/include/hmm/hmm.h | 1 + drivers/staging/media/atomisp/pci/hmm/hmm.c | 5 +++++ drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +1 -0
@@ -39,6 +39,7 @@ void hmm_cleanup(void);ia_css_ptr hmm_alloc (size_t bytes,enum hmm_bo_type type,int from_highmem,const void __user *userptr,const uint16_t attrs); +ia_css_ptr hmm_create_from_userdata (size_t bytes,const void __user *userptr);void hmm_free (ia_css_ptr ptr);int hmm_load (ia_css_ptr virt,void *data,unsigned int bytes);int hmm_store (ia_css_ptr virt,const void *data,unsigned int bytes);
drivers/staging/media/atomisp/pci/hmm/hmm.c +5 -0
@@ -221,6 +221,11 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type,return 0 ; } +ia_css_ptr hmm_create_from_userdata (size_t bytes,const void __user *userptr) +{ +return hmm_alloc (bytes,HMM_BO_USER ,0 , userptr,0 ); +} +void hmm_free (ia_css_ptr virt) {struct hmm_buffer_object *bo;
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +1 -1
@@ -171,7 +171,7 @@ int ia_css_frame_map(struct ia_css_frame **frame, goto error; } - me->data =hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data,0 ); + me->data =hmm_create_from_userdata (me->data_bytes, data);if (me->data == mmgr_NULL) err = -EINVAL ;
Signature · 1 line
2.36.0
PATCH v2 29/40 media: atomisp: Simplify hmm_alloc() calls
In reply to Hans de GoedeMake hmm_alloc() only take size as a parameter and remove other parameters. since all callers always pass the same flags.
--- .../staging/media/atomisp/include/hmm/hmm.h | 4 +- drivers/staging/media/atomisp/pci/hmm/hmm.c | 19 ++++++---- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../atomisp/pci/runtime/frame/src/frame.c | 3 +- .../pci/runtime/isp_param/src/isp_param.c | 2 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 3 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 2 +- .../media/atomisp/pci/sh_css_firmware.c | 2 +- .../staging/media/atomisp/pci/sh_css_params.c | 37 +++++++------------ 10 files changed, 33 insertions(+), 43 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +1 -3
@@ -36,9 +36,7 @@int hmm_init (void );void hmm_cleanup (void ); -ia_css_ptr hmm_alloc (size_t bytes,enum hmm_bo_type type, -int from_highmem,const void __user *userptr, -const uint16_t attrs); +ia_css_ptr hmm_alloc (size_t bytes);ia_css_ptr hmm_create_from_userdata (size_t bytes,const void __user *userptr);void hmm_free (ia_css_ptr ptr);int hmm_load (ia_css_ptr virt,void *data,unsigned int bytes);
drivers/staging/media/atomisp/pci/hmm/hmm.c +11 -8
@@ -141,7 +141,7 @@ int hmm_init(void)* at the beginning, to avoid hmm_alloc return 0 in the * further allocation. */ - dummy_ptr =hmm_alloc (1 ,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + dummy_ptr =hmm_alloc (1 );if (!ret) { ret = sysfs_create_group(&atomisp_dev->kobj,
@@ -168,9 +168,7 @@ void hmm_cleanup(void) hmm_initialized = false; } -ia_css_ptr hmm_alloc (size_t bytes,enum hmm_bo_type type, -int from_highmem,const void __user *userptr, -const uint16_t attrs) +static ia_css_ptr __hmm_alloc (size_t bytes,enum hmm_bo_type type,const void __user *userptr) {unsigned int pgnr;struct hmm_buffer_object *bo;
@@ -194,7 +192,7 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, }/* Allocate pages for memory */ - ret =hmm_bo_alloc_pages (bo, type, from_highmem, userptr); + ret =hmm_bo_alloc_pages (bo, type, false, userptr);if (ret) {dev_err (atomisp_dev,"hmm_bo_alloc_pages failed.\n" ); goto alloc_page_err;
@@ -208,8 +206,8 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, }dev_dbg (atomisp_dev, -"%s: pages: 0x%08x (%zu bytes), type: %d from highmem %d, user ptr %p\n" , - __func__, bo->start, bytes, type, from_highmem, userptr); +"%s: pages: 0x%08x (%zu bytes), type: %d, user ptr %p\n" , + __func__, bo->start, bytes, type, userptr);return bo->start;
@@ -221,9 +219,14 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type,return 0 ; } +ia_css_ptr hmm_alloc (size_t bytes) +{ +return __hmm_alloc (bytes,HMM_BO_PRIVATE ,NULL ); +} +ia_css_ptr hmm_create_from_userdata (size_t bytes,const void __user *userptr) { -return hmm_alloc (bytes,HMM_BO_USER ,0 , userptr,0 ); +return __hmm_alloc (bytes,HMM_BO_USER , userptr); }void hmm_free (ia_css_ptr virt)
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +1 -1
@@ -331,7 +331,7 @@ ia_css_isp_dvs_statistics_allocate( HIVE_ISP_DDR_WORD_BYTES); me->size = hor_size + ver_size; - me->data_ptr =hmm_alloc (me->size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + me->data_ptr =hmm_alloc (me->size);if (me->data_ptr == mmgr_NULL) goto err; me->hor_size = hor_size;
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +1 -1
@@ -294,7 +294,7 @@ ia_css_isp_dvs2_statistics_allocate( * grid->aligned_height *IA_CSS_DVS2_NUM_COEF_TYPES ; me->size =2 * size; - me->data_ptr =hmm_alloc (me->size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + me->data_ptr =hmm_alloc (me->size);if (me->data_ptr == mmgr_NULL) goto err; me->hor_proj = me->data_ptr;
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +1 -2
@@ -728,8 +728,7 @@ static int frame_allocate_buffer_data(struct ia_css_frame *frame)#ifdef ISP2401 IA_CSS_ENTER_LEAVE_PRIVATE ("frame->data_bytes=%d\n" , frame->data_bytes);#endif - frame->data =hmm_alloc (frame->data_bytes, -HMM_BO_PRIVATE ,0 ,NULL ,0 ); + frame->data =hmm_alloc (frame->data_bytes);if (frame->data == mmgr_NULL)return -ENOMEM ;return 0 ;
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +1 -1
@@ -131,7 +131,7 @@ ia_css_isp_param_allocate_isp_parameters( goto cleanup; }if (pclass !=IA_CSS_PARAM_CLASS_PARAM ) { - css_params->params[pclass][mem].address =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + css_params->params[pclass][mem].address =hmm_alloc (size);if (!css_params->params[pclass][mem].address) { err = -ENOMEM ; goto cleanup;
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +1 -2
@@ -285,8 +285,7 @@ void ia_css_rmgr_acq_vbuf(struct ia_css_rmgr_vbuf_pool *pool, }if (new_handle->vptr ==0x0 ) {/* we need to allocate */ - new_handle->vptr =hmm_alloc (new_handle->size, -HMM_BO_PRIVATE ,0 ,NULL ,0 ); + new_handle->vptr =hmm_alloc (new_handle->size); }else {/* we popped a buffer */ *handle = new_handle;
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +1 -1
@@ -64,7 +64,7 @@ int ia_css_spctrl_load_fw(sp_ID_t sp_id, ia_css_spctrl_cfg *spctrl_cfg)* Data used to be stored separately, because of access alignment constraints, * fix the FW generation instead */ - code_addr =hmm_alloc (spctrl_cfg->code_size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + code_addr =hmm_alloc (spctrl_cfg->code_size);if (code_addr == mmgr_NULL)return -ENOMEM ;hmm_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size);
drivers/staging/media/atomisp/pci/sh_css_firmware.c +1 -1
@@ -369,7 +369,7 @@ void sh_css_unload_firmware(void)ia_css_ptr sh_css_load_blob (const unsigned char *blob,unsigned int size) { -ia_css_ptr target_addr =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); +ia_css_ptr target_addr =hmm_alloc (size);/* * this will allocate memory aligned to a DDR word boundary which * is required for the CSS DMA to read the instructions.
drivers/staging/media/atomisp/pci/sh_css_params.c +14 -23
@@ -2074,8 +2074,7 @@ static bool realloc_isp_css_mm_buf(size_t *curr_size, size_t needed_size, bool force, - int *err, - uint16_t mmgr_attribute) + int *err) { s32 id;
@@ -2097,11 +2096,7 @@ static bool realloc_isp_css_mm_buf( id =IA_CSS_REFCOUNT_PARAM_BUFFER ;ia_css_refcount_decrement (id, *curr_buf); - *curr_buf =ia_css_refcount_increment (id,hmm_alloc (needed_size, -HMM_BO_PRIVATE ,0 , -NULL , - mmgr_attribute)); - + *curr_buf =ia_css_refcount_increment (id,hmm_alloc (needed_size));if (!*curr_buf) { *err = -ENOMEM ; *curr_size =0 ;
@@ -2124,7 +2119,7 @@ static bool reallocate_buffer(IA_CSS_ENTER_PRIVATE ("void" ); ret =realloc_isp_css_mm_buf (curr_buf, - curr_size, needed_size, force, err,0 ); + curr_size, needed_size, force, err);IA_CSS_LEAVE_PRIVATE ("ret=%d" , ret);return ret;
@@ -2163,7 +2158,7 @@ ia_css_isp_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid) me->hmem_size =CEIL_MUL (me->hmem_size,HIVE_ISP_DDR_WORD_BYTES ); me->size = me->dmem_size + me->vmem_size *2 + me->hmem_size; - me->data_ptr =hmm_alloc (me->size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + me->data_ptr =hmm_alloc (me->size);if (me->data_ptr == mmgr_NULL) {kvfree (me); me =NULL ;
@@ -2213,7 +2208,7 @@ ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info) md->info = *metadata_info; md->exp_id =0 ; - md->address =hmm_alloc (metadata_info->size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); + md->address =hmm_alloc (metadata_info->size);if (md->address == mmgr_NULL) goto error;
@@ -2366,13 +2361,13 @@ sh_css_create_isp_params(struct ia_css_stream *stream, ddr_ptrs_size->isp_param = params_size; ddr_ptrs->isp_param =ia_css_refcount_increment (IA_CSS_REFCOUNT_PARAM_BUFFER , -hmm_alloc (params_size,HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (params_size)); succ &= (ddr_ptrs->isp_param != mmgr_NULL); ddr_ptrs_size->macc_tbl =sizeof (struct ia_css_macc_table ); ddr_ptrs->macc_tbl =ia_css_refcount_increment (IA_CSS_REFCOUNT_PARAM_BUFFER , -hmm_alloc (sizeof (struct ia_css_macc_table ),HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (sizeof (struct ia_css_macc_table ))); succ &= (ddr_ptrs->macc_tbl != mmgr_NULL); *isp_params_out = params;
@@ -2586,12 +2581,10 @@ sh_css_params_init(void)for (i =0 ; i <SH_CSS_MAX_STAGES ; i++) { xmem_sp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 , -hmm_alloc (sizeof (struct sh_css_sp_stage ), -HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (sizeof (struct sh_css_sp_stage ))); xmem_isp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 , -hmm_alloc (sizeof (struct sh_css_sp_stage ), -HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (sizeof (struct sh_css_sp_stage )));if ((xmem_sp_stage_ptrs[p][i] == mmgr_NULL) || (xmem_isp_stage_ptrs[p][i] == mmgr_NULL)) {
@@ -2612,11 +2605,9 @@ sh_css_params_init(void) sp_ddr_ptrs =ia_css_refcount_increment (-1 ,hmm_alloc (CEIL_MUL (sizeof (struct sh_css_ddr_address_map ), -HIVE_ISP_DDR_WORD_BYTES ), -HMM_BO_PRIVATE ,0 ,NULL ,0 )); +HIVE_ISP_DDR_WORD_BYTES ))); xmem_sp_group_ptrs =ia_css_refcount_increment (-1 , -hmm_alloc (sizeof (struct sh_css_sp_group ), -HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (sizeof (struct sh_css_sp_group )));if ((sp_ddr_ptrs == mmgr_NULL) || (xmem_sp_group_ptrs == mmgr_NULL)) {
@@ -2671,7 +2662,7 @@ int ia_css_pipe_set_bci_scaler_lut(struct ia_css_pipe *pipe, }if (!stream_started) { - pipe->scaler_pp_lut =hmm_alloc (sizeof (zoom_table),HMM_BO_PRIVATE ,0 ,NULL ,0 ); + pipe->scaler_pp_lut =hmm_alloc (sizeof (zoom_table));if (pipe->scaler_pp_lut == mmgr_NULL) { ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR,
@@ -2713,7 +2704,7 @@ int sh_css_params_map_and_store_default_gdc_lut(void)host_lut_store ((void *)zoom_table); - default_gdc_lut =hmm_alloc (sizeof (zoom_table),HMM_BO_PRIVATE ,0 ,NULL ,0 ); + default_gdc_lut =hmm_alloc (sizeof (zoom_table));if (default_gdc_lut == mmgr_NULL)return -ENOMEM ;
@@ -3808,7 +3799,7 @@ static int write_ia_css_isp_parameter_set_info_to_ddr(assert (out); *out =ia_css_refcount_increment (IA_CSS_REFCOUNT_PARAM_SET_POOL , -hmm_alloc (sizeof (struct ia_css_isp_parameter_set_info ),HMM_BO_PRIVATE ,0 ,NULL ,0 )); +hmm_alloc (sizeof (struct ia_css_isp_parameter_set_info ))); succ = (*out != mmgr_NULL);if (succ) hmm_store(*out,
Signature · 1 line
2.36.0
PATCH v2 30/40 media: atomisp: drop highmem var/arg from the hmm code
In reply to Hans de Goedehighmem is always false, drop it.
--- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 ++---- drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 13 +++---------- 3 files changed, 6 insertions(+), 15 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +2 -4
@@ -130,7 +130,6 @@ struct hmm_buffer_object {struct mutex mutex;enum hmm_bo_type type;struct hmm_page_object *page_obj;/* physical pages */ -int from_highmem;int mmap_count;int status;int mem_type;
@@ -214,13 +213,12 @@ void hmm_bo_unref(struct hmm_buffer_object *bo);int hmm_bo_allocated (struct hmm_buffer_object *bo);/* -* allocate/free physical pages for the bo. will try to alloc mem -* from highmem if from_highmem is set, and type indicate that the +* Allocate/Free physical pages for the bo. Type indicates if the * pages will be allocated by using video driver (for share buffer) * or by ISP driver itself. */ int hmm_bo_alloc_pages (struct hmm_buffer_object *bo, -enum hmm_bo_type type,int from_highmem, +enum hmm_bo_type type,const void __user *userptr);void hmm_bo_free_pages (struct hmm_buffer_object *bo);int hmm_bo_page_allocated (struct hmm_buffer_object *bo);
drivers/staging/media/atomisp/pci/hmm/hmm.c +1 -1
@@ -192,7 +192,7 @@ static ia_css_ptr __hmm_alloc(size_t bytes, enum hmm_bo_type type, const void __ }/* Allocate pages for memory */ - ret =hmm_bo_alloc_pages (bo, type, false, userptr); + ret =hmm_bo_alloc_pages (bo, type, userptr);if (ret) {dev_err (atomisp_dev,"hmm_bo_alloc_pages failed.\n" ); goto alloc_page_err;
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +3 -10
@@ -650,8 +650,7 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo, }/*Allocate pages which will be used only by ISP*/ -static int alloc_private_pages (struct hmm_buffer_object *bo, -int from_highmem) +static int alloc_private_pages (struct hmm_buffer_object *bo) {int ret;unsigned int pgnr, order, blk_pgnr, alloc_pgnr;
@@ -662,9 +661,6 @@ static int alloc_private_pages(struct hmm_buffer_object *bo,bool reduce_order = false;bool lack_mem = true; -if (from_highmem) - gfp |= __GFP_HIGHMEM; - pgnr = bo->pgnr; bo->page_obj = kmalloc_array(pgnr, sizeof(struct hmm_page_object),
@@ -881,9 +877,6 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,* type indicate where are the pages from. currently we have 3 types * of memory: HMM_BO_PRIVATE, HMM_BO_USER, HMM_BO_SHARE. * -* from_highmem is only valid when type is HMM_BO_PRIVATE, it will -* try to alloc memory from highmem if from_highmem is set. -* * userptr is only valid when type is HMM_BO_USER, it indicates * the start address from user space task. *
@@ -891,7 +884,7 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,* HMM_BO_SHARE. */ int hmm_bo_alloc_pages (struct hmm_buffer_object *bo, -enum hmm_bo_type type,int from_highmem, +enum hmm_bo_type type,const void __user *userptr) {int ret = -EINVAL ;
@@ -906,7 +899,7 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo,* add HMM_BO_USER type */ if (type ==HMM_BO_PRIVATE ) { - ret =alloc_private_pages (bo, from_highmem); + ret =alloc_private_pages (bo); }else if (type ==HMM_BO_USER ) { ret =alloc_user_pages (bo, userptr); }else {
Signature · 1 line
2.36.0
PATCH v2 31/40 media: atomisp: drop HMM_BO_SHARE type
In reply to Hans de GoedeHMM_BO_SHARE is not supported by the hmm_bo code at all, drop it.
--- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 1 - drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -1
@@ -76,7 +76,6 @@enum hmm_bo_type {HMM_BO_PRIVATE , -HMM_BO_SHARE ,HMM_BO_USER ,HMM_BO_LAST , };
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +1 -4
@@ -875,13 +875,10 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,* allocate/free physical pages for the bo. * * type indicate where are the pages from. currently we have 3 types -* of memory: HMM_BO_PRIVATE, HMM_BO_USER, HMM_BO_SHARE. +* of memory: HMM_BO_PRIVATE, HMM_BO_USER. * * userptr is only valid when type is HMM_BO_USER, it indicates * the start address from user space task. -* -* from_highmem and userptr will both be ignored when type is -* HMM_BO_SHARE. */ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo, enum hmm_bo_type type,
Signature · 1 line
2.36.0
PATCH v2 32/40 media: atomisp: remove hmm_page_object
In reply to Hans de Goedehmm_page_object only stores a struct page pointer, so we can just use the hmm_bo.pages page pointer array everywhere.
--- .../media/atomisp/include/hmm/hmm_bo.h | 5 -- drivers/staging/media/atomisp/pci/hmm/hmm.c | 8 +- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 79 +++++-------------- 3 files changed, 22 insertions(+), 70 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -5
@@ -114,10 +114,6 @@ struct hmm_bo_device {struct kmem_cache *bo_cache; }; -struct hmm_page_object { -struct page *page; -}; -struct hmm_buffer_object {struct hmm_bo_device *bdev;struct list_head list;
@@ -128,7 +124,6 @@ struct hmm_buffer_object {/* mutex protecting this BO */ struct mutex mutex;enum hmm_bo_type type; -struct hmm_page_object *page_obj;/* physical pages */ int mmap_count;int status;int mem_type;
drivers/staging/media/atomisp/pci/hmm/hmm.c +4 -4
@@ -295,7 +295,7 @@ static int load_and_flush_by_kmap(ia_css_ptr virt, void *data, idx = (virt - bo->start) >>PAGE_SHIFT ; offset = (virt - bo->start) - (idx <<PAGE_SHIFT ); - src = (char *)kmap_local_page (bo->page_obj[idx].page) + offset; + src = (char *)kmap_local_page (bo->pages[idx]) + offset;if ((bytes + offset) >=PAGE_SIZE ) { len =PAGE_SIZE - offset;
@@ -427,7 +427,7 @@ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes) idx = (virt - bo->start) >>PAGE_SHIFT ; offset = (virt - bo->start) - (idx <<PAGE_SHIFT ); - des = (char *)kmap_local_page (bo->page_obj[idx].page); + des = (char *)kmap_local_page (bo->pages[idx]);if (!des) { dev_err(atomisp_dev,
@@ -498,7 +498,7 @@ int hmm_set(ia_css_ptr virt, int c, unsigned int bytes) idx = (virt - bo->start) >>PAGE_SHIFT ; offset = (virt - bo->start) - (idx <<PAGE_SHIFT ); - des = (char *)kmap_local_page (bo->page_obj[idx].page) + offset; + des = (char *)kmap_local_page (bo->pages[idx]) + offset;if ((bytes + offset) >=PAGE_SIZE ) { len =PAGE_SIZE - offset;
@@ -537,7 +537,7 @@ phys_addr_t hmm_virt_to_phys(ia_css_ptr virt) idx = (virt - bo->start) >>PAGE_SHIFT ; offset = (virt - bo->start) - (idx <<PAGE_SHIFT ); -return page_to_phys (bo->page_obj[idx].page) + offset; +return page_to_phys (bo->pages[idx]) + offset; }int hmm_mmap (struct vm_area_struct *vma,ia_css_ptr virt)
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +18 -61
205 lines not on this page · raw message
Signature · 1 line
2.36.0
PATCH v2 33/40 media: atomisp: fix __get_frame_info() error handling
In reply to Hans de GoedeOn ia_css_pipe_get_info() errors, destroy both the streams as well as the pipes which were created.
--- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +3 -1
@@ -2653,7 +2653,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd, &p_info);if (ret) {dev_err (isp->dev,"can't get info from pipe\n" ); - goto stream_err; + goto get_info_err; }switch (type) {
@@ -2684,6 +2684,8 @@ static int __get_frame_info(struct atomisp_sub_device *asd,return 0 ; +get_info_err: +__destroy_streams (asd, true); stream_err:__destroy_pipes (asd, true);return -EINVAL ;
Signature · 1 line
2.36.0
PATCH v2 34/40 media: atomisp: add error checking to atomisp_create_pipes_stream()
In reply to Hans de GoedeThe functions called by atomisp_create_pipes_stream() can fail, add error checking for them.
--- .../media/atomisp/pci/atomisp_compat.h | 2 +- .../media/atomisp/pci/atomisp_compat_css20.c | 20 ++++++++++++++++--- .../staging/media/atomisp/pci/atomisp_ioctl.c | 13 ++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat.h +1 -1
@@ -240,7 +240,7 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,unsigned int metadata_width, unsigned int metadata_height); -void atomisp_create_pipes_stream (struct atomisp_sub_device *asd); +int atomisp_create_pipes_stream (struct atomisp_sub_device *asd);void atomisp_destroy_pipes_stream_force (struct atomisp_sub_device *asd); void atomisp_css_stop(struct atomisp_sub_device *asd,
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +17 -3
@@ -785,10 +785,24 @@ static int __create_pipes(struct atomisp_sub_device *asd)return -EINVAL ; } -void atomisp_create_pipes_stream (struct atomisp_sub_device *asd) +int atomisp_create_pipes_stream (struct atomisp_sub_device *asd) { -__create_pipes (asd); -__create_streams (asd); +int ret; + + ret =__create_pipes (asd); +if (ret) { +dev_err (asd->isp->dev,"create pipe failed %d.\n" , ret); +return ret; + } + + ret =__create_streams (asd); +if (ret) { +dev_warn (asd->isp->dev,"create stream failed %d.\n" , ret); +__destroy_pipes (asd, true); +return ret; + } + +return 0 ; }int atomisp_css_update_stream (struct atomisp_sub_device *asd)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +11 -2
@@ -2267,8 +2267,17 @@ int __atomisp_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)dev_err (isp->dev,"atomisp_reset" );atomisp_reset (isp);for (i =0 ; i < isp->num_of_streams; i++) { -if (recreate_streams[i]) -atomisp_create_pipes_stream (&isp->asd[i]); +if (recreate_streams[i]) { +int ret2; + + ret2 =atomisp_create_pipes_stream (&isp->asd[i]); +if (ret2) { +dev_err (isp->dev,"%s error re-creating streams: %d\n" , + __func__, ret2); +if (!ret) + ret = ret2; + } + } } isp->isp_timeout = false; }
Signature · 1 line
2.36.0
PATCH v2 35/40 media: atomisp: add error logging to atomisp_destroy_pipes_stream_force()
In reply to Hans de Goede__destroy_streams() and __destroy_pipes() may return an error. Log a warning when either of them fails.
--- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +5 -2
@@ -581,8 +581,11 @@ static int __destroy_pipes(struct atomisp_sub_device *asd, bool force)void atomisp_destroy_pipes_stream_force (struct atomisp_sub_device *asd) { -__destroy_streams (asd, true); -__destroy_pipes (asd, true); +if (__destroy_streams (asd, true)) +dev_warn (asd->isp->dev,"destroy stream failed.\n" ); + +if (__destroy_pipes (asd, true)) +dev_warn (asd->isp->dev,"destroy pipe failed.\n" ); } static void __apply_additional_pipe_config(
Signature · 1 line
2.36.0
PATCH v2 36/40 media: atomisp: use atomisp_create_pipes_stream() in more places
In reply to Hans de GoedeUse atomisp_create_pipes_stream() in 2 more places, instead of open coding it.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +4 -24
@@ -810,7 +810,6 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd)int atomisp_css_update_stream (struct atomisp_sub_device *asd) { -int ret;struct atomisp_device *isp = asd->isp;if (__destroy_streams (asd, true))
@@ -819,20 +818,7 @@ int atomisp_css_update_stream(struct atomisp_sub_device *asd)if (__destroy_pipes (asd, true))dev_warn (isp->dev,"destroy pipe failed.\n" ); - ret =__create_pipes (asd); -if (ret) { -dev_err (isp->dev,"create pipe failed %d.\n" , ret); -return -EIO ; - } - - ret =__create_streams (asd); -if (ret) { -dev_warn (isp->dev,"create stream failed %d.\n" , ret); -__destroy_pipes (asd, true); -return -EIO ; - } - -return 0 ; +return atomisp_create_pipes_stream (asd); }int atomisp_css_init (struct atomisp_device *isp)
@@ -1150,15 +1136,9 @@ int atomisp_css_start(struct atomisp_sub_device *asd,* recreated in the next stream on. */ if (!asd->stream_prepared) { -if (__create_pipes (asd)) { -dev_err (isp->dev,"create pipe error.\n" ); -return -EINVAL ; - } -if (__create_streams (asd)) { -dev_err (isp->dev,"create stream error.\n" ); - ret = -EINVAL ; - goto stream_err; - } + ret =atomisp_create_pipes_stream (asd); +if (ret) +return ret; }/* * SP can only be started one time
Signature · 1 line
2.36.0
PATCH v2 37/40 media: atomisp: use atomisp_css_update_stream() in more places
In reply to Hans de GoedeUse atomisp_css_update_stream() in 2 more places,
instead of open coding it.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 37 +++---------------- 1 file changed, 6 insertions(+), 31 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +6 -31
@@ -1105,21 +1105,10 @@ int atomisp_css_start(struct atomisp_sub_device *asd,int ret =0 , i =0 ;if (in_reset) { -if (__destroy_streams (asd, true)) -dev_warn (isp->dev,"destroy stream failed.\n" ); - -if (__destroy_pipes (asd, true)) -dev_warn (isp->dev,"destroy pipe failed.\n" ); + ret =atomisp_css_update_stream (asd); +if (ret) +return ret; -if (__create_pipes (asd)) { -dev_err (isp->dev,"create pipe error.\n" ); -return -EINVAL ; - } -if (__create_streams (asd)) { -dev_err (isp->dev,"create stream error.\n" ); - ret = -EINVAL ; - goto stream_err; - }/* Invalidate caches. FIXME: should flush only necessary buffers */ wbinvd (); }
@@ -1178,7 +1167,6 @@ int atomisp_css_start(struct atomisp_sub_device *asd, start_err:__destroy_streams (asd, true); -stream_err:__destroy_pipes (asd, true);/* css 2.0 API limitation: ia_css_stop_sp() could be only called after
@@ -2630,21 +2618,9 @@ static int __get_frame_info(struct atomisp_sub_device *asd,struct ia_css_pipe_info p_info;/* FIXME! No need to destroy/recreate all streams */ -if (__destroy_streams (asd, true)) -dev_warn (isp->dev,"destroy stream failed.\n" ); - -if (__destroy_pipes (asd, true)) -dev_warn (isp->dev,"destroy pipe failed.\n" ); - -if (__create_pipes (asd)) { -dev_err (isp->dev,"can't create pipes\n" ); -return -EINVAL ; - } - -if (__create_streams (asd)) { -dev_err (isp->dev,"can't create streams\n" ); - goto stream_err; - } + ret =atomisp_css_update_stream (asd); +if (ret) +return ret; ret =ia_css_pipe_get_info (asd->stream_env[stream_index].pipes[pipe_id], &p_info);
@@ -2683,7 +2659,6 @@ static int __get_frame_info(struct atomisp_sub_device *asd, get_info_err:__destroy_streams (asd, true); -stream_err:__destroy_pipes (asd, true);return -EINVAL ; }
Signature · 1 line
2.36.0
PATCH v2 38/40 media: atomisp: use atomisp_destroy_pipes_stream_force() in more places
In reply to Hans de GoedeUse atomisp_destroy_pipes_stream_force() in 4 more places, instead of open coding it.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +5 -19
@@ -810,14 +810,7 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd)int atomisp_css_update_stream (struct atomisp_sub_device *asd) { -struct atomisp_device *isp = asd->isp; - -if (__destroy_streams (asd, true)) -dev_warn (isp->dev,"destroy stream failed.\n" ); - -if (__destroy_pipes (asd, true)) -dev_warn (isp->dev,"destroy pipe failed.\n" ); - +atomisp_destroy_pipes_stream_force (asd);return atomisp_create_pipes_stream (asd); }
@@ -1166,8 +1159,7 @@ int atomisp_css_start(struct atomisp_sub_device *asd,return 0 ; start_err: -__destroy_streams (asd, true); -__destroy_pipes (asd, true); +atomisp_destroy_pipes_stream_force (asd);/* css 2.0 API limitation: ia_css_stop_sp() could be only called after * destroy all pipes
@@ -2072,13 +2064,8 @@ void atomisp_css_stop(struct atomisp_sub_device *asd,unsigned long irqflags;unsigned int i; -/* if is called in atomisp_reset(), force destroy stream */ -if (__destroy_streams (asd, true)) -dev_err (isp->dev,"destroy stream failed.\n" ); - -/* if is called in atomisp_reset(), force destroy all pipes */ -if (__destroy_pipes (asd, true)) -dev_err (isp->dev,"destroy pipes failed.\n" ); +/* if is called in atomisp_reset(), force destroy streams and pipes */ +atomisp_destroy_pipes_stream_force (asd);atomisp_init_raw_buffer_bitmap (asd);
@@ -2658,8 +2645,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd,return 0 ; get_info_err: -__destroy_streams (asd, true); -__destroy_pipes (asd, true); +atomisp_destroy_pipes_stream_force (asd);return -EINVAL ; }
Signature · 1 line
2.36.0
PATCH v2 39/40 media: atomisp: remove force argument from __destroy_[stream[s]|pipe[s]]()
In reply to Hans de GoedeThe force argument to the __destroy_pipe[s]() and __destroy_stream[s]() functions is always true. Remove the argument and remove the code necessary to handle the false case.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +11 -23
@@ -418,24 +418,14 @@ static void __dump_stream_config(struct atomisp_sub_device *asd, }static int __destroy_stream (struct atomisp_sub_device *asd, -struct atomisp_stream_env *stream_env,bool force) +struct atomisp_stream_env *stream_env) {struct atomisp_device *isp = asd->isp; -int i;unsigned long timeout;if (!stream_env->stream)return 0 ; -if (!force) { -for (i =0 ; i <IA_CSS_PIPE_ID_NUM ; i++) -if (stream_env->update_pipe[i]) -break ; - -if (i ==IA_CSS_PIPE_ID_NUM ) -return 0 ; - } -if (stream_env->stream_state ==CSS_STREAM_STARTED &&ia_css_stream_stop (stream_env->stream) !=0 ) {dev_err (isp->dev,"stop stream failed.\n" );
@@ -469,12 +459,12 @@ static int __destroy_stream(struct atomisp_sub_device *asd,return 0 ; } -static int __destroy_streams (struct atomisp_sub_device *asd,bool force) +static int __destroy_streams (struct atomisp_sub_device *asd) {int ret, i;for (i =0 ; i <ATOMISP_INPUT_STREAM_NUM ; i++) { - ret =__destroy_stream (asd, &asd->stream_env[i], force); + ret =__destroy_stream (asd, &asd->stream_env[i]);if (ret)return ret; }
@@ -529,21 +519,19 @@ static int __create_streams(struct atomisp_sub_device *asd)return 0 ; rollback:for (i--; i >=0 ; i--) -__destroy_stream (asd, &asd->stream_env[i], true); +__destroy_stream (asd, &asd->stream_env[i]);return ret; }static int __destroy_stream_pipes (struct atomisp_sub_device *asd, -struct atomisp_stream_env *stream_env, -bool force) +struct atomisp_stream_env *stream_env) {struct atomisp_device *isp = asd->isp;int ret =0 ;int i;for (i =0 ; i <IA_CSS_PIPE_ID_NUM ; i++) { -if (!stream_env->pipes[i] || - !(force || stream_env->update_pipe[i])) +if (!stream_env->pipes[i])continue ;if (ia_css_pipe_destroy (stream_env->pipes[i]) !=0 ) {
@@ -557,7 +545,7 @@ static int __destroy_stream_pipes(struct atomisp_sub_device *asd,return ret; } -static int __destroy_pipes (struct atomisp_sub_device *asd,bool force) +static int __destroy_pipes (struct atomisp_sub_device *asd) {struct atomisp_device *isp = asd->isp;int i;
@@ -571,7 +559,7 @@ static int __destroy_pipes(struct atomisp_sub_device *asd, bool force)continue ; } - ret =__destroy_stream_pipes (asd, &asd->stream_env[i], force); + ret =__destroy_stream_pipes (asd, &asd->stream_env[i]);if (ret)return ret; }
@@ -581,10 +569,10 @@ static int __destroy_pipes(struct atomisp_sub_device *asd, bool force)void atomisp_destroy_pipes_stream_force (struct atomisp_sub_device *asd) { -if (__destroy_streams (asd, true)) +if (__destroy_streams (asd))dev_warn (asd->isp->dev,"destroy stream failed.\n" ); -if (__destroy_pipes (asd, true)) +if (__destroy_pipes (asd))dev_warn (asd->isp->dev,"destroy pipe failed.\n" ); }
@@ -801,7 +789,7 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd) ret =__create_streams (asd);if (ret) {dev_warn (asd->isp->dev,"create stream failed %d.\n" , ret); -__destroy_pipes (asd, true); +__destroy_pipes (asd);return ret; }
Signature · 1 line
2.36.0
PATCH v2 40/40 media: atomisp: Add a notes.txt file
In reply to Hans de GoedeAdd a files documenting what I've learned about the driver while working on various cleanups.
--- drivers/staging/media/atomisp/notes.txt | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 drivers/staging/media/atomisp/notes.txt
drivers/staging/media/atomisp/notes.txt new file +30 -0
@@ -0,0 +1,30 @@ +Some notes about the working of the atomisp drivers (learned while working +on cleaning it up). + +The atomisp seems to be a generic DSP(ISP) like processor without a fixed +pipeline. It does not have its own memory, but instead uses main memory. +The ISP has its own address-space and main memory needs to be mapped into +its address space through the ISP's MMU. + +Memory is allocated by the hmm code. hmm_alloc() returns an ISP virtual +address. The hmm code keeps a list of all allocations and when necessary +the hmm code finds the backing hmm-buffer-object (hmm_bo) by looking +up the hmm_bo based on the ISP virtual address. + +The actual processing pipeline is made by loading one or more programs, +called binaries. The shisp_240??0_v21.bin firmware file contains many +different binaries. Binaries are picked by filling a ia_css_binary_descr +struct with various input and output parameters and then calling +ia_css_binary_find(). Some binaries support creating multiple outputs +(preview + video frame?) at the same time. + +For example for the /dev/video0 preview node load_preview_binaries() +from atomisp/pci/sh_css.c is called and then loads a preview and +optionally a scalar binary. Note when digital zoom is disabled +(it is enabled by default) only the preview binary is loaded. +So in this case a single binary handles the entire pipeline. + +Since getting a picture requires multiple processing steps, +this means that unlike in fixed pipelines the soft pipelines +on the ISP can do multiple processing steps in a single pipeline +element (in a single binary).
Signature · 1 line
2.36.0
Hi,
Quoted 8 lines · Hans de Goede
Hi All,
Here is v2 of my atomisp hmm (and other) cleanups series. As mentioned in the coverletter of v1, this is part of slowly working towards porting the code to videobuf2 to add/fix mmap support.
v2 addresses a few small remarks from Andy and adds Andy's Reviewed-by to all the patches, thank you Andy!
Note I just noticed that this applies on top of
this series:
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
Which I've been carrying in my tree after testing it, assuming that it would get merged soon.
Regards,
Hans
Quoted 97 lines
Hans de Goede (40):
media: atomisp: remove the unusedRAW_BUF_STRIDEmacro
media: atomisp: remove unused ia_css_frame_allocate_contiguous*()
functions
media: atomisp: drop contiguous argument from
ia_css_frame_allocate_with_buffer_size()
media: atomisp: drop contiguous argument from
frame_allocate_with_data()
media: atomisp: drop contiguous argument fromframe_create()
media: atomisp: dropIA_CSS_FRAME_FORMAT_MIPIsupport from
ia_css_frame_init_planes()
media: atomisp: drop contiguous flag from structia_css_frame
media: atomisp: dropATOMISP_MAP_FLAG_CONTIGUOUS
media: atomisp: remove hmm_pool_[un]register()
media: atomisp: remove dynamic and reserved pool code
media: atomisp: remove hmm pool code
media: atomisp: removehmm_mem_stats
media: atomisp: remove pool related kernel cmdline options
media: atomisp: remove unused attribute argument fromia_css_frame_map() media: atomisp: drop hmm_page_type media: atomisp: removed unused hmm_bo_get_page_info() function media: atomisp: remove bogus comment above hmm_bo_allocated() prototype media: atomisp: remove private acceleration ioctls media: atomisp: remove atomisp_acc.c media: atomisp: remove unused atomisp_*css_* functions media: atomisp: asc.acc.pipeline is always NULL media: atomisp: remove no longer used atomisp_css_acc_done() function media: atomisp: remove atomisp_is_acc_enabled() media: atomisp: drop unused ATOMISP_ACC_FW_LOAD_* defines media: atomisp: drop ATOMISP_MAP_FLAG_CLEARED media: atomisp: drop unused ATOMISP_MAP_FLAG_* flags media: atomisp: remove unused hmm address translation functions media: atomisp: add hmm_create_from_userdata() helper media: atomisp: Simplify hmm_alloc() calls media: atomisp: drop highmem var/arg from the hmm code media: atomisp: drop HMM_BO_SHARE type media: atomisp: remove hmm_page_object media: atomisp: fix __get_frame_info() error handling media: atomisp: add error checking to atomisp_create_pipes_stream() media: atomisp: add error logging to atomisp_destroy_pipes_stream_force() media: atomisp: use atomisp_create_pipes_stream() in more places media: atomisp: use atomisp_css_update_stream() in more places media: atomisp: use atomisp_destroy_pipes_stream_force() in more places media: atomisp: remove force argument from __destroy_[stream[s]|pipe[s]]()media: atomisp: Add a notes.txt file
drivers/staging/media/atomisp/Makefile | 3 - .../staging/media/atomisp/include/hmm/hmm.h | 32 +- .../media/atomisp/include/hmm/hmm_bo.h | 37 +- .../media/atomisp/include/hmm/hmm_common.h | 26 - .../media/atomisp/include/hmm/hmm_pool.h | 116 ---- .../media/atomisp/include/linux/atomisp.h | 146 ---- drivers/staging/media/atomisp/notes.txt | 30 + .../staging/media/atomisp/pci/atomisp_acc.c | 625 ------------------ .../staging/media/atomisp/pci/atomisp_acc.h | 120 ---- .../staging/media/atomisp/pci/atomisp_cmd.c | 33 +- .../media/atomisp/pci/atomisp_compat.h | 29 +- .../media/atomisp/pci/atomisp_compat_css20.c | 365 ++-------- .../atomisp/pci/atomisp_compat_ioctl32.h | 58 -- .../staging/media/atomisp/pci/atomisp_drvfs.c | 7 +- .../staging/media/atomisp/pci/atomisp_fops.c | 13 - .../staging/media/atomisp/pci/atomisp_ioctl.c | 73 +- .../staging/media/atomisp/pci/atomisp_ioctl.h | 1 - .../media/atomisp/pci/atomisp_subdev.c | 3 - .../media/atomisp/pci/atomisp_subdev.h | 10 - .../staging/media/atomisp/pci/atomisp_v4l2.c | 32 - drivers/staging/media/atomisp/pci/hmm/hmm.c | 186 +----- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 261 ++------ .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 234 ------- .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 253 ------- .../media/atomisp/pci/ia_css_frame_public.h | 40 -- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../pci/isp/modes/interface/isp_const.h | 6 - .../pci/runtime/debug/src/ia_css_debug.c | 2 - .../runtime/frame/interface/ia_css_frame.h | 7 +- .../atomisp/pci/runtime/frame/src/frame.c | 105 +-- .../pci/runtime/isp_param/src/isp_param.c | 2 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 3 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 2 +- drivers/staging/media/atomisp/pci/sh_css.c | 5 - .../media/atomisp/pci/sh_css_firmware.c | 2 +- .../staging/media/atomisp/pci/sh_css_mipi.c | 3 +- .../staging/media/atomisp/pci/sh_css_params.c | 47 +- 38 files changed, 205 insertions(+), 2716 deletions(-) delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_pool.h create mode 100644 drivers/staging/media/atomisp/notes.txt delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.h delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c