drm/radeon/r1xx-r4xx: don't use radeon_crtc for vblank callback
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 15 Aug 2012 20:58:30 +0000 (16:58 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 Sep 2012 17:10:32 +0000 (13:10 -0400)
This might be called before we've allocated the radeon_crtcs

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/r100.c

index 8d7e33a0b243585100839905205a5f11ccab5f06..163c33e1a1d6587a5d8ecc31f631e6e7bcd0a7d2 100644 (file)
@@ -80,10 +80,12 @@ MODULE_FIRMWARE(FIRMWARE_R520);
  */
 void r100_wait_for_vblank(struct radeon_device *rdev, int crtc)
 {
-       struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc];
        int i;
 
-       if (radeon_crtc->crtc_id == 0) {
+       if (crtc >= rdev->num_crtc)
+               return;
+
+       if (crtc == 0) {
                if (RREG32(RADEON_CRTC_GEN_CNTL) & RADEON_CRTC_EN) {
                        for (i = 0; i < rdev->usec_timeout; i++) {
                                if (!(RREG32(RADEON_CRTC_STATUS) & RADEON_CRTC_VBLANK_CUR))