On Wed, Oct 3, 2018 at 6:56 AM Rex Zhu <[email protected]> wrote: > > Fix cg/pg unexpected set in hw init failed case. > > Signed-off-by: Rex Zhu <[email protected]>
Series is: Reviewed-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index eda3d1e..94c92f5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1656,7 +1656,7 @@ static int amdgpu_device_set_cg_state(struct > amdgpu_device *adev, > > for (j = 0; j < adev->num_ip_blocks; j++) { > i = state == AMD_CG_STATE_GATE ? j : adev->num_ip_blocks - j > - 1; > - if (!adev->ip_blocks[i].status.valid) > + if (!adev->ip_blocks[i].status.late_initialized) > continue; > /* skip CG for VCE/UVD, it's handled specially */ > if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD > && > @@ -1686,7 +1686,7 @@ static int amdgpu_device_set_pg_state(struct > amdgpu_device *adev, enum amd_power > > for (j = 0; j < adev->num_ip_blocks; j++) { > i = state == AMD_PG_STATE_GATE ? j : adev->num_ip_blocks - j > - 1; > - if (!adev->ip_blocks[i].status.valid) > + if (!adev->ip_blocks[i].status.late_initialized) > continue; > /* skip CG for VCE/UVD, it's handled specially */ > if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD > && > -- > 1.9.1 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
