drm/i915: don't register invalid gmbus pins for bdw
Subsystems (2)
PATCH RESEND 1/2 drm/i915: don't register invalid gmbus pins for bdw
Do no expose invalid gmbus pins as i2c devices to userspace.
--- drivers/gpu/drm/i915/intel_i2c.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_i2c.c +11 -0
@@ -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);
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 2/2 drm/i915: don't register invalid gmbus pins for skl
Do no expose invalid gmbus pins as i2c devices to userspace.
--- drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_i2c.c +10 -0
@@ -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
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
Quoted 1 line · Jani Nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
"Do not", perchance?
Kind regards, David
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
Quoted 4 lines · David Weinehall
Quoted 1 line · Jani Nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
"Do not", perchance?
Indeed, and copy-pasted to both...
Jani.
Quoted 3 lines
Kind regards, David
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
In reply to Jani NikulaQuoted 3 lines · Jani Nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
Signed-off-by Jani Nikula <[email protected]>
Looks ok, on both 1/2 and 2/2:
Quoted 31 lines
--- drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/gpu/drm/i915/intel_i2c.c +8
-0@@ -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
drivers/gpu/drm/i915/intel_i2c.c bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv, · line 96
Quoted 8 lines
drivers/gpu/drm/i915/intel_i2c.c +2
-0@@ -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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
Quoted 7 lines · Imre Deak
Quoted 3 lines · Jani Nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
Signed-off-by Jani Nikula <[email protected]>Looks ok, on both 1/2 and 2/2:
Reviewed-by Imre Deak <[email protected]>
Daniel, please fix 's/Do no/Do not/' in commit messages while applying.
Thanks,
Jani.
Quoted 42 lines
Quoted 40 lines
--- drivers/gpu/drm/i915/intel_i2c.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/gpu/drm/i915/intel_i2c.c +10
-0@@ -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
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH RESEND 2/2] drm/i915: don't register invalid gmbus pins for skl
Quoted 10 lines · Jani Nikula
Quoted 7 lines · Imre Deak
Quoted 3 lines · Jani Nikula
Do no expose invalid gmbus pins as i2c devices to userspace.
Signed-off-by Jani Nikula <[email protected]>Looks ok, on both 1/2 and 2/2:
Reviewed-by Imre Deak <[email protected]>Daniel, please fix 's/Do no/Do not/' in commit messages while applying.
Done, thanks for patches&review.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx