[PATCH] drm: Add NVIDIA Tegra30 support

[PATCH] drm: Add NVIDIA Tegra30 support

[Mark Zhang]

This patch is based on Thierry's drm patch for Tegra20:
- [PATCH v2 0/6] Device tree updates for host1x support
- [PATCH v3 0/2] NVIDIA Tegra DRM driver

It adds the support for NVIDIA Tegra30.

Signed-off-by: Mark Zhang <markz@nvidia.com>
---
 drivers/gpu/drm/tegra/dc.c     |    1 +
 drivers/gpu/drm/tegra/host1x.c |    3 +++
 2 files changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 216cd0f..6e9f1b4 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -819,6 +819,7 @@ static int tegra_dc_remove(struct platform_device *pdev)
 
 static struct of_device_id tegra_dc_of_match[] = {
        { .compatible = "nvidia,tegra20-dc", },
+	{ .compatible = "nvidia,tegra30-dc", },
        { },
 };
 
diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/drm/tegra/host1x.c
index 3d02554..07b7e27 100644
--- a/drivers/gpu/drm/tegra/host1x.c
+++ b/drivers/gpu/drm/tegra/host1x.c
@@ -68,6 +68,8 @@ static int host1x_parse_dt(struct host1x *host1x)
        static const char * const compat[] = {
                "nvidia,tegra20-dc",
                "nvidia,tegra20-hdmi",
+		"nvidia,tegra30-dc",
+		"nvidia,tegra30-hdmi",
        };
        unsigned int i;
        int err;
@@ -269,6 +271,7 @@ int host1x_unregister_client(struct host1x *host1x,
 
 static struct of_device_id tegra_host1x_of_match[] = {
        { .compatible = "nvidia,tegra20-host1x", },
+	{ .compatible = "nvidia,tegra30-host1x", },
        { },
 };
 MODULE_DEVICE_TABLE(of, tegra_host1x_of_match);
-- 
1.7.9.5

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

On Fri, Nov 16, 2012 at 12:58:09PM +0800, Mark Zhang wrote:
> This patch is based on Thierry's drm patch for Tegra20:
> - [PATCH v2 0/6] Device tree updates for host1x support
> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
> 
> It adds the support for NVIDIA Tegra30.
> 
> Signed-off-by: Mark Zhang <markz@nvidia.com>

Hi Mark,

I already carry a similar patch in my tegra/next branch and was going to
post that once I get word back that tegra-drm actually works on Tegra30.

You do have the hardware available, right? Did you test this patch on
top of the latest (v3) tegra-drm patches and arch/arm/mach-tegra (v2)
patches I sent a few hours ago?

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Mark Zhang]

On 11/16/2012 02:43 PM, Thierry Reding wrote:
> * PGP Signed by an unknown key
> 
> On Fri, Nov 16, 2012 at 12:58:09PM +0800, Mark Zhang wrote:
>> This patch is based on Thierry's drm patch for Tegra20:
>> - [PATCH v2 0/6] Device tree updates for host1x support
>> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
>>
>> It adds the support for NVIDIA Tegra30.
>>
>> Signed-off-by: Mark Zhang <markz@nvidia.com>
> 
> Hi Mark,
> 
> I already carry a similar patch in my tegra/next branch and was going to
> post that once I get word back that tegra-drm actually works on Tegra30.
>

Sorry for that. Actually I didn't sync your tree yet.

> You do have the hardware available, right? Did you test this patch on
> top of the latest (v3) tegra-drm patches and arch/arm/mach-tegra (v2)
> patches I sent a few hours ago?
> 

Yes, I have a cardhu here. Yes, I made this patch on top of your v3 & v2
patches and it worked on my cardhu.

> Thierry
> 
> * Unknown Key
> * 0x7F3EB3A1
> 

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]

On Fri, Nov 16, 2012 at 02:48:55PM +0800, Mark Zhang wrote:
> On 11/16/2012 02:43 PM, Thierry Reding wrote:
> > * PGP Signed by an unknown key
> > 
> > On Fri, Nov 16, 2012 at 12:58:09PM +0800, Mark Zhang wrote:
> >> This patch is based on Thierry's drm patch for Tegra20:
> >> - [PATCH v2 0/6] Device tree updates for host1x support
> >> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
> >>
> >> It adds the support for NVIDIA Tegra30.
> >>
> >> Signed-off-by: Mark Zhang <markz@nvidia.com>
> > 
> > Hi Mark,
> > 
> > I already carry a similar patch in my tegra/next branch and was going to
> > post that once I get word back that tegra-drm actually works on Tegra30.
> >
> 
> Sorry for that. Actually I didn't sync your tree yet.
> 
> > You do have the hardware available, right? Did you test this patch on
> > top of the latest (v3) tegra-drm patches and arch/arm/mach-tegra (v2)
> > patches I sent a few hours ago?
> > 
> 
> Yes, I have a cardhu here. Yes, I made this patch on top of your v3 & v2
> patches and it worked on my cardhu.

Okay, that's great! The reason I wanted this to be tested again
explicitly is that I've made some minor modifications to bring the
Tegra30 code more in line with the Tegra20 code where clock setup is
concerned.

Since everything works for you on Tegra30, I'll push the Tegra30 related
patches into the branch that David will pull from.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Mark Zhang]

On 11/16/2012 03:11 PM, Thierry Reding wrote:
> * PGP Signed by an unknown key
> 
> On Fri, Nov 16, 2012 at 02:48:55PM +0800, Mark Zhang wrote:
>> On 11/16/2012 02:43 PM, Thierry Reding wrote:
>>>> Old Signed by an unknown key
>>>
>>> On Fri, Nov 16, 2012 at 12:58:09PM +0800, Mark Zhang wrote:
>>>> This patch is based on Thierry's drm patch for Tegra20:
>>>> - [PATCH v2 0/6] Device tree updates for host1x support
>>>> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
>>>>
>>>> It adds the support for NVIDIA Tegra30.
>>>>
>>>> Signed-off-by: Mark Zhang <markz@nvidia.com>
>>>
>>> Hi Mark,
>>>
>>> I already carry a similar patch in my tegra/next branch and was going to
>>> post that once I get word back that tegra-drm actually works on Tegra30.
>>>
>>
>> Sorry for that. Actually I didn't sync your tree yet.
>>
>>> You do have the hardware available, right? Did you test this patch on
>>> top of the latest (v3) tegra-drm patches and arch/arm/mach-tegra (v2)
>>> patches I sent a few hours ago?
>>>
>>
>> Yes, I have a cardhu here. Yes, I made this patch on top of your v3 & v2
>> patches and it worked on my cardhu.
> 
> Okay, that's great! The reason I wanted this to be tested again
> explicitly is that I've made some minor modifications to bring the
> Tegra30 code more in line with the Tegra20 code where clock setup is
> concerned.
> 
> Since everything works for you on Tegra30, I'll push the Tegra30 related
> patches into the branch that David will pull from.
> 

Great. Thanks! Hope to see the display of Tegra 2 and Tegra 3 works in
kernel 3.8.

> Thierry
> 
> * Unknown Key
> * 0x7F3EB3A1
> 

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Stephen Warren]

On 11/15/2012 09:58 PM, Mark Zhang wrote:
> This patch is based on Thierry's drm patch for Tegra20:
> - [PATCH v2 0/6] Device tree updates for host1x support
> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
> 
> It adds the support for NVIDIA Tegra30.

Mark, I tried to apply this for testing locally, but it doesn't apply.

For some reason, all the whitespace in the context has been replaced
with spaces. Are your local copies of dc.c and host1x.c indented with
spaces for some reason, or did the MS Exchange server corrupt your patch
as you sent it (I've previously only observed inbound corruption...)

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Mark Zhang]

On 11/17/2012 12:29 AM, Stephen Warren wrote:
> On 11/15/2012 09:58 PM, Mark Zhang wrote:
>> This patch is based on Thierry's drm patch for Tegra20:
>> - [PATCH v2 0/6] Device tree updates for host1x support
>> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
>>
>> It adds the support for NVIDIA Tegra30.
> 
> Mark, I tried to apply this for testing locally, but it doesn't apply.
> 
> For some reason, all the whitespace in the context has been replaced
> with spaces. Are your local copies of dc.c and host1x.c indented with
> spaces for some reason, or did the MS Exchange server corrupt your patch
> as you sent it (I've previously only observed inbound corruption...)
> 

I think that is because the whitespace in patch which Thierry sent:
"[PATCH v3 1/2] drm: Add NVIDIA Tegra20 support" are all spaces, not tabs.

P.S: I saved the patch mail into an eml file and use "git am <eml file>"
to integrate it into my local tree.

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]

On Mon, Nov 19, 2012 at 02:18:51PM +0800, Mark Zhang wrote:
> On 11/17/2012 12:29 AM, Stephen Warren wrote:
> > On 11/15/2012 09:58 PM, Mark Zhang wrote:
> >> This patch is based on Thierry's drm patch for Tegra20:
> >> - [PATCH v2 0/6] Device tree updates for host1x support
> >> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
> >>
> >> It adds the support for NVIDIA Tegra30.
> > 
> > Mark, I tried to apply this for testing locally, but it doesn't apply.
> > 
> > For some reason, all the whitespace in the context has been replaced
> > with spaces. Are your local copies of dc.c and host1x.c indented with
> > spaces for some reason, or did the MS Exchange server corrupt your patch
> > as you sent it (I've previously only observed inbound corruption...)
> > 
> 
> I think that is because the whitespace in patch which Thierry sent:
> "[PATCH v3 1/2] drm: Add NVIDIA Tegra20 support" are all spaces, not tabs.

I'm pretty sure the issue must be inbound corruption caused by you email
setup. The patches I've sent use tabs properly and I've never seen my
setup corrupt emails.

It seems like this is not the first time that this happens for you guys
and I think I remember it to be the reason why Stephen switched to using
his private email address for open-source work. Your IT guys should fix
this, really. It can't be that hard.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Mark Zhang]

On 11/19/2012 02:45 PM, Thierry Reding wrote:
> * PGP Signed by an unknown key
> 
> On Mon, Nov 19, 2012 at 02:18:51PM +0800, Mark Zhang wrote:
>> On 11/17/2012 12:29 AM, Stephen Warren wrote:
>>> On 11/15/2012 09:58 PM, Mark Zhang wrote:
>>>> This patch is based on Thierry's drm patch for Tegra20:
>>>> - [PATCH v2 0/6] Device tree updates for host1x support
>>>> - [PATCH v3 0/2] NVIDIA Tegra DRM driver
>>>>
>>>> It adds the support for NVIDIA Tegra30.
>>>
>>> Mark, I tried to apply this for testing locally, but it doesn't apply.
>>>
>>> For some reason, all the whitespace in the context has been replaced
>>> with spaces. Are your local copies of dc.c and host1x.c indented with
>>> spaces for some reason, or did the MS Exchange server corrupt your patch
>>> as you sent it (I've previously only observed inbound corruption...)
>>>
>>
>> I think that is because the whitespace in patch which Thierry sent:
>> "[PATCH v3 1/2] drm: Add NVIDIA Tegra20 support" are all spaces, not tabs.
> 
> I'm pretty sure the issue must be inbound corruption caused by you email
> setup. The patches I've sent use tabs properly and I've never seen my
> setup corrupt emails.
> 

Sorry Thierry. It's my bad. I tried to apply Alex's patch and found it
has the same issue, the whitespace is filled with spaces...

I also found if the patch is for dts files, the whitespaces are tabs.
That is really weird.

> It seems like this is not the first time that this happens for you guys
> and I think I remember it to be the reason why Stephen switched to using
> his private email address for open-source work. Your IT guys should fix
> this, really. It can't be that hard.
> 
> Thierry
> 
> * Unknown Key
> * 0x7F3EB3A1
> 

Re: [PATCH] drm: Add NVIDIA Tegra30 support

[Stephen Warren]

On 11/15/2012 09:58 PM, Mark Zhang wrote:
> This patch is based on Thierry's drm patch for Tegra20:
> - [PATCH v2 0/6] Device tree updates for host1x support
> - [PATCH v3 0/2] NVIDIA Tegra DRM driver

> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> index 216cd0f..6e9f1b4 100644
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@ -819,6 +819,7 @@ static int tegra_dc_remove(struct platform_device *pdev)
>  
>  static struct of_device_id tegra_dc_of_match[] = {
>         { .compatible = "nvidia,tegra20-dc", },
> +	{ .compatible = "nvidia,tegra30-dc", },

The Tegra30 entries should come first in the table due to the order the
kernel (currently) matches compatible properties against theses tables.
The same comment applies for all 3 tables.

With the patch manually applied (due to the whitespace issues I
mentioned earlier), and this ordering issue fixed,

Tested-by: Stephen Warren <swarren@nvidia.com>

(On Cardhu, with no HDMI plugged in; see my next email for details).