Skip to contentSkip to conversation

CyberPro 32bit support and other fixes

PATCH In review Denis Oliver Kropp 2 participants 2 messages Jun 13, 2002 Framebuffer layer

lore
Share & tools
lore

Denis Oliver Kropp

author
#0 lore raw

PATCH 1/1 CyberPro 32bit support and other fixes

Hi,

this patch adds 32 bit support to cyber2000fb which is useful if you have a video layer in the background (CyberPro 5xxx) with per pixel alpha blending enabled.

This patch also includes a fix for the text palette for modes with more than 8 bit.

Additionally there was a bug in set_var for 16 bit support, bits_per_pixel has been set to 15 if 16 is detected. I guess this was a copy'n'paste failure.

Also panning had a bug as it didn't take care of the bytes per pixel when calculating the new base address.

The last two things have already been fixed in the 2.5 tree.

Applies against Linux 2.4.19-pre10.

Signature · 9 lines
Best regards,
  Denis Oliver Kropp

.------------------------------------------.
| DirectFB - Hardware accelerated graphics |
| http://www.directfb.org/                 |
"------------------------------------------"

                            Convergence GmbH
CREDITS +1 -0
diff -uraN linux-2.4.19-pre10/CREDITS linux-2.4.19-pre10-cyber32bit/CREDITS
@@ -1678,6 +1678,7 @@
 N: Denis O. Kropp
 E: [email protected]
 D: NeoMagic framebuffer driver
+D: CyberPro 32 bit support, fixes
 S: Badensche Str. 46
 S: 10715 Berlin
 S: Germany
drivers/video/Config.in +3 -2
diff -uraN linux-2.4.19-pre10/drivers/video/Config.in linux-2.4.19-pre10-cyber32bit/drivers/video/Config.in
@@ -361,7 +361,7 @@
 	   "$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
 	   "$CONFIG_FB_RADEON" = "y" -o "$CONFIG_FB_PVR2" = "y" -o \
 	   "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
-	   "$CONFIG_FB_VOODOO1" = "y" ]; then
+	   "$CONFIG_FB_VOODOO1" = "y" -o "$CONFIG_FB_CYBER2000" = "y" ]; then
 	 define_tristate CONFIG_FBCON_CFB32 y
       else
 	 if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \

@@ -373,7 +373,8 @@
 	      "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
 	      "$CONFIG_FB_3DFX" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
 	      "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
-	      "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" ]; then
+	      "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
+	      "$CONFIG_FB_CYBER2000" = "m" ]; then
 	    define_tristate CONFIG_FBCON_CFB32 m
 	 fi
       fi
drivers/video/cyber2000fb.c +62 -5

143 lines not on this page · raw message

drivers/video/cyber2000fb.h +2 -0
diff -uraN linux-2.4.19-pre10/drivers/video/cyber2000fb.h linux-2.4.19-pre10-cyber32bit/drivers/video/cyber2000fb.h
@@ -39,9 +39,11 @@
 #define PIXFORMAT_8BPP		0
 #define PIXFORMAT_16BPP		1
 #define PIXFORMAT_24BPP		2
+#define PIXFORMAT_32BPP		3
 
 #define VISUALID_256		1
 #define VISUALID_64K		2
+#define VISUALID_16M_32		3
 #define VISUALID_16M		4
 #define VISUALID_32K		6
#1 lore raw
Quoted 3 lines · Denis Oliver Kropp

this patch adds 32 bit support to cyber2000fb which is useful if you have a video layer in the background (CyberPro 5xxx) with per pixel alpha blending enabled.

... Same comments as the 2.5 version.

Signature · 2 lines
Russell King ([email protected])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html