platform: disable probe of GM20B

Submitted by Alexandre Courbot on March 31, 2016, 9:03 a.m.

Details

Message ID 1459414983-1388-1-git-send-email-acourbot@nvidia.com
State New
Headers show
Series "platform: disable probe of GM20B" ( rev: 1 ) in Nouveau

Not browsing as part of any series.

Commit Message

Alexandre Courbot March 31, 2016, 9:03 a.m.
On 4.6, probing GM20B will freeze the system because of a missing clock
that Nouveau must also enable. Since the DT bindings for this clock
did not make it in time for 4.6, disable it for now.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
Ben, sorry for that, but could you take this for one of the next -rc? I
will re-enable GM20B once the DT bindings have landed. Thanks!

 drm/nouveau/nouveau_platform.c | 4 ----
 1 file changed, 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drm/nouveau/nouveau_platform.c b/drm/nouveau/nouveau_platform.c
index 2dfe58af12e4..af9ee2de4c4d 100644
--- a/drm/nouveau/nouveau_platform.c
+++ b/drm/nouveau/nouveau_platform.c
@@ -60,10 +60,6 @@  static const struct of_device_id nouveau_platform_match[] = {
 		.compatible = "nvidia,gk20a",
 		.data = &gk20a_platform_data,
 	},
-	{
-		.compatible = "nvidia,gm20b",
-		.data = &gk20a_platform_data,
-	},
 	{ }
 };
 

Comments

Mmm actually I think we can get the same result if we just try and
probe the clock in question - it will fail for 4.6, but at least it
will not crash. Withdrawing this patch.

On Thu, Mar 31, 2016 at 6:03 PM, Alexandre Courbot <acourbot@nvidia.com> wrote:
> On 4.6, probing GM20B will freeze the system because of a missing clock
> that Nouveau must also enable. Since the DT bindings for this clock
> did not make it in time for 4.6, disable it for now.
>
> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
> ---
> Ben, sorry for that, but could you take this for one of the next -rc? I
> will re-enable GM20B once the DT bindings have landed. Thanks!
>
>  drm/nouveau/nouveau_platform.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drm/nouveau/nouveau_platform.c b/drm/nouveau/nouveau_platform.c
> index 2dfe58af12e4..af9ee2de4c4d 100644
> --- a/drm/nouveau/nouveau_platform.c
> +++ b/drm/nouveau/nouveau_platform.c
> @@ -60,10 +60,6 @@ static const struct of_device_id nouveau_platform_match[] = {
>                 .compatible = "nvidia,gk20a",
>                 .data = &gk20a_platform_data,
>         },
> -       {
> -               .compatible = "nvidia,gm20b",
> -               .data = &gk20a_platform_data,
> -       },
>         { }
>  };
>
> --
> 2.7.3
>