summaryrefslogtreecommitdiff
path: root/src/radeon_output.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-03-09 20:48:39 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-03-09 20:49:49 -0400
commit60dac878cc8626b0821c4c7a6a6dfa12a5597cfa (patch)
tree7a7ee13a226ebe131cc3a94df6afa54822d55327 /src/radeon_output.c
parent758fcc33c232c32e7b66261fca51de161d1a4800 (diff)
R4xx: add R4xxATOM option
If set, enables the use of atombios for modesetting on r4xx cards.
Diffstat (limited to 'src/radeon_output.c')
-rw-r--r--src/radeon_output.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index fcf22efd..baa9592a 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -346,7 +346,7 @@ radeon_dpms(xf86OutputPtr output, int mode)
if ((mode == DPMSModeOn) && radeon_output->enabled)
return;
- if (IS_AVIVO_VARIANT) {
+ if (IS_AVIVO_VARIANT || info->r4xx_atom) {
atombios_output_dpms(output, mode);
} else {
legacy_output_dpms(output, mode);
@@ -523,7 +523,7 @@ radeon_mode_prepare(xf86OutputPtr output)
if (other_crtc->enabled) {
if (other_radeon_crtc->initialized) {
radeon_crtc_dpms(other_crtc, DPMSModeOff);
- if (IS_AVIVO_VARIANT)
+ if (IS_AVIVO_VARIANT || info->r4xx_atom)
atombios_lock_crtc(info->atomBIOS, other_radeon_crtc->crtc_id, 1);
radeon_dpms(loop_output, DPMSModeOff);
}
@@ -543,7 +543,7 @@ radeon_mode_set(xf86OutputPtr output, DisplayModePtr mode,
{
RADEONInfoPtr info = RADEONPTR(output->scrn);
- if (IS_AVIVO_VARIANT)
+ if (IS_AVIVO_VARIANT || info->r4xx_atom)
atombios_output_mode_set(output, mode, adjusted_mode);
else
legacy_output_mode_set(output, mode, adjusted_mode);
@@ -568,7 +568,7 @@ radeon_mode_commit(xf86OutputPtr output)
if (other_crtc->enabled) {
if (other_radeon_crtc->initialized) {
radeon_crtc_dpms(other_crtc, DPMSModeOn);
- if (IS_AVIVO_VARIANT)
+ if (IS_AVIVO_VARIANT || info->r4xx_atom)
atombios_lock_crtc(info->atomBIOS, other_radeon_crtc->crtc_id, 0);
radeon_dpms(loop_output, DPMSModeOn);
}