[PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[Jerome Brunet]

This reverts commit d66083c0d6f5125a4d982aa177dd71ab4cd3d212
and commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.

On v5.10 stable, reboot gets stuck on gxl and g12a chip family (at least).
This was tested on the aml-s905x-cc from libretch and the u200 reference
design.

Bisecting on the v5.10 stable branch lead to
commit d4ec1ffbdaa8 ("drm: meson_drv add shutdown function").

Reverting it (and a fixes on the it) sloves the problem.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---

Hi Greg,

Things are fine on master but it breaks on v5.10-y.
I did not check v5.14-y yet. I'll try next week.


 drivers/gpu/drm/meson/meson_drv.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 2753067c08e6..3d1de9cbb1c8 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
 	return count;
 }
 
-static void meson_drv_shutdown(struct platform_device *pdev)
-{
-	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
-
-	if (!priv)
-		return;
-
-	drm_kms_helper_poll_fini(priv->drm);
-	drm_atomic_helper_shutdown(priv->drm);
-}
-
 static int meson_drv_probe(struct platform_device *pdev)
 {
 	struct component_match *match = NULL;
@@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
 
 static struct platform_driver meson_drm_platform_driver = {
 	.probe      = meson_drv_probe,
-	.shutdown   = meson_drv_shutdown,
 	.driver     = {
 		.name	= "meson-drm",
 		.of_match_table = dt_match,
-- 
2.34.0


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[Greg Kroah-Hartman]

On Sat, Dec 04, 2021 at 10:31:57PM +0100, Jerome Brunet wrote:
> This reverts commit d66083c0d6f5125a4d982aa177dd71ab4cd3d212
> and commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.

No, please, at most let us revert the commits individually.

> On v5.10 stable, reboot gets stuck on gxl and g12a chip family (at least).
> This was tested on the aml-s905x-cc from libretch and the u200 reference
> design.
> 
> Bisecting on the v5.10 stable branch lead to
> commit d4ec1ffbdaa8 ("drm: meson_drv add shutdown function").
> 
> Reverting it (and a fixes on the it) sloves the problem.
> 
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> 
> Hi Greg,
> 
> Things are fine on master but it breaks on v5.10-y.
> I did not check v5.14-y yet. I'll try next week.

Please check 5.15.y (5.14 is long end-of-life).

thanks,

greg k-h

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[Art Nikpal]

hi all

i have test it on (VIM1 VIM2 VIM3 VIM3L) its works on my side
+ 5.10.11
+ 5.11.x
+ 5.13.x
+ 5.14.x
+ 5.15.x
+ 5.16.x

can u share your kernel config (i know for some kernel configuration
drivers still have problem with reboot )


On Sun, Dec 5, 2021 at 5:32 AM Jerome Brunet <jbrunet@baylibre.com> wrote:
>
> This reverts commit d66083c0d6f5125a4d982aa177dd71ab4cd3d212
> and commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.
>
> On v5.10 stable, reboot gets stuck on gxl and g12a chip family (at least).
> This was tested on the aml-s905x-cc from libretch and the u200 reference
> design.
>
> Bisecting on the v5.10 stable branch lead to
> commit d4ec1ffbdaa8 ("drm: meson_drv add shutdown function").
>
> Reverting it (and a fixes on the it) sloves the problem.
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>
> Hi Greg,
>
> Things are fine on master but it breaks on v5.10-y.
> I did not check v5.14-y yet. I'll try next week.
>
>
>  drivers/gpu/drm/meson/meson_drv.c | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index 2753067c08e6..3d1de9cbb1c8 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
>         return count;
>  }
>
> -static void meson_drv_shutdown(struct platform_device *pdev)
> -{
> -       struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
> -
> -       if (!priv)
> -               return;
> -
> -       drm_kms_helper_poll_fini(priv->drm);
> -       drm_atomic_helper_shutdown(priv->drm);
> -}
> -
>  static int meson_drv_probe(struct platform_device *pdev)
>  {
>         struct component_match *match = NULL;
> @@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
>
>  static struct platform_driver meson_drm_platform_driver = {
>         .probe      = meson_drv_probe,
> -       .shutdown   = meson_drv_shutdown,
>         .driver     = {
>                 .name   = "meson-drm",
>                 .of_match_table = dt_match,
> --
> 2.34.0
>

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[Jerome Brunet]

On Sun 05 Dec 2021 at 09:40, Art Nikpal <email2tema@gmail.com> wrote:

> hi all
>
> i have test it on (VIM1 VIM2 VIM3 VIM3L) its works on my side
> + 5.10.11
> + 5.11.x
> + 5.13.x
> + 5.14.x
> + 5.15.x
> + 5.16.x
>
> can u share your kernel config (i know for some kernel configuration
> drivers still have problem with reboot )

The kernel configuration is the default arm64 defconfig

>
>
> On Sun, Dec 5, 2021 at 5:32 AM Jerome Brunet <jbrunet@baylibre.com> wrote:
>>
>> This reverts commit d66083c0d6f5125a4d982aa177dd71ab4cd3d212
>> and commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.
>>
>> On v5.10 stable, reboot gets stuck on gxl and g12a chip family (at least).
>> This was tested on the aml-s905x-cc from libretch and the u200 reference
>> design.
>>
>> Bisecting on the v5.10 stable branch lead to
>> commit d4ec1ffbdaa8 ("drm: meson_drv add shutdown function").
>>
>> Reverting it (and a fixes on the it) sloves the problem.
>>
>> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
>> ---
>>
>> Hi Greg,
>>
>> Things are fine on master but it breaks on v5.10-y.
>> I did not check v5.14-y yet. I'll try next week.
>>
>>
>>  drivers/gpu/drm/meson/meson_drv.c | 12 ------------
>>  1 file changed, 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
>> index 2753067c08e6..3d1de9cbb1c8 100644
>> --- a/drivers/gpu/drm/meson/meson_drv.c
>> +++ b/drivers/gpu/drm/meson/meson_drv.c
>> @@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
>>         return count;
>>  }
>>
>> -static void meson_drv_shutdown(struct platform_device *pdev)
>> -{
>> -       struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
>> -
>> -       if (!priv)
>> -               return;
>> -
>> -       drm_kms_helper_poll_fini(priv->drm);
>> -       drm_atomic_helper_shutdown(priv->drm);
>> -}
>> -
>>  static int meson_drv_probe(struct platform_device *pdev)
>>  {
>>         struct component_match *match = NULL;
>> @@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
>>
>>  static struct platform_driver meson_drm_platform_driver = {
>>         .probe      = meson_drv_probe,
>> -       .shutdown   = meson_drv_shutdown,
>>         .driver     = {
>>                 .name   = "meson-drm",
>>                 .of_match_table = dt_match,
>> --
>> 2.34.0
>>


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH 5.10] Revert "drm: meson_drv add shutdown function"

[Art Nikpal]

On Sun, Dec 5, 2021 at 5:32 AM Jerome Brunet <jbrunet@baylibre.com> wrote:
>
> This reverts commit d66083c0d6f5125a4d982aa177dd71ab4cd3d212
> and commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.
>
> On v5.10 stable, reboot gets stuck on gxl and g12a chip family (at least).
> This was tested on the aml-s905x-cc from libretch and the u200 reference
> design.

What about the rate ? it's 100% stuck for any reboot try !

>
> Bisecting on the v5.10 stable branch lead to
> commit d4ec1ffbdaa8 ("drm: meson_drv add shutdown function").
>
> Reverting it (and a fixes on the it) sloves the problem.
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>
> Hi Greg,
>
> Things are fine on master but it breaks on v5.10-y.
> I did not check v5.14-y yet. I'll try next week.
>
>
>  drivers/gpu/drm/meson/meson_drv.c | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index 2753067c08e6..3d1de9cbb1c8 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
>         return count;
>  }
>
> -static void meson_drv_shutdown(struct platform_device *pdev)
> -{
> -       struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
> -
> -       if (!priv)
> -               return;
> -
> -       drm_kms_helper_poll_fini(priv->drm);
> -       drm_atomic_helper_shutdown(priv->drm);
> -}
> -
>  static int meson_drv_probe(struct platform_device *pdev)
>  {
>         struct component_match *match = NULL;
> @@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
>
>  static struct platform_driver meson_drm_platform_driver = {
>         .probe      = meson_drv_probe,
> -       .shutdown   = meson_drv_shutdown,
>         .driver     = {
>                 .name   = "meson-drm",
>                 .of_match_table = dt_match,
> --
> 2.34.0
>

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic