Skip to content

Commit 5fbccb1

Browse files
irql-notlessorequalirql-notlessorequal
committed
i965/drv: Optimize structs within the codebase.
Supersedes 72a801d and 7da890b
1 parent 72a801d commit 5fbccb1

34 files changed

+1266
-1233
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ TAGS
3434
/src/intel_version.h
3535
/src/wayland-drm-client-protocol.h
3636
.VERSION*
37+
.vscode/settings.json

‎src/gen10_vdenc_vp9.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ static const uint32_t gen10_vdenc_vp9_dys[][4] = {
5151

5252
static struct i965_kernel vdenc_vp9_kernels_dys[1] = {
5353
{
54-
"dys",
55-
0,
56-
gen10_vdenc_vp9_dys,
57-
sizeof(gen10_vdenc_vp9_dys),
58-
NULL
54+
.name = "dys",
55+
.interface = 0,
56+
.bin = gen10_vdenc_vp9_dys,
57+
.size = sizeof(gen10_vdenc_vp9_dys),
58+
.bo = NULL
5959
},
6060
};
6161

@@ -65,11 +65,11 @@ static const uint32_t gen10_vdenc_vp9_streamin[][4] = {
6565

6666
static struct i965_kernel vdenc_vp9_kernels_streamin[1] = {
6767
{
68-
"streamin",
69-
0,
70-
gen10_vdenc_vp9_streamin,
71-
sizeof(gen10_vdenc_vp9_streamin),
72-
NULL
68+
.name = "streamin",
69+
.interface = 0,
70+
.bin = gen10_vdenc_vp9_streamin,
71+
.size = sizeof(gen10_vdenc_vp9_streamin),
72+
.bo = NULL
7373
},
7474
};
7575

‎src/gen6_mfc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ static const uint32_t gen6_mfc_batchbuffer_avc_inter[][4] = {
5656

5757
static struct i965_kernel gen6_mfc_kernels[] = {
5858
{
59-
"MFC AVC INTRA BATCHBUFFER ",
60-
MFC_BATCHBUFFER_AVC_INTRA,
61-
gen6_mfc_batchbuffer_avc_intra,
62-
sizeof(gen6_mfc_batchbuffer_avc_intra),
63-
NULL
59+
.name = "MFC AVC INTRA BATCHBUFFER ",
60+
.interface = MFC_BATCHBUFFER_AVC_INTRA,
61+
.bin = gen6_mfc_batchbuffer_avc_intra,
62+
.size = sizeof(gen6_mfc_batchbuffer_avc_intra),
63+
.bo = NULL
6464
},
6565

6666
{
67-
"MFC AVC INTER BATCHBUFFER ",
68-
MFC_BATCHBUFFER_AVC_INTER,
69-
gen6_mfc_batchbuffer_avc_inter,
70-
sizeof(gen6_mfc_batchbuffer_avc_inter),
71-
NULL
67+
.name = "MFC AVC INTER BATCHBUFFER ",
68+
.interface = MFC_BATCHBUFFER_AVC_INTER,
69+
.bin = gen6_mfc_batchbuffer_avc_inter,
70+
.size = sizeof(gen6_mfc_batchbuffer_avc_inter),
71+
.bo = NULL
7272
},
7373
};
7474

‎src/gen6_vme.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,25 @@ static const uint32_t gen6_vme_batchbuffer[][4] = {
7474

7575
static struct i965_kernel gen6_vme_kernels[] = {
7676
{
77-
"AVC VME Intra Frame",
78-
AVC_VME_INTRA_SHADER, /*index*/
79-
gen6_vme_intra_frame,
80-
sizeof(gen6_vme_intra_frame),
81-
NULL
77+
.name = "AVC VME Intra Frame",
78+
.interface = AVC_VME_INTRA_SHADER, /*index*/
79+
.bin = gen6_vme_intra_frame,
80+
.size = sizeof(gen6_vme_intra_frame),
81+
.bo = NULL
8282
},
8383
{
84-
"AVC VME inter Frame",
85-
AVC_VME_INTER_SHADER,
86-
gen6_vme_inter_frame,
87-
sizeof(gen6_vme_inter_frame),
88-
NULL
84+
.name = "AVC VME inter Frame",
85+
.interface = AVC_VME_INTER_SHADER,
86+
.bin = gen6_vme_inter_frame,
87+
.size = sizeof(gen6_vme_inter_frame),
88+
.bo = NULL
8989
},
9090
{
91-
"AVC VME BATCHBUFFER",
92-
AVC_VME_BATCHBUFFER,
93-
gen6_vme_batchbuffer,
94-
sizeof(gen6_vme_batchbuffer),
95-
NULL
91+
.name = "AVC VME BATCHBUFFER",
92+
.interface = AVC_VME_BATCHBUFFER,
93+
.bin = gen6_vme_batchbuffer,
94+
.size = sizeof(gen6_vme_batchbuffer),
95+
.bo = NULL
9696
},
9797
};
9898

‎src/gen75_mfc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ static const uint32_t gen75_mfc_batchbuffer_avc[][4] = {
6262

6363
static struct i965_kernel gen75_mfc_kernels[] = {
6464
{
65-
"MFC AVC INTRA BATCHBUFFER ",
66-
MFC_BATCHBUFFER_AVC_INTRA,
67-
gen75_mfc_batchbuffer_avc,
68-
sizeof(gen75_mfc_batchbuffer_avc),
69-
NULL
65+
.name = "MFC AVC INTRA BATCHBUFFER ",
66+
.interface = MFC_BATCHBUFFER_AVC_INTRA,
67+
.bin = gen75_mfc_batchbuffer_avc,
68+
.size = sizeof(gen75_mfc_batchbuffer_avc),
69+
.bo = NULL
7070
},
7171
};
7272

‎src/gen75_vme.c

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,32 @@ static const uint32_t gen75_vme_batchbuffer[][4] = {
7171

7272
static struct i965_kernel gen75_vme_kernels[] = {
7373
{
74-
"VME Intra Frame",
75-
VME_INTRA_SHADER, /*index*/
76-
gen75_vme_intra_frame,
77-
sizeof(gen75_vme_intra_frame),
78-
NULL
74+
.name = "VME Intra Frame",
75+
.interface = VME_INTRA_SHADER, /*index*/
76+
.bin = gen75_vme_intra_frame,
77+
.size = sizeof(gen75_vme_intra_frame),
78+
.bo = NULL
7979
},
8080
{
81-
"VME inter Frame",
82-
VME_INTER_SHADER,
83-
gen75_vme_inter_frame,
84-
sizeof(gen75_vme_inter_frame),
85-
NULL
81+
.name = "VME inter Frame",
82+
.interface = VME_INTER_SHADER,
83+
.bin = gen75_vme_inter_frame,
84+
.size = sizeof(gen75_vme_inter_frame),
85+
.bo = NULL
8686
},
8787
{
88-
"VME BATCHBUFFER",
89-
VME_BATCHBUFFER,
90-
gen75_vme_batchbuffer,
91-
sizeof(gen75_vme_batchbuffer),
92-
NULL
88+
.name = "VME BATCHBUFFER",
89+
.interface = VME_BATCHBUFFER,
90+
.bin = gen75_vme_batchbuffer,
91+
.size = sizeof(gen75_vme_batchbuffer),
92+
.bo = NULL
9393
},
9494
{
95-
"VME inter BFrame",
96-
VME_BINTER_SHADER,
97-
gen75_vme_inter_bframe,
98-
sizeof(gen75_vme_inter_bframe),
99-
NULL
95+
.name = "VME inter BFrame",
96+
.interface = VME_BINTER_SHADER,
97+
.bin = gen75_vme_inter_bframe,
98+
.size = sizeof(gen75_vme_inter_bframe),
99+
.bo = NULL
100100
}
101101
};
102102

@@ -114,25 +114,25 @@ static const uint32_t gen75_vme_mpeg2_batchbuffer[][4] = {
114114

115115
static struct i965_kernel gen75_vme_mpeg2_kernels[] = {
116116
{
117-
"VME Intra Frame",
118-
VME_INTRA_SHADER, /*index*/
119-
gen75_vme_mpeg2_intra_frame,
120-
sizeof(gen75_vme_mpeg2_intra_frame),
121-
NULL
117+
.name = "VME Intra Frame",
118+
.interface = VME_INTRA_SHADER, /*index*/
119+
.bin = gen75_vme_mpeg2_intra_frame,
120+
.size = sizeof(gen75_vme_mpeg2_intra_frame),
121+
.bo = NULL
122122
},
123123
{
124-
"VME inter Frame",
125-
VME_INTER_SHADER,
126-
gen75_vme_mpeg2_inter_frame,
127-
sizeof(gen75_vme_mpeg2_inter_frame),
128-
NULL
124+
.name = "VME inter Frame",
125+
.interface = VME_INTER_SHADER,
126+
.bin = gen75_vme_mpeg2_inter_frame,
127+
.size = sizeof(gen75_vme_mpeg2_inter_frame),
128+
.bo = NULL
129129
},
130130
{
131-
"VME BATCHBUFFER",
132-
VME_BATCHBUFFER,
133-
gen75_vme_mpeg2_batchbuffer,
134-
sizeof(gen75_vme_mpeg2_batchbuffer),
135-
NULL
131+
.name = "VME BATCHBUFFER",
132+
.interface = VME_BATCHBUFFER,
133+
.bin = gen75_vme_mpeg2_batchbuffer,
134+
.size = sizeof(gen75_vme_mpeg2_batchbuffer),
135+
.bo = NULL
136136
},
137137
};
138138

‎src/gen75_vpp_gpe.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,25 @@ static const unsigned int gen75_gpe_sharpening_unmask[][4] = {
6363
};
6464
static struct i965_kernel gen75_vpp_sharpening_kernels[] = {
6565
{
66-
"vpp: sharpening(horizontal blur)",
67-
VPP_GPE_SHARPENING,
68-
gen75_gpe_sharpening_h_blur,
69-
sizeof(gen75_gpe_sharpening_h_blur),
70-
NULL
66+
.name = "vpp: sharpening(horizontal blur)",
67+
.interface = VPP_GPE_SHARPENING,
68+
.bin = gen75_gpe_sharpening_h_blur,
69+
.size = sizeof(gen75_gpe_sharpening_h_blur),
70+
.bo = NULL
7171
},
7272
{
73-
"vpp: sharpening(vertical blur)",
74-
VPP_GPE_SHARPENING,
75-
gen75_gpe_sharpening_v_blur,
76-
sizeof(gen75_gpe_sharpening_v_blur),
77-
NULL
73+
.name = "vpp: sharpening(vertical blur)",
74+
.interface = VPP_GPE_SHARPENING,
75+
.bin = gen75_gpe_sharpening_v_blur,
76+
.size = sizeof(gen75_gpe_sharpening_v_blur),
77+
.bo = NULL
7878
},
7979
{
80-
"vpp: sharpening(unmask)",
81-
VPP_GPE_SHARPENING,
82-
gen75_gpe_sharpening_unmask,
83-
sizeof(gen75_gpe_sharpening_unmask),
84-
NULL
80+
.name = "vpp: sharpening(unmask)",
81+
.interface = VPP_GPE_SHARPENING,
82+
.bin = gen75_gpe_sharpening_unmask,
83+
.size = sizeof(gen75_gpe_sharpening_unmask),
84+
.bo = NULL
8585
},
8686
};
8787

@@ -98,25 +98,25 @@ static const unsigned int gen8_gpe_sharpening_unmask[][4] = {
9898

9999
static struct i965_kernel gen8_vpp_sharpening_kernels[] = {
100100
{
101-
"vpp: sharpening(horizontal blur)",
102-
VPP_GPE_SHARPENING,
103-
gen8_gpe_sharpening_h_blur,
104-
sizeof(gen8_gpe_sharpening_h_blur),
105-
NULL
101+
.name = "vpp: sharpening(horizontal blur)",
102+
.interface = VPP_GPE_SHARPENING,
103+
.bin = gen8_gpe_sharpening_h_blur,
104+
.size = sizeof(gen8_gpe_sharpening_h_blur),
105+
.bo = NULL
106106
},
107107
{
108-
"vpp: sharpening(vertical blur)",
109-
VPP_GPE_SHARPENING,
110-
gen8_gpe_sharpening_v_blur,
111-
sizeof(gen8_gpe_sharpening_v_blur),
112-
NULL
108+
.name = "vpp: sharpening(vertical blur)",
109+
.interface = VPP_GPE_SHARPENING,
110+
.bin = gen8_gpe_sharpening_v_blur,
111+
.size = sizeof(gen8_gpe_sharpening_v_blur),
112+
.bo = NULL
113113
},
114114
{
115-
"vpp: sharpening(unmask)",
116-
VPP_GPE_SHARPENING,
117-
gen8_gpe_sharpening_unmask,
118-
sizeof(gen8_gpe_sharpening_unmask),
119-
NULL
115+
.name = "vpp: sharpening(unmask)",
116+
.interface = VPP_GPE_SHARPENING,
117+
.bin = gen8_gpe_sharpening_unmask,
118+
.size = sizeof(gen8_gpe_sharpening_unmask),
119+
.bo = NULL
120120
},
121121
};
122122

‎src/gen7_mfc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ static const uint32_t gen7_mfc_batchbuffer_avc_inter[][4] = {
8282

8383
static struct i965_kernel gen7_mfc_kernels[] = {
8484
{
85-
"MFC AVC INTRA BATCHBUFFER ",
86-
MFC_BATCHBUFFER_AVC_INTRA,
87-
gen7_mfc_batchbuffer_avc_intra,
88-
sizeof(gen7_mfc_batchbuffer_avc_intra),
89-
NULL
85+
.name = "MFC AVC INTRA BATCHBUFFER ",
86+
.interface = MFC_BATCHBUFFER_AVC_INTRA,
87+
.bin = gen7_mfc_batchbuffer_avc_intra,
88+
.size = sizeof(gen7_mfc_batchbuffer_avc_intra),
89+
.bo = NULL
9090
},
9191

9292
{
93-
"MFC AVC INTER BATCHBUFFER ",
94-
MFC_BATCHBUFFER_AVC_INTER,
95-
gen7_mfc_batchbuffer_avc_inter,
96-
sizeof(gen7_mfc_batchbuffer_avc_inter),
97-
NULL
93+
.name = "MFC AVC INTER BATCHBUFFER ",
94+
.interface = MFC_BATCHBUFFER_AVC_INTER,
95+
.bin = gen7_mfc_batchbuffer_avc_inter,
96+
.size = sizeof(gen7_mfc_batchbuffer_avc_inter),
97+
.bo = NULL
9898
},
9999
};
100100

‎src/gen7_mfd.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ struct gen7_vc1_surface {
7575

7676
struct hw_context;
7777

78-
struct gen7_mfd_context {
78+
struct gen7_mfd_context
79+
{
7980
struct hw_context base;
8081

8182
union {
@@ -95,14 +96,15 @@ struct gen7_mfd_context {
9596
GenBuffer segmentation_buffer;
9697

9798
VASurfaceID jpeg_wa_surface_id;
98-
struct object_surface *jpeg_wa_surface_object;
99-
dri_bo *jpeg_wa_slice_data_bo;
10099

101-
unsigned int decoder_format_mode : 1;
102100
int wa_mpeg2_slice_vertical_position;
103101

102+
struct object_surface *jpeg_wa_surface_object;
103+
dri_bo *jpeg_wa_slice_data_bo;
104104
void *driver_context;
105-
} __attribute__((packed));
105+
106+
bool decoder_format_mode;
107+
};
106108

107109
static VAConfigAttrib *gen7_lookup_config_attribute(struct object_config *obj_config, VAConfigAttribType type)
108110
{

0 commit comments

Comments
 (0)