[GIT PULL] TDA998x I2C driver CEC support

[GIT PULL] TDA998x I2C driver CEC support

[Russell King]

David,

Please incorporate support for TDA998x I2C driver CEC, which can be
found at:

  git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel

with SHA1 ba52762fb1430b2a2ea8127c1a292c15f13b8dac, based on v4.16.

This set of changes brings support for HDMI CEC to the TDA998x driver.

There is a conflict, the resolution for which is trivial, and is
included below.

This will update the following files:

 .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
 drivers/gpu/drm/i2c/Kconfig                        |   6 +
 drivers/gpu/drm/i2c/Makefile                       |   1 +
 drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
 drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
 include/linux/platform_data/tda9950.h              |  16 +
 6 files changed, 750 insertions(+), 27 deletions(-)
 create mode 100644 drivers/gpu/drm/i2c/tda9950.c
 create mode 100644 include/linux/platform_data/tda9950.h

through these changes:

Russell King (7):
      drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
      drm/i2c: tda998x: fix error cleanup paths
      drm/i2c: tda998x: move CEC device initialisation later
      drm/i2c: tda998x: always disable and clear interrupts at probe
      drm/i2c: tda9950: add CEC driver
      drm/i2c: tda998x: add CEC support
      dt-bindings: tda998x: add the calibration gpio

Many thanks.

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index eb9916bd84a4,9e67a7b4e3a4..000000000000
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -1783,14 -1600,8 +1783,13 @@@ fail
  	/* if encoder_init fails, the encoder slave is never registered,
  	 * so cleanup here:
  	 */
- 	if (priv->cec)
- 		i2c_unregister_device(priv->cec);
+ 	i2c_unregister_device(priv->cec);
 -	return -ENXIO;
 +	if (priv->cec_notify)
 +		cec_notifier_put(priv->cec_notify);
 +	if (client->irq)
 +		free_irq(client->irq, priv);
 +err_irq:
 +	return ret;
  }
  
  static void tda998x_encoder_prepare(struct drm_encoder *encoder)

With that resolution, the diffstat becomes:

 .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
 drivers/gpu/drm/i2c/Kconfig                        |   6 +
 drivers/gpu/drm/i2c/Makefile                       |   1 +
 drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
 drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
 include/linux/platform_data/tda9950.h              |  16 +
 6 files changed, 750 insertions(+), 27 deletions(-)
 create mode 100644 drivers/gpu/drm/i2c/tda9950.c
 create mode 100644 include/linux/platform_data/tda9950.h

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

Re: [GIT PULL] TDA998x I2C driver CEC support

[Russell King]

Hi David,

I don't see this in what I presume is your tree yet - do you have some
concern about merging this series?

Thanks.

On Tue, Apr 24, 2018 at 10:54:56AM +0100, Russell King wrote:
> David,
> 
> Please incorporate support for TDA998x I2C driver CEC, which can be
> found at:
> 
>   git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
> 
> with SHA1 ba52762fb1430b2a2ea8127c1a292c15f13b8dac, based on v4.16.
> 
> This set of changes brings support for HDMI CEC to the TDA998x driver.
> 
> There is a conflict, the resolution for which is trivial, and is
> included below.
> 
> This will update the following files:
> 
>  .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
>  drivers/gpu/drm/i2c/Kconfig                        |   6 +
>  drivers/gpu/drm/i2c/Makefile                       |   1 +
>  drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
>  drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
>  include/linux/platform_data/tda9950.h              |  16 +
>  6 files changed, 750 insertions(+), 27 deletions(-)
>  create mode 100644 drivers/gpu/drm/i2c/tda9950.c
>  create mode 100644 include/linux/platform_data/tda9950.h
> 
> through these changes:
> 
> Russell King (7):
>       drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
>       drm/i2c: tda998x: fix error cleanup paths
>       drm/i2c: tda998x: move CEC device initialisation later
>       drm/i2c: tda998x: always disable and clear interrupts at probe
>       drm/i2c: tda9950: add CEC driver
>       drm/i2c: tda998x: add CEC support
>       dt-bindings: tda998x: add the calibration gpio
> 
> Many thanks.
> 
> diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
> index eb9916bd84a4,9e67a7b4e3a4..000000000000
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@@ -1783,14 -1600,8 +1783,13 @@@ fail
>   	/* if encoder_init fails, the encoder slave is never registered,
>   	 * so cleanup here:
>   	 */
> - 	if (priv->cec)
> - 		i2c_unregister_device(priv->cec);
> + 	i2c_unregister_device(priv->cec);
>  -	return -ENXIO;
>  +	if (priv->cec_notify)
>  +		cec_notifier_put(priv->cec_notify);
>  +	if (client->irq)
>  +		free_irq(client->irq, priv);
>  +err_irq:
>  +	return ret;
>   }
>   
>   static void tda998x_encoder_prepare(struct drm_encoder *encoder)
> 
> With that resolution, the diffstat becomes:
> 
>  .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
>  drivers/gpu/drm/i2c/Kconfig                        |   6 +
>  drivers/gpu/drm/i2c/Makefile                       |   1 +
>  drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
>  drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
>  include/linux/platform_data/tda9950.h              |  16 +
>  6 files changed, 750 insertions(+), 27 deletions(-)
>  create mode 100644 drivers/gpu/drm/i2c/tda9950.c
>  create mode 100644 include/linux/platform_data/tda9950.h
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Dave Airlie]

Sorry I missed this, just fell between the cracks,

Any reason you can't/don't use git pull-request to generate pulls? we
have some scripts that parse pulls for tracking now, but this pull
didn't get into the system as it doesn't use the template.

Dave.

On 18 May 2018 at 02:06, Russell King <rmk@armlinux.org.uk> wrote:
> Hi David,
>
> I don't see this in what I presume is your tree yet - do you have some
> concern about merging this series?
>
> Thanks.
>
> On Tue, Apr 24, 2018 at 10:54:56AM +0100, Russell King wrote:
>> David,
>>
>> Please incorporate support for TDA998x I2C driver CEC, which can be
>> found at:
>>
>>   git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
>>
>> with SHA1 ba52762fb1430b2a2ea8127c1a292c15f13b8dac, based on v4.16.
>>
>> This set of changes brings support for HDMI CEC to the TDA998x driver.
>>
>> There is a conflict, the resolution for which is trivial, and is
>> included below.
>>
>> This will update the following files:
>>
>>  .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
>>  drivers/gpu/drm/i2c/Kconfig                        |   6 +
>>  drivers/gpu/drm/i2c/Makefile                       |   1 +
>>  drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
>>  drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
>>  include/linux/platform_data/tda9950.h              |  16 +
>>  6 files changed, 750 insertions(+), 27 deletions(-)
>>  create mode 100644 drivers/gpu/drm/i2c/tda9950.c
>>  create mode 100644 include/linux/platform_data/tda9950.h
>>
>> through these changes:
>>
>> Russell King (7):
>>       drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
>>       drm/i2c: tda998x: fix error cleanup paths
>>       drm/i2c: tda998x: move CEC device initialisation later
>>       drm/i2c: tda998x: always disable and clear interrupts at probe
>>       drm/i2c: tda9950: add CEC driver
>>       drm/i2c: tda998x: add CEC support
>>       dt-bindings: tda998x: add the calibration gpio
>>
>> Many thanks.
>>
>> diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
>> index eb9916bd84a4,9e67a7b4e3a4..000000000000
>> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
>> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
>> @@@ -1783,14 -1600,8 +1783,13 @@@ fail
>>       /* if encoder_init fails, the encoder slave is never registered,
>>        * so cleanup here:
>>        */
>> -     if (priv->cec)
>> -             i2c_unregister_device(priv->cec);
>> +     i2c_unregister_device(priv->cec);
>>  -    return -ENXIO;
>>  +    if (priv->cec_notify)
>>  +            cec_notifier_put(priv->cec_notify);
>>  +    if (client->irq)
>>  +            free_irq(client->irq, priv);
>>  +err_irq:
>>  +    return ret;
>>   }
>>
>>   static void tda998x_encoder_prepare(struct drm_encoder *encoder)
>>
>> With that resolution, the diffstat becomes:
>>
>>  .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
>>  drivers/gpu/drm/i2c/Kconfig                        |   6 +
>>  drivers/gpu/drm/i2c/Makefile                       |   1 +
>>  drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
>>  drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
>>  include/linux/platform_data/tda9950.h              |  16 +
>>  6 files changed, 750 insertions(+), 27 deletions(-)
>>  create mode 100644 drivers/gpu/drm/i2c/tda9950.c
>>  create mode 100644 include/linux/platform_data/tda9950.h
>>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Russell King]

On Tue, May 22, 2018 at 10:53:49AM +1000, Dave Airlie wrote:
> Sorry I missed this, just fell between the cracks,
> 
> Any reason you can't/don't use git pull-request to generate pulls? we
> have some scripts that parse pulls for tracking now, but this pull
> didn't get into the system as it doesn't use the template.

I've never used git pull-request, and it doesn't seem to be part of
the git installation I have:

$ git pull-request --help
No manual entry for gitpull-request
$ git pull-request
git: 'pull-request' is not a git command. See 'git --help'.
$ git --version
git version 2.7.4

-- 
Russell King
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Daniel Vetter]

On Tue, May 22, 2018 at 09:27:07AM +0100, Russell King wrote:
> On Tue, May 22, 2018 at 10:53:49AM +1000, Dave Airlie wrote:
> > Sorry I missed this, just fell between the cracks,
> > 
> > Any reason you can't/don't use git pull-request to generate pulls? we
> > have some scripts that parse pulls for tracking now, but this pull
> > didn't get into the system as it doesn't use the template.
> 
> I've never used git pull-request, and it doesn't seem to be part of
> the git installation I have:

The command is called request-pull. Our scripting wraps it in
pull-request, which I guess caused the confusion.
-Daniel

> 
> $ git pull-request --help
> No manual entry for gitpull-request
> $ git pull-request
> git: 'pull-request' is not a git command. See 'git --help'.
> $ git --version
> git version 2.7.4
> 
> -- 
> Russell King
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Russell King]

On Wed, May 23, 2018 at 10:48:15AM +0200, Daniel Vetter wrote:
> On Tue, May 22, 2018 at 09:27:07AM +0100, Russell King wrote:
> > On Tue, May 22, 2018 at 10:53:49AM +1000, Dave Airlie wrote:
> > > Sorry I missed this, just fell between the cracks,
> > > 
> > > Any reason you can't/don't use git pull-request to generate pulls? we
> > > have some scripts that parse pulls for tracking now, but this pull
> > > didn't get into the system as it doesn't use the template.
> > 
> > I've never used git pull-request, and it doesn't seem to be part of
> > the git installation I have:
> 
> The command is called request-pull. Our scripting wraps it in
> pull-request, which I guess caused the confusion.

[Adding Linus]

Hmm, so where do people put the hand-written commentry in a git
request-pull formatted request that Linus likes to see when sending
such requests to Linus?

I can understand other maintainers not caring about that, but whatever
solution I have to this must work for sending to Linus as well - the
format of my pull requests are based on an example format from Linus
in the early days of git before request-pull even existed.  They also
satisfy Linus' other need which is that they need to be clearly
identifyable as truely being from the maintainer - I believe Linus
uses format and language in the request as part of that.

The other thing I notice is that the request-pull format is very
impersonal, doesn't say what the summary of changes are (it probably
has no way to do so), and contains no gratitudes - its tone is very
much like an order than a request.  Compare the one I sent in April
with this:

The following changes since commit 0adb32858b0bddf4ada5f364a84ed60b196dbcda:

  Linux 4.16 (2018-04-01 14:20:27 -0700)

are available in the git repository at:

  git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel

for you to fetch changes up to ba52762fb1430b2a2ea8127c1a292c15f13b8dac:

  dt-bindings: tda998x: add the calibration gpio (2018-04-24 10:44:36 +0100)

----------------------------------------------------------------
Russell King (7):
      drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
      drm/i2c: tda998x: fix error cleanup paths
      drm/i2c: tda998x: move CEC device initialisation later
      drm/i2c: tda998x: always disable and clear interrupts at probe
      drm/i2c: tda9950: add CEC driver
      drm/i2c: tda998x: add CEC support
      dt-bindings: tda998x: add the calibration gpio

 .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
 drivers/gpu/drm/i2c/Kconfig                        |   6 +
 drivers/gpu/drm/i2c/Makefile                       |   1 +
 drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
 drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
 include/linux/platform_data/tda9950.h              |  16 +
 6 files changed, 750 insertions(+), 27 deletions(-)
 create mode 100644 drivers/gpu/drm/i2c/tda9950.c
 create mode 100644 include/linux/platform_data/tda9950.h

-- 
Russell King
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Daniel Vetter]

On Wed, May 23, 2018 at 11:13 AM, Russell King <rmk@armlinux.org.uk> wrote:
> On Wed, May 23, 2018 at 10:48:15AM +0200, Daniel Vetter wrote:
>> On Tue, May 22, 2018 at 09:27:07AM +0100, Russell King wrote:
>> > On Tue, May 22, 2018 at 10:53:49AM +1000, Dave Airlie wrote:
>> > > Sorry I missed this, just fell between the cracks,
>> > >
>> > > Any reason you can't/don't use git pull-request to generate pulls? we
>> > > have some scripts that parse pulls for tracking now, but this pull
>> > > didn't get into the system as it doesn't use the template.
>> >
>> > I've never used git pull-request, and it doesn't seem to be part of
>> > the git installation I have:
>>
>> The command is called request-pull. Our scripting wraps it in
>> pull-request, which I guess caused the confusion.
>
> [Adding Linus]
>
> Hmm, so where do people put the hand-written commentry in a git
> request-pull formatted request that Linus likes to see when sending
> such requests to Linus?
>
> I can understand other maintainers not caring about that, but whatever
> solution I have to this must work for sending to Linus as well - the
> format of my pull requests are based on an example format from Linus
> in the early days of git before request-pull even existed.  They also
> satisfy Linus' other need which is that they need to be clearly
> identifyable as truely being from the maintainer - I believe Linus
> uses format and language in the request as part of that.
>
> The other thing I notice is that the request-pull format is very
> impersonal, doesn't say what the summary of changes are (it probably
> has no way to do so), and contains no gratitudes - its tone is very
> much like an order than a request.  Compare the one I sent in April
> with this:

Either you add it at the top, before sending out the main message. Our
scripts we use for drm group maintained trees also add a "Hi Dave!" at
the top for the personal touch.

Even better is if you do an annotated tag, in that case request-pull
will automatically include the tag annotation as part of your pull
request (plus git pull will included it in the merge commit message
draft). Our scripts do that too. Example of what we generate:

https://patchwork.freedesktop.org/patch/223444/

Our scripts also signs the tag, if the maintainer has that part set up
correctly in the configuration of the script - only thing needed is
the gpg key to sign stuff with.

Cheers, Daniel

> The following changes since commit 0adb32858b0bddf4ada5f364a84ed60b196dbcda:
>
>   Linux 4.16 (2018-04-01 14:20:27 -0700)
>
> are available in the git repository at:
>
>   git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
>
> for you to fetch changes up to ba52762fb1430b2a2ea8127c1a292c15f13b8dac:
>
>   dt-bindings: tda998x: add the calibration gpio (2018-04-24 10:44:36 +0100)
>
> ----------------------------------------------------------------
> Russell King (7):
>       drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
>       drm/i2c: tda998x: fix error cleanup paths
>       drm/i2c: tda998x: move CEC device initialisation later
>       drm/i2c: tda998x: always disable and clear interrupts at probe
>       drm/i2c: tda9950: add CEC driver
>       drm/i2c: tda998x: add CEC support
>       dt-bindings: tda998x: add the calibration gpio
>
>  .../devicetree/bindings/display/bridge/tda998x.txt |   3 +
>  drivers/gpu/drm/i2c/Kconfig                        |   6 +
>  drivers/gpu/drm/i2c/Makefile                       |   1 +
>  drivers/gpu/drm/i2c/tda9950.c                      | 509 +++++++++++++++++++++
>  drivers/gpu/drm/i2c/tda998x_drv.c                  | 242 ++++++++--
>  include/linux/platform_data/tda9950.h              |  16 +
>  6 files changed, 750 insertions(+), 27 deletions(-)
>  create mode 100644 drivers/gpu/drm/i2c/tda9950.c
>  create mode 100644 include/linux/platform_data/tda9950.h
>
> --
> Russell King



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [GIT PULL] TDA998x I2C driver CEC support

[Dave Airlie]

On 23 May 2018 at 19:13, Russell King <rmk@armlinux.org.uk> wrote:
> On Wed, May 23, 2018 at 10:48:15AM +0200, Daniel Vetter wrote:
>> On Tue, May 22, 2018 at 09:27:07AM +0100, Russell King wrote:
>> > On Tue, May 22, 2018 at 10:53:49AM +1000, Dave Airlie wrote:
>> > > Sorry I missed this, just fell between the cracks,
>> > >
>> > > Any reason you can't/don't use git pull-request to generate pulls? we
>> > > have some scripts that parse pulls for tracking now, but this pull
>> > > didn't get into the system as it doesn't use the template.
>> >
>> > I've never used git pull-request, and it doesn't seem to be part of
>> > the git installation I have:
>>
>> The command is called request-pull. Our scripting wraps it in
>> pull-request, which I guess caused the confusion.
>
> [Adding Linus]
>
> Hmm, so where do people put the hand-written commentry in a git
> request-pull formatted request that Linus likes to see when sending
> such requests to Linus?
>
> I can understand other maintainers not caring about that, but whatever
> solution I have to this must work for sending to Linus as well - the
> format of my pull requests are based on an example format from Linus
> in the early days of git before request-pull even existed.  They also
> satisfy Linus' other need which is that they need to be clearly
> identifyable as truely being from the maintainer - I believe Linus
> uses format and language in the request as part of that.
>
> The other thing I notice is that the request-pull format is very
> impersonal, doesn't say what the summary of changes are (it probably
> has no way to do so), and contains no gratitudes - its tone is very
> much like an order than a request.  Compare the one I sent in April
> with this:

If you look at any of the ones I send and Linus accepts they are all generated
with the git script, I think Linus likes seeing things with the git script.

I tend to just write a summary before the contents of the pull request that the
script produces.

Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel