ChangeSet 1.2300, 2005/03/31 08:48:17-08:00, [EMAIL PROTECTED]

        [PATCH] neofb: Set hwaccel flags properly
        
        Not all neomagic chipsets are capable of hardware acceleration.  Set the
        hwaccel flags only for chipsets that can do so.
        
        From: Antonino Daplas <[EMAIL PROTECTED]>
        Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
        Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
        Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>



 neofb.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)


diff -Nru a/drivers/video/neofb.c b/drivers/video/neofb.c
--- a/drivers/video/neofb.c     2005-03-31 10:27:42 -08:00
+++ b/drivers/video/neofb.c     2005-03-31 10:27:42 -08:00
@@ -2030,6 +2030,7 @@
 
        par->internal_display = internal;
        par->external_display = external;
+       info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 
        switch (info->fix.accel) {
        case FB_ACCEL_NEOMAGIC_NM2070:
@@ -2049,15 +2050,27 @@
                break;
        case FB_ACCEL_NEOMAGIC_NM2200:
                sprintf(info->fix.id, "MagicGraph 256AV");
+               info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
+                              FBINFO_HWACCEL_COPYAREA |
+                              FBINFO_HWACCEL_FILLRECT;
                break;
        case FB_ACCEL_NEOMAGIC_NM2230:
                sprintf(info->fix.id, "MagicGraph 256AV+");
+               info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
+                              FBINFO_HWACCEL_COPYAREA |
+                              FBINFO_HWACCEL_FILLRECT;
                break;
        case FB_ACCEL_NEOMAGIC_NM2360:
                sprintf(info->fix.id, "MagicGraph 256ZX");
+               info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
+                              FBINFO_HWACCEL_COPYAREA |
+                              FBINFO_HWACCEL_FILLRECT;
                break;
        case FB_ACCEL_NEOMAGIC_NM2380:
                sprintf(info->fix.id, "MagicGraph 256XL+");
+               info->flags |= FBINFO_HWACCEL_IMAGEBLIT |
+                              FBINFO_HWACCEL_COPYAREA |
+                              FBINFO_HWACCEL_FILLRECT;
                break;
        }
 
@@ -2069,9 +2082,6 @@
        info->fix.accel = id->driver_data;
 
        info->fbops = &neofb_ops;
-       info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
-               FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_COPYAREA |
-               FBINFO_HWACCEL_COPYAREA;
        info->pseudo_palette = (void *) (par + 1);
        return info;
 }
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to