File tree Expand file tree Collapse file tree 7 files changed +7
-7
lines changed
drivers/gpu/drm/amd/amdgpu Expand file tree Collapse file tree 7 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -604,7 +604,7 @@ static void jpeg_v1_0_set_irq_funcs(struct amdgpu_device *adev)
604
604
static void jpeg_v1_0_ring_begin_use (struct amdgpu_ring * ring )
605
605
{
606
606
struct amdgpu_device * adev = ring -> adev ;
607
- bool set_clocks = !cancel_delayed_work_sync (& adev -> vcn .idle_work );
607
+ bool set_clocks = !cancel_delayed_work_sync (& adev -> jpeg .idle_work );
608
608
int cnt = 0 ;
609
609
610
610
mutex_lock (& adev -> vcn .vcn1_jpeg1_workaround );
Original file line number Diff line number Diff line change @@ -150,7 +150,7 @@ static int jpeg_v2_0_hw_fini(struct amdgpu_ip_block *ip_block)
150
150
{
151
151
struct amdgpu_device * adev = ip_block -> adev ;
152
152
153
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
153
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
154
154
155
155
if (adev -> jpeg .cur_state != AMD_PG_STATE_GATE &&
156
156
RREG32_SOC15 (JPEG , 0 , mmUVD_JRBC_STATUS ))
Original file line number Diff line number Diff line change @@ -211,7 +211,7 @@ static int jpeg_v2_5_hw_fini(struct amdgpu_ip_block *ip_block)
211
211
struct amdgpu_device * adev = ip_block -> adev ;
212
212
int i ;
213
213
214
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
214
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
215
215
216
216
for (i = 0 ; i < adev -> jpeg .num_jpeg_inst ; ++ i ) {
217
217
if (adev -> jpeg .harvest_config & (1 << i ))
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ static int jpeg_v3_0_hw_fini(struct amdgpu_ip_block *ip_block)
164
164
{
165
165
struct amdgpu_device * adev = ip_block -> adev ;
166
166
167
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
167
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
168
168
169
169
if (adev -> jpeg .cur_state != AMD_PG_STATE_GATE &&
170
170
RREG32_SOC15 (JPEG , 0 , mmUVD_JRBC_STATUS ))
Original file line number Diff line number Diff line change @@ -202,7 +202,7 @@ static int jpeg_v4_0_hw_fini(struct amdgpu_ip_block *ip_block)
202
202
{
203
203
struct amdgpu_device * adev = ip_block -> adev ;
204
204
205
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
205
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
206
206
if (!amdgpu_sriov_vf (adev )) {
207
207
if (adev -> jpeg .cur_state != AMD_PG_STATE_GATE &&
208
208
RREG32_SOC15 (JPEG , 0 , regUVD_JRBC_STATUS ))
Original file line number Diff line number Diff line change @@ -227,7 +227,7 @@ static int jpeg_v4_0_5_hw_fini(struct amdgpu_ip_block *ip_block)
227
227
struct amdgpu_device * adev = ip_block -> adev ;
228
228
int i ;
229
229
230
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
230
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
231
231
232
232
for (i = 0 ; i < adev -> jpeg .num_jpeg_inst ; ++ i ) {
233
233
if (adev -> jpeg .harvest_config & (1 << i ))
Original file line number Diff line number Diff line change @@ -168,7 +168,7 @@ static int jpeg_v5_0_0_hw_fini(struct amdgpu_ip_block *ip_block)
168
168
{
169
169
struct amdgpu_device * adev = ip_block -> adev ;
170
170
171
- cancel_delayed_work_sync (& adev -> vcn .idle_work );
171
+ cancel_delayed_work_sync (& adev -> jpeg .idle_work );
172
172
173
173
if (adev -> jpeg .cur_state != AMD_PG_STATE_GATE &&
174
174
RREG32_SOC15 (JPEG , 0 , regUVD_JRBC_STATUS ))
You can’t perform that action at this time.
0 commit comments