@@ -191,6 +191,23 @@ module_param(debug, int, 0644);
191
191
static void __vb2_queue_cancel (struct vb2_queue * q );
192
192
static void __enqueue_in_driver (struct vb2_buffer * vb );
193
193
194
+ static const char * vb2_state_name (enum vb2_buffer_state s )
195
+ {
196
+ static const char * const state_names [] = {
197
+ [VB2_BUF_STATE_DEQUEUED ] = "dequeued" ,
198
+ [VB2_BUF_STATE_IN_REQUEST ] = "in request" ,
199
+ [VB2_BUF_STATE_PREPARING ] = "preparing" ,
200
+ [VB2_BUF_STATE_QUEUED ] = "queued" ,
201
+ [VB2_BUF_STATE_ACTIVE ] = "active" ,
202
+ [VB2_BUF_STATE_DONE ] = "done" ,
203
+ [VB2_BUF_STATE_ERROR ] = "error" ,
204
+ };
205
+
206
+ if ((unsigned int )(s ) < ARRAY_SIZE (state_names ))
207
+ return state_names [s ];
208
+ return "unknown" ;
209
+ }
210
+
194
211
/*
195
212
* __vb2_buf_mem_alloc() - allocate video memory for the given buffer
196
213
*/
@@ -1015,8 +1032,8 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
1015
1032
*/
1016
1033
vb -> cnt_buf_done ++ ;
1017
1034
#endif
1018
- dprintk (q , 4 , "done processing on buffer %d, state: %d \n" ,
1019
- vb -> index , state );
1035
+ dprintk (q , 4 , "done processing on buffer %d, state: %s \n" ,
1036
+ vb -> index , vb2_state_name ( state ) );
1020
1037
1021
1038
if (state != VB2_BUF_STATE_QUEUED )
1022
1039
__vb2_buf_mem_finish (vb );
@@ -1490,8 +1507,8 @@ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb)
1490
1507
1491
1508
vb = q -> bufs [index ];
1492
1509
if (vb -> state != VB2_BUF_STATE_DEQUEUED ) {
1493
- dprintk (q , 1 , "invalid buffer state %d \n" ,
1494
- vb -> state );
1510
+ dprintk (q , 1 , "invalid buffer state %s \n" ,
1511
+ vb2_state_name ( vb -> state ) );
1495
1512
return - EINVAL ;
1496
1513
}
1497
1514
if (vb -> prepared ) {
@@ -1670,7 +1687,8 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb,
1670
1687
dprintk (q , 1 , "buffer still being prepared\n" );
1671
1688
return - EINVAL ;
1672
1689
default :
1673
- dprintk (q , 1 , "invalid buffer state %d\n" , vb -> state );
1690
+ dprintk (q , 1 , "invalid buffer state %s\n" ,
1691
+ vb2_state_name (vb -> state ));
1674
1692
return - EINVAL ;
1675
1693
}
1676
1694
@@ -1884,7 +1902,8 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb,
1884
1902
dprintk (q , 3 , "returning done buffer with errors\n" );
1885
1903
break ;
1886
1904
default :
1887
- dprintk (q , 1 , "invalid buffer state\n" );
1905
+ dprintk (q , 1 , "invalid buffer state %s\n" ,
1906
+ vb2_state_name (vb -> state ));
1888
1907
return - EINVAL ;
1889
1908
}
1890
1909
@@ -1915,8 +1934,8 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb,
1915
1934
media_request_put (vb -> request );
1916
1935
vb -> request = NULL ;
1917
1936
1918
- dprintk (q , 2 , "dqbuf of buffer %d, with state %d \n" ,
1919
- vb -> index , vb -> state );
1937
+ dprintk (q , 2 , "dqbuf of buffer %d, state: %s \n" ,
1938
+ vb -> index , vb2_state_name ( vb -> state ) );
1920
1939
1921
1940
return 0 ;
1922
1941
0 commit comments