* [PATCH RESEND 1/2] drm/i915: don't register invalid gmbus pins for bdw
@ 2015-05-06 12:33 Jani Nikula
2015-05-06 12:33 ` [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2015-05-06 12:33 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_i2c.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 3daa7e322326..76070c4e76b3 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -49,6 +49,13 @@ static const struct gmbus_pin gmbus_pins[] = {
[GMBUS_PIN_DPD] = { "dpd", GPIOF },
};
+static const struct gmbus_pin gmbus_pins_bdw[] = {
+ [GMBUS_PIN_VGADDC] = { "vga", GPIOA },
+ [GMBUS_PIN_DPC] = { "dpc", GPIOD },
+ [GMBUS_PIN_DPB] = { "dpb", GPIOE },
+ [GMBUS_PIN_DPD] = { "dpd", GPIOF },
+};
+
static const struct gmbus_pin gmbus_pins_bxt[] = {
[GMBUS_PIN_1_BXT] = { "dpb", PCH_GPIOB },
[GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
@@ -61,6 +68,8 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv,
{
if (IS_BROXTON(dev_priv))
return &gmbus_pins_bxt[pin];
+ else if (IS_BROADWELL(dev_priv))
+ return &gmbus_pins_bdw[pin];
else
return &gmbus_pins[pin];
}
@@ -72,6 +81,8 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
if (IS_BROXTON(dev_priv))
size = ARRAY_SIZE(gmbus_pins_bxt);
+ else if (IS_BROADWELL(dev_priv))
+ size = ARRAY_SIZE(gmbus_pins_bdw);
else
size = ARRAY_SIZE(gmbus_pins);
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-06 12:33 [PATCH RESEND 1/2] drm/i915: don't register invalid gmbus pins for bdw Jani Nikula
@ 2015-05-06 12:33 ` Jani Nikula
2015-05-11 10:42 ` David Weinehall
2015-05-12 11:52 ` Imre Deak
0 siblings, 2 replies; 7+ messages in thread
From: Jani Nikula @ 2015-05-06 12:33 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 76070c4e76b3..92072f56e418 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -56,6 +56,12 @@ static const struct gmbus_pin gmbus_pins_bdw[] = {
[GMBUS_PIN_DPD] = { "dpd", GPIOF },
};
+static const struct gmbus_pin gmbus_pins_skl[] = {
+ [GMBUS_PIN_DPC] = { "dpc", GPIOD },
+ [GMBUS_PIN_DPB] = { "dpb", GPIOE },
+ [GMBUS_PIN_DPD] = { "dpd", GPIOF },
+};
+
static const struct gmbus_pin gmbus_pins_bxt[] = {
[GMBUS_PIN_1_BXT] = { "dpb", PCH_GPIOB },
[GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
@@ -68,6 +74,8 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv,
{
if (IS_BROXTON(dev_priv))
return &gmbus_pins_bxt[pin];
+ else if (IS_SKYLAKE(dev_priv))
+ return &gmbus_pins_skl[pin];
else if (IS_BROADWELL(dev_priv))
return &gmbus_pins_bdw[pin];
else
@@ -81,6 +89,8 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
if (IS_BROXTON(dev_priv))
size = ARRAY_SIZE(gmbus_pins_bxt);
+ else if (IS_SKYLAKE(dev_priv))
+ size = ARRAY_SIZE(gmbus_pins_skl);
else if (IS_BROADWELL(dev_priv))
size = ARRAY_SIZE(gmbus_pins_bdw);
else
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-06 12:33 ` [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl Jani Nikula
@ 2015-05-11 10:42 ` David Weinehall
2015-05-11 11:13 ` Jani Nikula
2015-05-12 11:52 ` Imre Deak
1 sibling, 1 reply; 7+ messages in thread
From: David Weinehall @ 2015-05-11 10:42 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Wed, May 06, 2015 at 03:33:44PM +0300, Jani Nikula wrote:
> Do no expose invalid gmbus pins as i2c devices to userspace.
"Do not", perchance?
Kind regards, David
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-11 10:42 ` David Weinehall
@ 2015-05-11 11:13 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2015-05-11 11:13 UTC (permalink / raw)
To: David Weinehall; +Cc: intel-gfx
On Mon, 11 May 2015, David Weinehall <david.weinehall@linux.intel.com> wrote:
> On Wed, May 06, 2015 at 03:33:44PM +0300, Jani Nikula wrote:
>> Do no expose invalid gmbus pins as i2c devices to userspace.
>
> "Do not", perchance?
Indeed, and copy-pasted to both...
Jani.
>
>
> Kind regards, David
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-06 12:33 ` [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl Jani Nikula
2015-05-11 10:42 ` David Weinehall
@ 2015-05-12 11:52 ` Imre Deak
2015-05-12 12:24 ` Jani Nikula
1 sibling, 1 reply; 7+ messages in thread
From: Imre Deak @ 2015-05-12 11:52 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On ke, 2015-05-06 at 15:33 +0300, Jani Nikula wrote:
> Do no expose invalid gmbus pins as i2c devices to userspace.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Looks ok, on both 1/2 and 2/2:
Reviewed-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
> index 76070c4e76b3..92072f56e418 100644
> --- a/drivers/gpu/drm/i915/intel_i2c.c
> +++ b/drivers/gpu/drm/i915/intel_i2c.c
> @@ -56,6 +56,12 @@ static const struct gmbus_pin gmbus_pins_bdw[] = {
> [GMBUS_PIN_DPD] = { "dpd", GPIOF },
> };
>
> +static const struct gmbus_pin gmbus_pins_skl[] = {
> + [GMBUS_PIN_DPC] = { "dpc", GPIOD },
> + [GMBUS_PIN_DPB] = { "dpb", GPIOE },
> + [GMBUS_PIN_DPD] = { "dpd", GPIOF },
> +};
> +
> static const struct gmbus_pin gmbus_pins_bxt[] = {
> [GMBUS_PIN_1_BXT] = { "dpb", PCH_GPIOB },
> [GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
> @@ -68,6 +74,8 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv,
> {
> if (IS_BROXTON(dev_priv))
> return &gmbus_pins_bxt[pin];
> + else if (IS_SKYLAKE(dev_priv))
> + return &gmbus_pins_skl[pin];
> else if (IS_BROADWELL(dev_priv))
> return &gmbus_pins_bdw[pin];
> else
> @@ -81,6 +89,8 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
>
> if (IS_BROXTON(dev_priv))
> size = ARRAY_SIZE(gmbus_pins_bxt);
> + else if (IS_SKYLAKE(dev_priv))
> + size = ARRAY_SIZE(gmbus_pins_skl);
> else if (IS_BROADWELL(dev_priv))
> size = ARRAY_SIZE(gmbus_pins_bdw);
> else
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-12 11:52 ` Imre Deak
@ 2015-05-12 12:24 ` Jani Nikula
2015-05-12 13:09 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2015-05-12 12:24 UTC (permalink / raw)
To: imre.deak; +Cc: intel-gfx
On Tue, 12 May 2015, Imre Deak <imre.deak@intel.com> wrote:
> On ke, 2015-05-06 at 15:33 +0300, Jani Nikula wrote:
>> Do no expose invalid gmbus pins as i2c devices to userspace.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Looks ok, on both 1/2 and 2/2:
> Reviewed-by: Imre Deak <imre.deak@intel.com>
Daniel, please fix 's/Do no/Do not/' in commit messages while applying.
Thanks,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++
>> 1 file changed, 10 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
>> index 76070c4e76b3..92072f56e418 100644
>> --- a/drivers/gpu/drm/i915/intel_i2c.c
>> +++ b/drivers/gpu/drm/i915/intel_i2c.c
>> @@ -56,6 +56,12 @@ static const struct gmbus_pin gmbus_pins_bdw[] = {
>> [GMBUS_PIN_DPD] = { "dpd", GPIOF },
>> };
>>
>> +static const struct gmbus_pin gmbus_pins_skl[] = {
>> + [GMBUS_PIN_DPC] = { "dpc", GPIOD },
>> + [GMBUS_PIN_DPB] = { "dpb", GPIOE },
>> + [GMBUS_PIN_DPD] = { "dpd", GPIOF },
>> +};
>> +
>> static const struct gmbus_pin gmbus_pins_bxt[] = {
>> [GMBUS_PIN_1_BXT] = { "dpb", PCH_GPIOB },
>> [GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
>> @@ -68,6 +74,8 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv,
>> {
>> if (IS_BROXTON(dev_priv))
>> return &gmbus_pins_bxt[pin];
>> + else if (IS_SKYLAKE(dev_priv))
>> + return &gmbus_pins_skl[pin];
>> else if (IS_BROADWELL(dev_priv))
>> return &gmbus_pins_bdw[pin];
>> else
>> @@ -81,6 +89,8 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv,
>>
>> if (IS_BROXTON(dev_priv))
>> size = ARRAY_SIZE(gmbus_pins_bxt);
>> + else if (IS_SKYLAKE(dev_priv))
>> + size = ARRAY_SIZE(gmbus_pins_skl);
>> else if (IS_BROADWELL(dev_priv))
>> size = ARRAY_SIZE(gmbus_pins_bdw);
>> else
>
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
2015-05-12 12:24 ` Jani Nikula
@ 2015-05-12 13:09 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2015-05-12 13:09 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, May 12, 2015 at 03:24:49PM +0300, Jani Nikula wrote:
> On Tue, 12 May 2015, Imre Deak <imre.deak@intel.com> wrote:
> > On ke, 2015-05-06 at 15:33 +0300, Jani Nikula wrote:
> >> Do no expose invalid gmbus pins as i2c devices to userspace.
> >>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >
> > Looks ok, on both 1/2 and 2/2:
> > Reviewed-by: Imre Deak <imre.deak@intel.com>
>
> Daniel, please fix 's/Do no/Do not/' in commit messages while applying.
Done, thanks for patches&review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-05-12 13:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-06 12:33 [PATCH RESEND 1/2] drm/i915: don't register invalid gmbus pins for bdw Jani Nikula
2015-05-06 12:33 ` [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl Jani Nikula
2015-05-11 10:42 ` David Weinehall
2015-05-11 11:13 ` Jani Nikula
2015-05-12 11:52 ` Imre Deak
2015-05-12 12:24 ` Jani Nikula
2015-05-12 13:09 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox