intelfb-support-i854.patch

intelfb-support-i854.patch

[Andrew Morton]

Guys, I've been sitting on this patch for ages because there was some
issue wrt interactions with drm (iirc).

Could you please refresh our memories on what the problem was and help
find the resolution here?

Thanks.


From: "Stefan Husemann" <shusemann@googlemail.com>

Support the Intel 854 Chipset in fbdev.

We test and use the patch on a Thomson IP1101 IPTV-Box.  On the VGA-Port
we get a normal signal.

Here is the link to the Mambux-Project: http://www.mambux.de

Cc: Keith Packard <keithp@keithp.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Stefan Husemann <shusemann@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/char/agp/intel-agp.c        |    3 +++
 drivers/video/intelfb/intelfb.h     |    2 ++
 drivers/video/intelfb/intelfb_i2c.c |    1 +
 drivers/video/intelfb/intelfbdrv.c  |    1 +
 drivers/video/intelfb/intelfbhw.c   |    5 +++++
 include/drm/drm_pciids.h            |    2 ++
 include/linux/pci_ids.h             |    2 ++
 7 files changed, 16 insertions(+)

diff -puN drivers/char/agp/intel-agp.c~intelfb-support-i854 drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c~intelfb-support-i854
+++ a/drivers/char/agp/intel-agp.c
@@ -2131,6 +2131,8 @@ static const struct intel_driver_descrip
 	{ PCI_DEVICE_ID_INTEL_82845G_HB, PCI_DEVICE_ID_INTEL_82845G_IG, 0, "830M",
 		&intel_845_driver, &intel_830_driver },
 	{ PCI_DEVICE_ID_INTEL_82850_HB, 0, 0, "i850", &intel_850_driver, NULL },
+	{ PCI_DEVICE_ID_INTEL_82854_HB, PCI_DEVICE_ID_INTEL_82854_IG, 0, "854",
+		&intel_845_driver, &intel_830_driver },
 	{ PCI_DEVICE_ID_INTEL_82855PM_HB, 0, 0, "855PM", &intel_845_driver, NULL },
 	{ PCI_DEVICE_ID_INTEL_82855GM_HB, PCI_DEVICE_ID_INTEL_82855GM_IG, 0, "855GM",
 		&intel_845_driver, &intel_830_driver },
@@ -2355,6 +2357,7 @@ static struct pci_device_id agp_intel_pc
 	ID(PCI_DEVICE_ID_INTEL_82845_HB),
 	ID(PCI_DEVICE_ID_INTEL_82845G_HB),
 	ID(PCI_DEVICE_ID_INTEL_82850_HB),
+	ID(PCI_DEVICE_ID_INTEL_82854_HB),
 	ID(PCI_DEVICE_ID_INTEL_82855PM_HB),
 	ID(PCI_DEVICE_ID_INTEL_82855GM_HB),
 	ID(PCI_DEVICE_ID_INTEL_82860_HB),
diff -puN drivers/video/intelfb/intelfb.h~intelfb-support-i854 drivers/video/intelfb/intelfb.h
--- a/drivers/video/intelfb/intelfb.h~intelfb-support-i854
+++ a/drivers/video/intelfb/intelfb.h
@@ -53,6 +53,7 @@
 #define PCI_DEVICE_ID_INTEL_830M	0x3577
 #define PCI_DEVICE_ID_INTEL_845G	0x2562
 #define PCI_DEVICE_ID_INTEL_85XGM	0x3582
+#define PCI_DEVICE_ID_INTEL_854		0x358E
 #define PCI_DEVICE_ID_INTEL_865G	0x2572
 #define PCI_DEVICE_ID_INTEL_915G	0x2582
 #define PCI_DEVICE_ID_INTEL_915GM	0x2592
@@ -154,6 +155,7 @@ enum intel_chips {
 	INTEL_85XGM,
 	INTEL_852GM,
 	INTEL_852GME,
+	INTEL_854,
 	INTEL_855GM,
 	INTEL_855GME,
 	INTEL_865G,
diff -puN drivers/video/intelfb/intelfb_i2c.c~intelfb-support-i854 drivers/video/intelfb/intelfb_i2c.c
--- a/drivers/video/intelfb/intelfb_i2c.c~intelfb-support-i854
+++ a/drivers/video/intelfb/intelfb_i2c.c
@@ -156,6 +156,7 @@ void intelfb_create_i2c_busses(struct in
 	switch(dinfo->chipset) {
 	case INTEL_830M:
 	case INTEL_845G:
+	case INTEL_854:
 	case INTEL_855GM:
 	case INTEL_865G:
 		dinfo->output[i].type = INTELFB_OUTPUT_DVO;
diff -puN drivers/video/intelfb/intelfbdrv.c~intelfb-support-i854 drivers/video/intelfb/intelfbdrv.c
--- a/drivers/video/intelfb/intelfbdrv.c~intelfb-support-i854
+++ a/drivers/video/intelfb/intelfbdrv.c
@@ -182,6 +182,7 @@ static struct pci_device_id intelfb_pci_
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_845G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_845G },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_854, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_854 },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },
diff -puN drivers/video/intelfb/intelfbhw.c~intelfb-support-i854 drivers/video/intelfb/intelfbhw.c
--- a/drivers/video/intelfb/intelfbhw.c~intelfb-support-i854
+++ a/drivers/video/intelfb/intelfbhw.c
@@ -84,6 +84,11 @@ int intelfbhw_get_chipset(struct pci_dev
 		dinfo->mobile = 0;
 		dinfo->pll_index = PLLS_I8xx;
 		return 0;
+	case PCI_DEVICE_ID_INTEL_854:
+		dinfo->mobile = 1;
+		dinfo->name = "Intel(R) 854";
+		dinfo->chipset = INTEL_854;
+		return 0;
 	case PCI_DEVICE_ID_INTEL_85XGM:
 		tmp = 0;
 		dinfo->mobile = 1;
diff -puN include/drm/drm_pciids.h~intelfb-support-i854 include/drm/drm_pciids.h
--- a/include/drm/drm_pciids.h~intelfb-support-i854
+++ a/include/drm/drm_pciids.h
@@ -472,6 +472,7 @@
 	{0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 	{0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 	{0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+	{0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 	{0, 0, 0}
 
 #define gamma_PCI_IDS \
@@ -533,4 +534,5 @@
 	{0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 	{0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 	{0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+	{0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 	{0, 0, 0}
diff -puN include/linux/pci_ids.h~intelfb-support-i854 include/linux/pci_ids.h
--- a/include/linux/pci_ids.h~intelfb-support-i854
+++ a/include/linux/pci_ids.h
@@ -2513,6 +2513,8 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3	0x3433
 #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
+#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
 #define PCI_DEVICE_ID_INTEL_82855GM_HB	0x3580
 #define PCI_DEVICE_ID_INTEL_82855GM_IG	0x3582
 #define PCI_DEVICE_ID_INTEL_E7520_MCH	0x3590
_


------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com

Re: intelfb-support-i854.patch

[Andrew Morton]

On 10 Apr 2009 09:36:50 +0200 krzysztof.h1@poczta.fm wrote:

> Andrew Morton napisa__(a):
> > 
> > Guys, I've been sitting on this patch for ages because there was some
> > issue wrt interactions with drm (iirc).
> > 
> > Could you please refresh our memories on what the problem was and help
> > find the resolution here?
> > 
> 
> I have searched on the google and there were never a comment about the patch. It just went unnoticed.
> 
> It seems safe (only ids are added). The only possible regression is that drm is broken on i854 that previously was not recognized at all.
> 

hm, I'm sure that someone had issues, but I grepped all my email and
can't find it.

Oh well, I guess I'll just merge it and see what happens.

------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com

Re: intelfb-support-i854.patch

[Dave Airlie]

On Fri, 10 Apr 2009, Andrew Morton wrote:

> On 10 Apr 2009 09:36:50 +0200 krzysztof.h1@poczta.fm wrote:
> 
> > Andrew Morton napisa__(a):
> > > 
> > > Guys, I've been sitting on this patch for ages because there was some
> > > issue wrt interactions with drm (iirc).
> > > 
> > > Could you please refresh our memories on what the problem was and help
> > > find the resolution here?
> > > 
> > 
> > I have searched on the google and there were never a comment about the patch. It just went unnoticed.
> > 
> > It seems safe (only ids are added). The only possible regression is that drm is broken on i854 that previously was not recognized at all.
> > 
> 
> hm, I'm sure that someone had issues, but I grepped all my email and
> can't find it.
> 
> Oh well, I guess I'll just merge it and see what happens.

Well I think I jsut had my usual objections to adding anything to intelfb,

but I'll grab the agp/drm additions which should be fine.

Dave.

> 
> 

------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com

Re: intelfb-support-i854.patch

[Andrew Morton]

On Fri, 10 Apr 2009 09:42:23 +0100 (IST) Dave Airlie <airlied@linux.ie> wrote:

> > Oh well, I guess I'll just merge it and see what happens.
> 
> Well I think I jsut had my usual objections to adding anything to intelfb,

What are those?

> but I'll grab the agp/drm additions which should be fine.

Will that conflict with this patch?


------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com

Re: intelfb-support-i854.patch

[Luc Verhaegen]

On Fri, Apr 10, 2009 at 01:48:58AM -0700, Andrew Morton wrote:
> On Fri, 10 Apr 2009 09:42:23 +0100 (IST) Dave Airlie <airlied@linux.ie> wrote:
> > Well I think I jsut had my usual objections to adding anything to intelfb,
> 
> What are those?

Has there been any answer to this, what i see as a, very sensible 
question?

Why, if these objections are so amazingly obvious, why can they not be 
stated for those who don't know such amazingly obvious things or for 
those who just want to be indulged?

Luc Verhaegen.

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p

Re: intelfb-support-i854.patch

[Dave Airlie]

On Fri, Apr 10, 2009 at 6:48 PM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> On Fri, 10 Apr 2009 09:42:23 +0100 (IST) Dave Airlie <airlied@linux.ie> wrote:
>
>> > Oh well, I guess I'll just merge it and see what happens.
>>
>> Well I think I jsut had my usual objections to adding anything to intelfb,
>
> What are those?

intelfb is not maintained anymore, I was only the defacto maintainer
due to the last person to touch it rule,
I added support to it for some new hardware before seeing the light of
day and realising my own craziness.

no new hardware support is added or being developed, It can't support
any outputs except VGA.

We now have kernel modesetting for all Intel hw which does almost the
exact same thing except it supports all the outputs
and lots more.

If features for the fb driver are missing from kms, I'd much rather
people work on improving the intel kms fb driver
than trying to make intelfb into something it was never meant to be.

> Will that conflict with this patch?

It was all in the patch so it should be fine.

Dave.
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by:
> High Quality Requirements in a Collaborative Environment.
> Download a free trial of Rational Requirements Composer Now!
> http://p.sf.net/sfu/www-ibm-com
> _______________________________________________
> Linux-fbdev-devel mailing list
> Linux-fbdev-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
>

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p