diff mbox

drm/i915: no lvds quirk for hp t5740

Message ID 20130415093905.GC24925@cantiga.alporthouse.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Wilson April 15, 2013, 9:39 a.m. UTC 
On Mon, Apr 15, 2013 at 06:39:15AM +0000, Ben Mesman (Bossers & Cnossen BV) wrote:
> Op vrijdag 12 april 2013 14:47 schreef Chris Wilson:
> > On Fri, Apr 12, 2013 at 02:24:43PM +0200, Ben Mesman wrote:
> > > Last year, a patch was made for the "HP t5740e Thin Client" (see
> > > http://lists.freedesktop.org/archives/dri-devel/2012-May/023245.html).
> > > This device reports an lvds panel, but does not really have one.
> > >
> > > The predecessor of this device is the "hp t5740", which also does not
> > > have an lvds panel. This patch will add the same quirk for this device.
> > >
> > > Signed-off-by: Ben Mesman <ben@bnc.nl>
> > > ---
> > >  drivers/gpu/drm/i915/intel_lvds.c |    8 ++++++++
> > >  1 file changed, 8 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> > > b/drivers/gpu/drm/i915/intel_lvds.c
> > > index ca2d903..8a56d9b 100644
> > > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > > @@ -816,6 +816,14 @@ static const struct dmi_system_id intel_no_lvds[] =
> > {
> > >  	},
> > >  	{
> > >  		.callback = intel_no_lvds_dmi_callback,
> > > +		.ident = "Hewlett-Packard hp t5740",
> > > +		.matches = {
> > > +			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-
> > Packard"),
> > > +			DMI_MATCH(DMI_PRODUCT_NAME, "hp t5740"),
> > > +		},
> > > +	},
> > 
> > One thing to note is that the dmi matching routine uses strstr (as opposed to
> > dmi_match() which uses strcmp!) so this rule should encompass the
> > following rule for its offspring.
> 
> I am sorry, I don't know what you are asking here. Is there something wrong with this patch?

I meant you could adjust the t5470e rule to also catch t5470:

dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Ben Mesman (Bossers & Cnossen BV) April 15, 2013, 9:54 a.m. UTC | #1 
> -----Oorspronkelijk bericht-----
> Van: 'Chris Wilson' [mailto:chris@chris-wilson.co.uk]
> Verzonden: maandag 15 april 2013 11:39
> Aan: Ben Mesman (Bossers & Cnossen BV)
> CC: Daniel Vetter; dri-devel@lists.freedesktop.org
> Onderwerp: Re: [PATCH] drm/i915: no lvds quirk for hp t5740
> 
> On Mon, Apr 15, 2013 at 06:39:15AM +0000, Ben Mesman (Bossers &
> Cnossen BV) wrote:
> > Op vrijdag 12 april 2013 14:47 schreef Chris Wilson:
> > > On Fri, Apr 12, 2013 at 02:24:43PM +0200, Ben Mesman wrote:
> > > > Last year, a patch was made for the "HP t5740e Thin Client" (see
> > > > http://lists.freedesktop.org/archives/dri-devel/2012-
> May/023245.html).
> > > > This device reports an lvds panel, but does not really have one.
> > > >
> > > > The predecessor of this device is the "hp t5740", which also does
> > > > not have an lvds panel. This patch will add the same quirk for this
> device.
> > > >
> > > > Signed-off-by: Ben Mesman <ben@bnc.nl>
> > > > ---
> > > >  drivers/gpu/drm/i915/intel_lvds.c |    8 ++++++++
> > > >  1 file changed, 8 insertions(+)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> > > > b/drivers/gpu/drm/i915/intel_lvds.c
> > > > index ca2d903..8a56d9b 100644
> > > > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > > > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > > > @@ -816,6 +816,14 @@ static const struct dmi_system_id
> > > > intel_no_lvds[] =
> > > {
> > > >  	},
> > > >  	{
> > > >  		.callback = intel_no_lvds_dmi_callback,
> > > > +		.ident = "Hewlett-Packard hp t5740",
> > > > +		.matches = {
> > > > +			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-
> > > Packard"),
> > > > +			DMI_MATCH(DMI_PRODUCT_NAME, "hp t5740"),
> > > > +		},
> > > > +	},
> > >
> > > One thing to note is that the dmi matching routine uses strstr (as
> > > opposed to
> > > dmi_match() which uses strcmp!) so this rule should encompass the
> > > following rule for its offspring.
> >
> > I am sorry, I don't know what you are asking here. Is there something
> wrong with this patch?
> 
> I meant you could adjust the t5470e rule to also catch t5470:

Except that strstr is (probably?) not case-insensitive.

> diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> b/drivers/gpu/drm/i915/intel_lvds index ca2d903..e321f08 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -816,10 +816,10 @@ static const struct dmi_system_id intel_no_lvds[] =
> {
>         },
>         {
>                 .callback = intel_no_lvds_dmi_callback,
> -               .ident = "Hewlett-Packard HP t5740e Thin Client",
> +               .ident = "Hewlett-Packard HP t5740 Thin Client",
>                 .matches = {
>                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
> -                       DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Client"),
> +                       DMI_MATCH(DMI_PRODUCT_NAME, "hp t5740"),
> 
> --
> Chris Wilson, Intel Open Source Technology Centre
Chris Wilson April 15, 2013, 9:59 a.m. UTC | #2 
On Mon, Apr 15, 2013 at 09:54:56AM +0000, Ben Mesman (Bossers & Cnossen BV) wrote:
> > -----Oorspronkelijk bericht-----
> > Van: 'Chris Wilson' [mailto:chris@chris-wilson.co.uk]
> > Verzonden: maandag 15 april 2013 11:39
> > Aan: Ben Mesman (Bossers & Cnossen BV)
> > CC: Daniel Vetter; dri-devel@lists.freedesktop.org
> > Onderwerp: Re: [PATCH] drm/i915: no lvds quirk for hp t5740
> > 
> > On Mon, Apr 15, 2013 at 06:39:15AM +0000, Ben Mesman (Bossers &
> > Cnossen BV) wrote:
> > > Op vrijdag 12 april 2013 14:47 schreef Chris Wilson:
> > > > On Fri, Apr 12, 2013 at 02:24:43PM +0200, Ben Mesman wrote:
> > > > > Last year, a patch was made for the "HP t5740e Thin Client" (see
> > > > > http://lists.freedesktop.org/archives/dri-devel/2012-
> > May/023245.html).
> > > > > This device reports an lvds panel, but does not really have one.
> > > > >
> > > > > The predecessor of this device is the "hp t5740", which also does
> > > > > not have an lvds panel. This patch will add the same quirk for this
> > device.
> > > > >
> > > > > Signed-off-by: Ben Mesman <ben@bnc.nl>
> > > > > ---
> > > > >  drivers/gpu/drm/i915/intel_lvds.c |    8 ++++++++
> > > > >  1 file changed, 8 insertions(+)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> > > > > b/drivers/gpu/drm/i915/intel_lvds.c
> > > > > index ca2d903..8a56d9b 100644
> > > > > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > > > > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > > > > @@ -816,6 +816,14 @@ static const struct dmi_system_id
> > > > > intel_no_lvds[] =
> > > > {
> > > > >  	},
> > > > >  	{
> > > > >  		.callback = intel_no_lvds_dmi_callback,
> > > > > +		.ident = "Hewlett-Packard hp t5740",
> > > > > +		.matches = {
> > > > > +			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-
> > > > Packard"),
> > > > > +			DMI_MATCH(DMI_PRODUCT_NAME, "hp t5740"),
> > > > > +		},
> > > > > +	},
> > > >
> > > > One thing to note is that the dmi matching routine uses strstr (as
> > > > opposed to
> > > > dmi_match() which uses strcmp!) so this rule should encompass the
> > > > following rule for its offspring.
> > >
> > > I am sorry, I don't know what you are asking here. Is there something
> > wrong with this patch?
> > 
> > I meant you could adjust the t5470e rule to also catch t5470:
> 
> Except that strstr is (probably?) not case-insensitive.

Whoops, then drop the "hp" prefix as the board vendor is already
specified.
-Chris
Ben Mesman (Bossers & Cnossen BV) April 15, 2013, 2:13 p.m. UTC | #3 
> -----Oorspronkelijk bericht-----
> Van: 'Chris Wilson' [mailto:chris@chris-wilson.co.uk]
> Verzonden: maandag 15 april 2013 11:59
> Aan: Ben Mesman (Bossers & Cnossen BV)
> CC: Daniel Vetter; dri-devel@lists.freedesktop.org
> Onderwerp: Re: [PATCH] drm/i915: no lvds quirk for hp t5740
> 
> On Mon, Apr 15, 2013 at 09:54:56AM +0000, Ben Mesman (Bossers &
> Cnossen BV) wrote:
> > > -----Oorspronkelijk bericht-----
> > > Van: 'Chris Wilson' [mailto:chris@chris-wilson.co.uk]
> > > Verzonden: maandag 15 april 2013 11:39
> > > Aan: Ben Mesman (Bossers & Cnossen BV)
> > > CC: Daniel Vetter; dri-devel@lists.freedesktop.org
> > > Onderwerp: Re: [PATCH] drm/i915: no lvds quirk for hp t5740
> > >
> > > On Mon, Apr 15, 2013 at 06:39:15AM +0000, Ben Mesman (Bossers &
> > > Cnossen BV) wrote:
> > > > Op vrijdag 12 april 2013 14:47 schreef Chris Wilson:
> > > > > On Fri, Apr 12, 2013 at 02:24:43PM +0200, Ben Mesman wrote:
> > > > > > Last year, a patch was made for the "HP t5740e Thin Client"
> > > > > > (see
> > > > > > http://lists.freedesktop.org/archives/dri-devel/2012-
> > > May/023245.html).
> > > > > > This device reports an lvds panel, but does not really have one.
> > > > > >
> > > > > > The predecessor of this device is the "hp t5740", which also
> > > > > > does not have an lvds panel. This patch will add the same
> > > > > > quirk for this
> > > device.
> > > > > >
> > > > > > Signed-off-by: Ben Mesman <ben@bnc.nl>
> > > > > > ---
> > > > > >  drivers/gpu/drm/i915/intel_lvds.c |    8 ++++++++
> > > > > >  1 file changed, 8 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> > > > > > b/drivers/gpu/drm/i915/intel_lvds.c
> > > > > > index ca2d903..8a56d9b 100644
> > > > > > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > > > > > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > > > > > @@ -816,6 +816,14 @@ static const struct dmi_system_id
> > > > > > intel_no_lvds[] =
> > > > > {
> > > > > >  	},
> > > > > >  	{
> > > > > >  		.callback = intel_no_lvds_dmi_callback,
> > > > > > +		.ident = "Hewlett-Packard hp t5740",
> > > > > > +		.matches = {
> > > > > > +			DMI_MATCH(DMI_BOARD_VENDOR,
> "Hewlett-
> > > > > Packard"),
> > > > > > +			DMI_MATCH(DMI_PRODUCT_NAME, "hp
> t5740"),
> > > > > > +		},
> > > > > > +	},
> > > > >
> > > > > One thing to note is that the dmi matching routine uses strstr
> > > > > (as opposed to
> > > > > dmi_match() which uses strcmp!) so this rule should encompass
> > > > > the following rule for its offspring.
> > > >
> > > > I am sorry, I don't know what you are asking here. Is there
> > > > something
> > > wrong with this patch?
> > >
> > > I meant you could adjust the t5470e rule to also catch t5470:
> >
> > Except that strstr is (probably?) not case-insensitive.
> 
> Whoops, then drop the "hp" prefix as the board vendor is already specified.

Ok, I reworked the patch and will test this on a t5740 and a t5740e (we have both). If it tests ok, I'll re-submit the patch tomorrow.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds
index ca2d903..e321f08 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -816,10 +816,10 @@  static const struct dmi_system_id intel_no_lvds[] = {
        },
        {
                .callback = intel_no_lvds_dmi_callback,
-               .ident = "Hewlett-Packard HP t5740e Thin Client",
+               .ident = "Hewlett-Packard HP t5740 Thin Client",
                .matches = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Client"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "hp t5740"),

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________