drm/radeon/kms: fix bug in r600_gpu_is_lockup

We were using the lockup struct from the wrong union.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by Alex Deucher and committed by Dave Airlie e29ff729 a93f344d

+8 -2
+8 -2
drivers/gpu/drm/radeon/r600.c
··· 1342 1342 u32 srbm_status; 1343 1343 u32 grbm_status; 1344 1344 u32 grbm_status2; 1345 + struct r100_gpu_lockup *lockup; 1345 1346 int r; 1347 + 1348 + if (rdev->family >= CHIP_RV770) 1349 + lockup = &rdev->config.rv770.lockup; 1350 + else 1351 + lockup = &rdev->config.r600.lockup; 1346 1352 1347 1353 srbm_status = RREG32(R_000E50_SRBM_STATUS); 1348 1354 grbm_status = RREG32(R_008010_GRBM_STATUS); 1349 1355 grbm_status2 = RREG32(R_008014_GRBM_STATUS2); 1350 1356 if (!G_008010_GUI_ACTIVE(grbm_status)) { 1351 - r100_gpu_lockup_update(&rdev->config.r300.lockup, &rdev->cp); 1357 + r100_gpu_lockup_update(lockup, &rdev->cp); 1352 1358 return false; 1353 1359 } 1354 1360 /* force CP activities */ ··· 1366 1360 radeon_ring_unlock_commit(rdev); 1367 1361 } 1368 1362 rdev->cp.rptr = RREG32(R600_CP_RB_RPTR); 1369 - return r100_gpu_cp_is_lockup(rdev, &rdev->config.r300.lockup, &rdev->cp); 1363 + return r100_gpu_cp_is_lockup(rdev, lockup, &rdev->cp); 1370 1364 } 1371 1365 1372 1366 int r600_asic_reset(struct radeon_device *rdev)