diff --git a/[refs] b/[refs] index 91101da54d45..a2c32a22e3b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37b4390ec7f12f82e47a2ef56dccee094f26d34f +refs/heads/master: 12d7798f71107e7f4391a532af8c6690bda16f66 diff --git a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c index 925b4530ce1b..0ec6934c3a26 100644 --- a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1145,22 +1145,22 @@ void radeon_atombios_init_crtc(struct drm_device *dev, switch (radeon_crtc->crtc_id) { case 0: default: - radeon_crtc->crtc_id = EVERGREEN_CRTC0_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC0_REGISTER_OFFSET; break; case 1: - radeon_crtc->crtc_id = EVERGREEN_CRTC1_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC1_REGISTER_OFFSET; break; case 2: - radeon_crtc->crtc_id = EVERGREEN_CRTC2_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC2_REGISTER_OFFSET; break; case 3: - radeon_crtc->crtc_id = EVERGREEN_CRTC3_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC3_REGISTER_OFFSET; break; case 4: - radeon_crtc->crtc_id = EVERGREEN_CRTC4_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC4_REGISTER_OFFSET; break; case 5: - radeon_crtc->crtc_id = EVERGREEN_CRTC5_REGISTER_OFFSET; + radeon_crtc->crtc_offset = EVERGREEN_CRTC5_REGISTER_OFFSET; break; } } else {