Skip to contentSkip to conversation

fbdev: Remove remaining references to soft_cursor from drivers

PATCH In review Antonino A. Daplas 3 participants 3 messages Oct 26, 2005 Framebuffer layer

lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 1/4 fbdev: Remove remaining references to soft_cursor from drivers

au1100fb and au1200fb still refers to soft_cursor. Remove.

Signed-off-by Antonino Daplas <[email protected]>

---

Quoted 6 lines

drivers/video/Kconfig:1249:warning: 'select' used by config symbol 'FB_AU1200' refer to undefined symbol 'FB_SOFT_CURSOR'

This might be due to a clash-of-intent between some of Tony's stuff and the
MIPS tree. A fix against next -mm would suit, thanks.

Here's the fix

 Kconfig    |    1 -
 au1100fb.c |    1 -
 au1200fb.c |    1 -
 3 files changed, 3 deletions(-)
drivers/video/Kconfig +0 -1
index fcb559b..55ae403 100644
@@ -1246,7 +1246,6 @@ config FB_AU1200
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB_SOFT_CURSOR
 	help
 	  This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
 	  various panels and CRTs by passing in kernel cmd line option
drivers/video/au1100fb.c +0 -1
index bf3ac99..a512980 100644
@@ -424,7 +424,6 @@ static struct fb_ops au1100fb_ops =
 	.fb_fillrect		= cfb_fillrect,
 	.fb_copyarea		= cfb_copyarea,
 	.fb_imageblit		= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_rotate		= au1100fb_fb_rotate,
 	.fb_mmap		= au1100fb_fb_mmap,
 };
drivers/video/au1200fb.c +0 -1
index adde4f6..f7243b1 100644
@@ -1555,7 +1555,6 @@ static struct fb_ops au1200fb_fb_ops =
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,
 	.fb_imageblit	= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_sync		= NULL,
 	.fb_ioctl		= au1200fb_ioctl,
 	.fb_mmap		= au1200fb_fb_mmap,

-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information

#1 lore raw
Quoted 49 lines · Antonino A. Daplas

au1100fb and au1200fb still refers to soft_cursor. Remove.

Signed-off-by Antonino Daplas <[email protected]>

---

Quoted 6 lines

drivers/video/Kconfig:1249:warning: 'select' used by config symbol 'FB_AU1200' refer to undefined symbol 'FB_SOFT_CURSOR'

This might be due to a clash-of-intent between some of Tony's stuff and the
MIPS tree. A fix against next -mm would suit, thanks.

Here's the fix

 Kconfig    |    1 -
 au1100fb.c |    1 -
 au1200fb.c |    1 -
 3 files changed, 3 deletions(-)
drivers/video/Kconfig +0 -1
index fcb559b..55ae403 100644
@@ -1246,7 +1246,6 @@ config FB_AU1200
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB_SOFT_CURSOR
 	help
 	  This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
 	  various panels and CRTs by passing in kernel cmd line option
drivers/video/au1100fb.c +0 -1
index bf3ac99..a512980 100644
@@ -424,7 +424,6 @@ static struct fb_ops au1100fb_ops =
 	.fb_fillrect		= cfb_fillrect,
 	.fb_copyarea		= cfb_copyarea,
 	.fb_imageblit		= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_rotate		= au1100fb_fb_rotate,
 	.fb_mmap		= au1100fb_fb_mmap,
 };
drivers/video/au1200fb.c +0 -0
index adde4f6..f7243b1 100644

drivers/video/au1200fb.c static struct fb_ops au1200fb_fb_ops = · line 1560

Quoted 7 lines
drivers/video/au1200fb.c +0 -1
@@ -1555,7 +1555,6 @@ static struct fb_ops au1200fb_fb_ops =
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,
 	.fb_imageblit	= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_sync		= NULL,
 	.fb_ioctl		= au1200fb_ioctl,
 	.fb_mmap		= au1200fb_fb_mmap,

Well I dunno what to do about this one. There is no (longer) a au1200fb.c in my tree and the drivers/video/Kconfig hunk already seems to have been applied (by Ralf)?

Which leaves us with a single hunk:

From: "Antonino A. Daplas" <[email protected]>

au1100fb and au1200fb still refers to soft_cursor. Remove.

Signed-off-by Antonino Daplas <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/video/au1100fb.c |    1 -
 1 files changed, 1 deletion(-)
drivers/video/au1100fb.c renamed from drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from +0 -1
diff -puN drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from drivers/video/au1100fb.c
@@ -424,7 +424,6 @@ static struct fb_ops au1100fb_ops =
 	.fb_fillrect		= cfb_fillrect,
 	.fb_copyarea		= cfb_copyarea,
 	.fb_imageblit		= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_rotate		= au1100fb_fb_rotate,
 	.fb_mmap		= au1100fb_fb_mmap,
 };

_

Which I guess Ralf should apply.

Ralf, if you're regularly going to be putting framebuffer patches in to the MIPS tree then we're in for a hard time.

-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 8 lines
drivers/video/au1200fb.c +0 -0
index adde4f6..f7243b1 100644
@@ -1555,7 +1555,6 @@ static struct fb_ops au1200fb_fb_ops =
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,
 	.fb_imageblit	= cfb_imageblit,
Quoted 8 lines

drivers/video/au1200fb.c static struct fb_ops au1200fb_fb_ops = · line 1560

Quoted 4 lines
drivers/video/au1200fb.c +0 -1
-	.fb_cursor		= soft_cursor,
 	.fb_sync		= NULL,
 	.fb_ioctl		= au1200fb_ioctl,
 	.fb_mmap		= au1200fb_fb_mmap,

Well I dunno what to do about this one. There is no (longer) a au1200fb.c in my tree and the drivers/video/Kconfig hunk already seems to have been applied (by Ralf)?

One or two days ago dropped the whole Au1200 framebuffer patch from my patchset for Andrew - it was actually only in by accident.

Quoted 27 lines

Which leaves us with a single hunk:

From: "Antonino A. Daplas" <[email protected]>

au1100fb and au1200fb still refers to soft_cursor. Remove.

Signed-off-by Antonino Daplas <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/video/au1100fb.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from drivers/video/au1100fb.c

drivers/video/au1100fb.c renamed from drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from +0 -1
@@ -424,7 +424,6 @@ static struct fb_ops au1100fb_ops =
 	.fb_fillrect		= cfb_fillrect,
 	.fb_copyarea		= cfb_copyarea,
 	.fb_imageblit		= cfb_imageblit,
-	.fb_cursor		= soft_cursor,
 	.fb_rotate		= au1100fb_fb_rotate,
 	.fb_mmap		= au1100fb_fb_mmap,
 };

_

Quoted 1 line

Which I guess Ralf should apply.

Done.

Quoted 2 lines

Ralf, if you're regularly going to be putting framebuffer patches in to the MIPS tree then we're in for a hard time.

I had posted that driver before (see below) and not received any feedback ...

Ralf

From: Ralf Baechle <[email protected]>
Date: Fri, 14 Oct 2005 22:58:42 +0100
To: [email protected]
Cc: Andrew Morton <[email protected]>
Subject: [PATCH] au1100fb framebuffer fixes
Content-Type: text/plain; charset=us-ascii

For reviewing pleassure. If nobody objects I'd like to submit this one as part of my pile of MIPS patches. The au1100fb driver is the driver for the AMD Alchemy SOCs.

Ralf

Author: Pete Popov <[email protected]>
Date:   Mon Apr 4 01:06:19 2005 +0000

Au1100 FB driver uplift for 2.6.

-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information