[xorg-bugzilla-noise] [Bug 988] New: typo in last update to radeon_accel.c ?

[bugzilla-daemon at freedesktop.org]

Please do not reply to this email: if you want to comment on the bug, go to          
the URL shown below and enter yourcomments there.   
 
https://freedesktop.org/bugzilla/show_bug.cgi?id=988        
   
           Summary: typo in last update to radeon_accel.c ?
           Product: xorg
           Version: CVS_head
          Platform: PC
               URL: http://freedesktop.org/cgi-
                    bin/viewcvs.cgi/xc/programs/Xserver/hw/xfree86/drivers/a
                    ti/radeon_accel.c?r1=1.7&r2=1.8&root=xorg
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Driver/Radeon
        AssignedTo: xorg-bugzilla-noise at freedesktop.org
        ReportedBy: a.stenglein at gmx.net


looks like theres a typo in the second last section:
if (IS_R300_VARIANT)

shouldn't it look like the last section?
if (!IS_R300_VARIANT)

Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c   30 Jul 2004
20:30:51 -0000      1.7
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c   30 Jul 2004
22:20:21 -0000      1.8
@@ -211,9 +211,7 @@
     host_path_cntl = INREG(RADEON_HOST_PATH_CNTL);
     rbbm_soft_reset = INREG(RADEON_RBBM_SOFT_RESET);
 
-    if ((info->ChipFamily == CHIP_FAMILY_R300) ||
-       (info->ChipFamily == CHIP_FAMILY_R350) ||
-       (info->ChipFamily == CHIP_FAMILY_RV350)) {
+    if (IS_R300_VARIANT) {
        CARD32 tmp;
 
        OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset |
@@ -227,7 +225,6 @@
     } else {
        OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset |
                                        RADEON_SOFT_RESET_CP |
-                                       RADEON_SOFT_RESET_HI |
                                        RADEON_SOFT_RESET_SE |
                                        RADEON_SOFT_RESET_RE |
                                        RADEON_SOFT_RESET_PP |
@@ -236,7 +233,6 @@
        INREG(RADEON_RBBM_SOFT_RESET);
        OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset & (CARD32)
                                        ~(RADEON_SOFT_RESET_CP |
-                                         RADEON_SOFT_RESET_HI |
                                          RADEON_SOFT_RESET_SE |
                                          RADEON_SOFT_RESET_RE |
                                          RADEON_SOFT_RESET_PP |
@@ -249,9 +245,7 @@
     INREG(RADEON_HOST_PATH_CNTL);
     OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl);
 
-    if ((info->ChipFamily != CHIP_FAMILY_R300) &&
-        (info->ChipFamily != CHIP_FAMILY_R350) &&
-        (info->ChipFamily != CHIP_FAMILY_RV350))
+    if (IS_R300_VARIANT)
        OUTREG(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset);
 
     OUTREG(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index);
@@ -279,9 +273,7 @@
      */
 
     /* Turn of all automatic flushing - we'll do it all */
-    if ((info->ChipFamily != CHIP_FAMILY_R300) &&
-       (info->ChipFamily != CHIP_FAMILY_R350) &&
-       (info->ChipFamily != CHIP_FAMILY_RV350))
+    if (!IS_R300_VARIANT)
        OUTREG(RADEON_RB2D_DSTCACHE_MODE, 0);
 
     pitch64 = ((pScrn->displayWidth * (pScrn->bitsPerPixel / 8) + 0x3f)) >> 6;        
   
   
--         
Configure bugmail: https://freedesktop.org/bugzilla/userprefs.cgi?tab=email       
   
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.