* [PATCH 1/4] fbdev: Remove remaining references to soft_cursor from drivers
@ 2005-10-26 11:51 Antonino A. Daplas
2005-10-26 19:59 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Antonino A. Daplas @ 2005-10-26 11:51 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Fbdev development list
au1100fb and au1200fb still refers to soft_cursor. Remove.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
---
> 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(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fcb559b..55ae403 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index bf3ac99..a512980 100644
--- a/drivers/video/au1100fb.c
+++ b/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,
};
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index adde4f6..f7243b1 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/4] fbdev: Remove remaining references to soft_cursor from drivers
2005-10-26 11:51 [PATCH 1/4] fbdev: Remove remaining references to soft_cursor from drivers Antonino A. Daplas
@ 2005-10-26 19:59 ` Andrew Morton
2005-10-26 20:30 ` Ralf Baechle
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2005-10-26 19:59 UTC (permalink / raw)
To: Antonino A. Daplas; +Cc: linux-fbdev-devel, Ralf Baechle
"Antonino A. Daplas" <adaplas@gmail.com> wrote:
>
> au1100fb and au1200fb still refers to soft_cursor. Remove.
>
> Signed-off-by: Antonino Daplas <adaplas@pol.net>
> ---
> > 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(-)
>
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index fcb559b..55ae403 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -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
> diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
> index bf3ac99..a512980 100644
> --- a/drivers/video/au1100fb.c
> +++ b/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,
> };
> diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
> index adde4f6..f7243b1 100644
> --- a/drivers/video/au1200fb.c
> +++ b/drivers/video/au1200fb.c
> @@ -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" <adaplas@gmail.com>
au1100fb and au1200fb still refers to soft_cursor. Remove.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
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
--- 25/drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from Wed Oct 26 12:57:37 2005
+++ 25-akpm/drivers/video/au1100fb.c Wed Oct 26 12:57:37 2005
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/4] fbdev: Remove remaining references to soft_cursor from drivers
2005-10-26 19:59 ` Andrew Morton
@ 2005-10-26 20:30 ` Ralf Baechle
0 siblings, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2005-10-26 20:30 UTC (permalink / raw)
To: Andrew Morton; +Cc: Antonino A. Daplas, linux-fbdev-devel
On Wed, Oct 26, 2005 at 12:59:01PM -0700, Andrew Morton wrote:
> > diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
> > index adde4f6..f7243b1 100644
> > --- a/drivers/video/au1200fb.c
> > +++ b/drivers/video/au1200fb.c
> > @@ -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)?
One or two days ago dropped the whole Au1200 framebuffer patch from my
patchset for Andrew - it was actually only in by accident.
> Which leaves us with a single hunk:
>
>
> From: "Antonino A. Daplas" <adaplas@gmail.com>
>
> au1100fb and au1200fb still refers to soft_cursor. Remove.
>
> Signed-off-by: Antonino Daplas <adaplas@pol.net>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
>
> 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
> --- 25/drivers/video/au1100fb.c~fbdev-remove-remaining-references-to-soft_cursor-from Wed Oct 26 12:57:37 2005
> +++ 25-akpm/drivers/video/au1100fb.c Wed Oct 26 12:57:37 2005
> @@ -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.
Done.
> 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 <ralf@linux-mips.org>
Date: Fri, 14 Oct 2005 22:58:42 +0100
To: linux-fbdev-devel@lists.sourceforge.net
Cc: Andrew Morton <akpm@osdl.org>
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 <ppopov@embeddedalley.com>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-10-26 20:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-26 11:51 [PATCH 1/4] fbdev: Remove remaining references to soft_cursor from drivers Antonino A. Daplas
2005-10-26 19:59 ` Andrew Morton
2005-10-26 20:30 ` Ralf Baechle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.