Skip to content

Commit 82a7c94

Browse files
alexdeucheralexdeucher
committed
drm/amdgpu/jpeg: clean up reset type handling
Make the handling consistent with other IPs and across JPEG versions. Reviewed-by: Sathishkumar S <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 084300f commit 82a7c94

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

‎drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ static int jpeg_v2_0_sw_init(struct amdgpu_ip_block *ip_block)
118118
if (r)
119119
return r;
120120

121+
adev->jpeg.supported_reset =
122+
amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);
121123
if (!amdgpu_sriov_vf(adev))
122-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
124+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
123125
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
124126

125127
return r;

‎drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,10 @@ static int jpeg_v2_5_sw_init(struct amdgpu_ip_block *ip_block)
167167
if (r)
168168
return r;
169169

170+
adev->jpeg.supported_reset =
171+
amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);
170172
if (!amdgpu_sriov_vf(adev))
171-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
173+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
172174
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
173175

174176
return r;

‎drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@ static int jpeg_v3_0_sw_init(struct amdgpu_ip_block *ip_block)
132132
if (r)
133133
return r;
134134

135+
adev->jpeg.supported_reset =
136+
amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);
135137
if (!amdgpu_sriov_vf(adev))
136-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
138+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
137139
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
138140

139141
return r;

‎drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@ static int jpeg_v4_0_sw_init(struct amdgpu_ip_block *ip_block)
143143
if (r)
144144
return r;
145145

146+
adev->jpeg.supported_reset =
147+
amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);
146148
if (!amdgpu_sriov_vf(adev))
147-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
149+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
148150
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
149151

150152
return r;

‎drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,11 @@ static int jpeg_v4_0_3_sw_init(struct amdgpu_ip_block *ip_block)
216216
if (r)
217217
return r;
218218

219-
if (!amdgpu_sriov_vf(adev)) {
220-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
221-
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
222-
if (r)
223-
return r;
224-
}
219+
adev->jpeg.supported_reset =
220+
amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);
221+
if (!amdgpu_sriov_vf(adev))
222+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
223+
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
225224

226225
return 0;
227226
}
@@ -242,8 +241,7 @@ static int jpeg_v4_0_3_sw_fini(struct amdgpu_ip_block *ip_block)
242241
if (r)
243242
return r;
244243

245-
if (!amdgpu_sriov_vf(adev))
246-
amdgpu_jpeg_sysfs_reset_mask_fini(adev);
244+
amdgpu_jpeg_sysfs_reset_mask_fini(adev);
247245

248246
r = amdgpu_jpeg_sw_fini(adev);
249247

‎drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int jpeg_v4_0_5_sw_init(struct amdgpu_ip_block *ip_block)
177177
adev->jpeg.supported_reset =
178178
amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);
179179
if (!amdgpu_sriov_vf(adev))
180-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
180+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
181181
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
182182
if (r)
183183
return r;

‎drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,10 @@ static int jpeg_v5_0_0_sw_init(struct amdgpu_ip_block *ip_block)
123123
adev->jpeg.supported_reset =
124124
amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);
125125
if (!amdgpu_sriov_vf(adev))
126-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
126+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
127127
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
128-
if (r)
129-
return r;
130-
return 0;
128+
129+
return r;
131130
}
132131

133132
/**

‎drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,13 @@ static int jpeg_v5_0_1_sw_init(struct amdgpu_ip_block *ip_block)
200200
if (r)
201201
return r;
202202

203-
if (!amdgpu_sriov_vf(adev)) {
204-
adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;
205-
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
206-
if (r)
207-
return r;
208-
}
203+
adev->jpeg.supported_reset =
204+
amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);
205+
if (!amdgpu_sriov_vf(adev))
206+
adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
207+
r = amdgpu_jpeg_sysfs_reset_mask_init(adev);
209208

210-
return 0;
209+
return r;
211210
}
212211

213212
/**
@@ -226,8 +225,7 @@ static int jpeg_v5_0_1_sw_fini(struct amdgpu_ip_block *ip_block)
226225
if (r)
227226
return r;
228227

229-
if (!amdgpu_sriov_vf(adev))
230-
amdgpu_jpeg_sysfs_reset_mask_fini(adev);
228+
amdgpu_jpeg_sysfs_reset_mask_fini(adev);
231229

232230
r = amdgpu_jpeg_sw_fini(adev);
233231

0 commit comments

Comments
 (0)