aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-02-09 12:04:43 -0500
committerDave Airlie <airlied@redhat.com>2010-02-10 22:39:11 -0500
commit37b4390ec7f12f82e47a2ef56dccee094f26d34f (patch)
tree55c1443a4da1d4d0c08349e4572c3e333cc0686d /drivers/gpu/drm/radeon
parent9dad76e8be982b3c72bc89a72f7d603bae87fa96 (diff)
drm/radeon/kms/atom: replace 0/1 in crtc code with ATOM_DISABLE/ATOM_ENABLE
Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/atombios_crtc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 7e7c0b32bb65..925b4530ce1b 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -245,10 +245,10 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
245 245
246 switch (mode) { 246 switch (mode) {
247 case DRM_MODE_DPMS_ON: 247 case DRM_MODE_DPMS_ON:
248 atombios_enable_crtc(crtc, 1); 248 atombios_enable_crtc(crtc, ATOM_ENABLE);
249 if (ASIC_IS_DCE3(rdev)) 249 if (ASIC_IS_DCE3(rdev))
250 atombios_enable_crtc_memreq(crtc, 1); 250 atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
251 atombios_blank_crtc(crtc, 0); 251 atombios_blank_crtc(crtc, ATOM_DISABLE);
252 /* XXX re-enable when interrupt support is added */ 252 /* XXX re-enable when interrupt support is added */
253 if (!ASIC_IS_DCE4(rdev)) 253 if (!ASIC_IS_DCE4(rdev))
254 drm_vblank_post_modeset(dev, radeon_crtc->crtc_id); 254 drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
@@ -260,10 +260,10 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
260 /* XXX re-enable when interrupt support is added */ 260 /* XXX re-enable when interrupt support is added */
261 if (!ASIC_IS_DCE4(rdev)) 261 if (!ASIC_IS_DCE4(rdev))
262 drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id); 262 drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
263 atombios_blank_crtc(crtc, 1); 263 atombios_blank_crtc(crtc, ATOM_ENABLE);
264 if (ASIC_IS_DCE3(rdev)) 264 if (ASIC_IS_DCE3(rdev))
265 atombios_enable_crtc_memreq(crtc, 0); 265 atombios_enable_crtc_memreq(crtc, ATOM_DISABLE);
266 atombios_enable_crtc(crtc, 0); 266 atombios_enable_crtc(crtc, ATOM_DISABLE);
267 break; 267 break;
268 } 268 }
269} 269}
@@ -1116,14 +1116,14 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc,
1116 1116
1117static void atombios_crtc_prepare(struct drm_crtc *crtc) 1117static void atombios_crtc_prepare(struct drm_crtc *crtc)
1118{ 1118{
1119 atombios_lock_crtc(crtc, 1); 1119 atombios_lock_crtc(crtc, ATOM_ENABLE);
1120 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); 1120 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
1121} 1121}
1122 1122
1123static void atombios_crtc_commit(struct drm_crtc *crtc) 1123static void atombios_crtc_commit(struct drm_crtc *crtc)
1124{ 1124{
1125 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON); 1125 atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
1126 atombios_lock_crtc(crtc, 0); 1126 atombios_lock_crtc(crtc, ATOM_DISABLE);
1127} 1127}
1128 1128
1129static const struct drm_crtc_helper_funcs atombios_helper_funcs = { 1129static const struct drm_crtc_helper_funcs atombios_helper_funcs = {