radeon: add r423 bits to modesetting
authorDave Airlie <airlied@redhat.com>
Sun, 2 Nov 2008 23:33:12 +0000 (09:33 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 2 Nov 2008 23:33:12 +0000 (09:33 +1000)
linux-core/radeon_gem.c
linux-core/radeon_legacy_encoders.c
shared-core/radeon_drv.h

index 5ecd8c5..4b15fac 100644 (file)
@@ -525,6 +525,7 @@ static uint32_t radeon_get_accessible_vram(struct drm_device *dev)
            dev_priv->chip_family == CHIP_RV350 ||
            dev_priv->chip_family == CHIP_RV380 ||
            dev_priv->chip_family == CHIP_R420 ||
+           dev_priv->chip_family == CHIP_R423 ||
            dev_priv->chip_family == CHIP_RV410 ||
            radeon_is_avivo(dev_priv)) {
                uint32_t temp = RADEON_READ(RADEON_HOST_PATH_CNTL);
@@ -963,6 +964,7 @@ void radeon_init_memory_map(struct drm_device *dev)
                            dev_priv->chip_family == CHIP_RV350 ||
                            dev_priv->chip_family == CHIP_RV380 ||
                            dev_priv->chip_family == CHIP_R420 ||
+                           dev_priv->chip_family == CHIP_R423 ||
                            dev_priv->chip_family == CHIP_RV410)
                                aper0_base &= ~(mem_size - 1);
 
index 261501d..3df89d3 100644 (file)
@@ -1070,6 +1070,7 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
                        crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON;
                        //tv_master_cntl |= RADEON_TV_ON;
                        if (dev_priv->chip_family == CHIP_R420 ||
+                           dev_priv->chip_family == CHIP_R423 ||
                            dev_priv->chip_family == CHIP_RV410)
                                tv_dac_cntl &= ~(R420_TV_DAC_RDACPD |
                                                 R420_TV_DAC_GDACPD |
@@ -1095,6 +1096,7 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
                         crtc2_gen_cntl &= ~RADEON_CRTC2_CRT2_ON;
                        //tv_master_cntl &= ~RADEON_TV_ON;
                        if (dev_priv->chip_family == CHIP_R420 ||
+                           dev_priv->chip_family == CHIP_R423 ||
                            dev_priv->chip_family == CHIP_RV410)
                                tv_dac_cntl |= (R420_TV_DAC_RDACPD |
                                                R420_TV_DAC_GDACPD |
@@ -1158,6 +1160,7 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
        if (dev_priv->chip_family != CHIP_R200) {
                tv_dac_cntl = RADEON_READ(RADEON_TV_DAC_CNTL);
                if (dev_priv->chip_family == CHIP_R420 ||
+                   dev_priv->chip_family == CHIP_R423 ||
                    dev_priv->chip_family == CHIP_RV410) {
                        tv_dac_cntl &= ~(RADEON_TV_DAC_STD_MASK |
                                         RADEON_TV_DAC_BGADJ_MASK |
index 0d5f762..17c0c29 100644 (file)
@@ -1644,6 +1644,7 @@ static inline int radeon_update_breadcrumb(struct drm_device *dev)
                                  (dev_priv->chip_family == CHIP_R350)  || \
                                  (dev_priv->chip_family == CHIP_RV380) || \
                                  (dev_priv->chip_family == CHIP_R420)  || \
+                                 (dev_priv->chip_family == CHIP_R423)  || \
                                  (dev_priv->chip_family == CHIP_RV410) || \
                                  (dev_priv->chip_family == CHIP_RS400) || \
                                  (dev_priv->chip_family == CHIP_RS480))