Skip to content

Commit fbf9a2f

Browse files
committed
media: staging: tegra-vde: Remove legacy UAPI support
The legacy UAPI became unnecessary with the V4L stateless decoder API support addition to the Tegra decoder driver. Remove legacy UAPI support. Signed-off-by: Dmitry Osipenko <[email protected]>
1 parent e8151cd commit fbf9a2f

File tree

6 files changed

+35
-397
lines changed

6 files changed

+35
-397
lines changed

drivers/staging/media/tegra-vde/dmabuf-cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde,
6666
struct dma_buf_attachment **ap,
6767
dma_addr_t *addrp)
6868
{
69-
struct device *dev = vde->miscdev.parent;
7069
struct dma_buf_attachment *attachment;
7170
struct tegra_vde_cache_entry *entry;
71+
struct device *dev = vde->dev;
7272
struct sg_table *sgt;
7373
struct iova *iova;
7474
int err;

drivers/staging/media/tegra-vde/h264.c

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,36 @@
1414
#include <media/v4l2-h264.h>
1515

1616
#include "trace.h"
17-
#include "uapi.h"
1817
#include "vde.h"
1918

19+
#define FLAG_B_FRAME 0x1
20+
#define FLAG_REFERENCE 0x2
21+
22+
struct tegra_vde_h264_frame {
23+
unsigned int frame_num;
24+
unsigned int flags;
25+
};
26+
27+
struct tegra_vde_h264_decoder_ctx {
28+
unsigned int dpb_frames_nb;
29+
unsigned int dpb_ref_frames_with_earlier_poc_nb;
30+
unsigned int baseline_profile;
31+
unsigned int level_idc;
32+
unsigned int log2_max_pic_order_cnt_lsb;
33+
unsigned int log2_max_frame_num;
34+
unsigned int pic_order_cnt_type;
35+
unsigned int direct_8x8_inference_flag;
36+
unsigned int pic_width_in_mbs;
37+
unsigned int pic_height_in_mbs;
38+
unsigned int pic_init_qp;
39+
unsigned int deblocking_filter_control_present_flag;
40+
unsigned int constrained_intra_pred_flag;
41+
unsigned int chroma_qp_index_offset;
42+
unsigned int pic_order_present_flag;
43+
unsigned int num_ref_idx_l0_active_minus1;
44+
unsigned int num_ref_idx_l1_active_minus1;
45+
};
46+
2047
struct h264_reflists {
2148
u8 p[V4L2_H264_NUM_DPB_ENTRIES];
2249
u8 b0[V4L2_H264_NUM_DPB_ENTRIES];
@@ -438,19 +465,8 @@ static void tegra_vde_decode_frame(struct tegra_vde *vde,
438465
vde->sxe, 0x00);
439466
}
440467

441-
int tegra_vde_validate_h264_frame(struct device *dev,
442-
struct tegra_vde_h264_frame *frame)
443-
{
444-
if (frame->frame_num > 0x7FFFFF) {
445-
dev_err(dev, "Bad frame_num %u\n", frame->frame_num);
446-
return -EINVAL;
447-
}
448-
449-
return 0;
450-
}
451-
452-
int tegra_vde_validate_h264_ctx(struct device *dev,
453-
struct tegra_vde_h264_decoder_ctx *ctx)
468+
static int tegra_vde_validate_h264_ctx(struct device *dev,
469+
struct tegra_vde_h264_decoder_ctx *ctx)
454470
{
455471
if (ctx->dpb_frames_nb == 0 || ctx->dpb_frames_nb > 17) {
456472
dev_err(dev, "Bad DPB size %u\n", ctx->dpb_frames_nb);
@@ -637,23 +653,6 @@ static int tegra_vde_decode_end(struct tegra_vde *vde)
637653
return ret;
638654
}
639655

640-
int tegra_vde_decode_h264(struct tegra_vde *vde,
641-
struct tegra_vde_h264_decoder_ctx *ctx,
642-
struct tegra_video_frame *dpb_frames,
643-
dma_addr_t bitstream_data_addr,
644-
size_t bitstream_data_size)
645-
{
646-
int err;
647-
648-
err = tegra_vde_decode_begin(vde, ctx, dpb_frames,
649-
bitstream_data_addr,
650-
bitstream_data_size);
651-
if (err)
652-
return err;
653-
654-
return tegra_vde_decode_end(vde);
655-
}
656-
657656
static struct vb2_buffer *get_ref_buf(struct tegra_ctx *ctx,
658657
struct vb2_v4l2_buffer *dst,
659658
unsigned int dpb_idx)

drivers/staging/media/tegra-vde/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void tegra_vde_iommu_unmap(struct tegra_vde *vde, struct iova *iova)
6060

6161
int tegra_vde_iommu_init(struct tegra_vde *vde)
6262
{
63-
struct device *dev = vde->miscdev.parent;
63+
struct device *dev = vde->dev;
6464
struct iova *iova;
6565
unsigned long order;
6666
unsigned long shift;

drivers/staging/media/tegra-vde/uapi.h

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)