summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2008-02-01 02:47:06 -0500
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2008-02-01 02:47:06 -0500
commit73b437ce232c94c0067a0d2f70538b6e1e8c07a7 (patch)
tree856a80501b0c94fe3615f30f3fdc5f09d39ab65c /src
parentf1fb9e4daa29bc379f653f847254db1496b625fd (diff)
RADEON: remove unused "aspect" scaler option
Diffstat (limited to 'src')
-rw-r--r--src/atombios_output.c3
-rw-r--r--src/radeon_output.c9
-rw-r--r--src/radeon_probe.h3
3 files changed, 5 insertions, 10 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c
index d6228df8..6eb8776f 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -330,8 +330,7 @@ atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode)
if (radeon_output->Flags & RADEON_USE_RMX) {
ErrorF("Using RMX\n");
- if (radeon_output->rmx_type == RMX_FULL ||
- radeon_output->rmx_type == RMX_ASPECT)
+ if (radeon_output->rmx_type == RMX_FULL)
disp_data.ucEnable = ATOM_SCALER_EXPANSION;
else if (radeon_output->rmx_type == RMX_CENTER)
disp_data.ucEnable = ATOM_SCALER_CENTER;
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 42477b65..ccfb4c53 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1072,21 +1072,18 @@ radeon_set_property(xf86OutputPtr output, Atom property,
} else if (property == rmx_atom) {
const char *s;
if (value->type != XA_STRING || value->format != 8)
- return FALSE;
+ return FALSE;
s = (char*)value->data;
if (value->size == strlen("full") && !strncmp("full", s, strlen("full"))) {
radeon_output->rmx_type = RMX_FULL;
return TRUE;
- } else if (value->size == strlen("aspect") && !strncmp("aspect", s, strlen("aspect"))) {
- radeon_output->rmx_type = RMX_ASPECT;
- return TRUE;
} else if (value->size == strlen("center") && !strncmp("center", s, strlen("center"))) {
radeon_output->rmx_type = RMX_CENTER;
return TRUE;
- } else if (value->size == strlen("off") && !strncmp("off", s, strlen("off"))) {
+ } else if (value->size == strlen("off") && !strncmp("off", s, strlen("off"))) {
radeon_output->rmx_type = RMX_OFF;
return TRUE;
- }
+ }
return FALSE;
} else if (property == tmds_pll_atom) {
const char *s;
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 6bd83431..5dd1d008 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -117,8 +117,7 @@ typedef enum
{
RMX_OFF,
RMX_FULL,
- RMX_CENTER,
- RMX_ASPECT
+ RMX_CENTER
} RADEONRMXType;
typedef struct {