From: =?UTF-8?Q?Christian_K=c3=b6nig?= Subject: Re: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread Date: Mon, 30 Jul 2018 12:49:14 +0200 Message-ID: References: <1532942625-26876-1-git-send-email-Rex.Zhu@amd.com> <1532942625-26876-2-git-send-email-Rex.Zhu@amd.com> Reply-To: christian.koenig-5C7GfCeVMHo@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1919968409==" Return-path: In-Reply-To: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "Zhu, Rex" , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" This is a multi-part message in MIME format. --===============1919968409== Content-Type: multipart/alternative; boundary="------------03BB4509046401240BD05AA1" Content-Language: en-US This is a multi-part message in MIME format. --------------03BB4509046401240BD05AA1 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit A bit large, maybe 100ms is enough. Apart from that the set now looks good on first glance, but I really don't know that code that well. Christian. Am 30.07.2018 um 12:25 schrieb Zhu, Rex: > > One problem, > > > I delay 500ms to enable gfx off feature. > > > Any concern about the delay time? > > > Best Regards > > Rex > > > ------------------------------------------------------------------------ > *From:* amd-gfx on behalf of > Rex Zhu > *Sent:* Monday, July 30, 2018 5:23 PM > *To:* amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > *Cc:* Zhu, Rex > *Subject:* [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a > delay thread > delay to enable gfx off feature to avoid gfx on/off frequently > suggested by Alex and Evan. > > Signed-off-by: Rex Zhu > --- >  drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  2 ++ >  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++ >  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  8 ++++++-- >  3 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 188bc53..ff16689 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -992,6 +992,8 @@ struct amdgpu_gfx { >          bool gfx_off_state; /* true: enabled, false: disabled */ >          struct mutex gfx_off_mutex; >          uint32_t gfx_off_req_count; /* default 1, enable gfx off: dec > 1, disable gfx off: add 1 */ > +       struct delayed_work gfx_off_delay_work; > + >          /* pipe reservation */ >          struct mutex pipe_reserve_mutex; >          DECLARE_BITMAP (pipe_reserve_bitmap, AMDGPU_MAX_COMPUTE_QUEUES); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 122653f..f6a6fb5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1925,6 +1925,19 @@ static void > amdgpu_device_ip_late_init_func_handler(struct work_struct *work) >                  DRM_ERROR("ib ring test failed (%d).\n", r); >  } > > +static void amdgpu_device_delay_enable_gfx_off(struct work_struct *work) > +{ > +       struct amdgpu_device *adev = > +               container_of(work, struct amdgpu_device, > gfx.gfx_off_delay_work.work); > + > +       mutex_lock(&adev->gfx.gfx_off_mutex); > +       if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) { > +               if (!amdgpu_dpm_set_powergating_by_smu(adev, > AMD_IP_BLOCK_TYPE_GFX, true)) > +                       adev->gfx.gfx_off_state = true; > +       } > +       mutex_unlock(&adev->gfx.gfx_off_mutex); > +} > + >  /** >   * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs > (phase 1) >   * > @@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, > > INIT_DELAYED_WORK(&adev->late_init_work, > amdgpu_device_ip_late_init_func_handler); > + INIT_DELAYED_WORK(&adev->gfx.gfx_off_delay_work, > + amdgpu_device_delay_enable_gfx_off); > >          adev->gfx.gfx_off_req_count = 1; >          adev->pm.ac_power = power_supply_is_system_supplied() > 0 ? > true : false; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > index 1cdb264..11d4d9f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > @@ -26,6 +26,9 @@ >  #include "amdgpu.h" >  #include "amdgpu_gfx.h" > > +/* 0.5 second timeout */ > +#define GFX_OFF_DELAY_ENABLE msecs_to_jiffies(500) > + >  /* >   * GPU scratch registers helpers function. >   */ > @@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device > *adev, bool enable) >          if (!adev->powerplay.pp_funcs->set_powergating_by_smu) >                  return; > > + >          mutex_lock(&adev->gfx.gfx_off_mutex); > >          if (!enable) > @@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device > *adev, bool enable) >                  adev->gfx.gfx_off_req_count--; > >          if (enable && !adev->gfx.gfx_off_state && > !adev->gfx.gfx_off_req_count) { > -               if (!amdgpu_dpm_set_powergating_by_smu(adev, > AMD_IP_BLOCK_TYPE_GFX, true)) > -                       adev->gfx.gfx_off_state = true; > + schedule_delayed_work(&adev->gfx.gfx_off_delay_work, > GFX_OFF_DELAY_ENABLE); >          } else if (!enable && adev->gfx.gfx_off_state) { >                  if (!amdgpu_dpm_set_powergating_by_smu(adev, > AMD_IP_BLOCK_TYPE_GFX, false)) >                          adev->gfx.gfx_off_state = false; >          } > + > mutex_unlock(&adev->gfx.gfx_off_mutex); >  } > -- > 1.9.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > amd-gfx Info Page - freedesktop.org > > lists.freedesktop.org > Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the > following form. Use of all freedesktop.org lists is subject to our > Code of Conduct. > > > > > _______________________________________________ > amd-gfx mailing list > amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx --------------03BB4509046401240BD05AA1 Content-Type: text/html; charset=windows-1252 Content-Transfer-Encoding: 8bit
A bit large, maybe 100ms is enough.

Apart from that the set now looks good on first glance, but I really don't know that code that well.

Christian.

Am 30.07.2018 um 12:25 schrieb Zhu, Rex:

One problem,


I delay 500ms to enable gfx off feature.


Any concern about the delay time?


Best Regards

Rex



From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
Sent: Monday, July 30, 2018 5:23 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Zhu, Rex
Subject: [PATCH v2 2/4] drm/amdgpu: Put enable gfx off feature to a delay thread
 
delay to enable gfx off feature to avoid gfx on/off frequently
suggested by Alex and Evan.

Signed-off-by: Rex Zhu <Rex.Zhu-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  8 ++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 188bc53..ff16689 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -992,6 +992,8 @@ struct amdgpu_gfx {
         bool                            gfx_off_state; /* true: enabled, false: disabled */
         struct mutex                    gfx_off_mutex;
         uint32_t                        gfx_off_req_count; /* default 1, enable gfx off: dec 1, disable gfx off: add 1 */
+       struct delayed_work             gfx_off_delay_work;
+
         /* pipe reservation */
         struct mutex                    pipe_reserve_mutex;
         DECLARE_BITMAP                  (pipe_reserve_bitmap, AMDGPU_MAX_COMPUTE_QUEUES);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 122653f..f6a6fb5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1925,6 +1925,19 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)
                 DRM_ERROR("ib ring test failed (%d).\n", r);
 }
 
+static void amdgpu_device_delay_enable_gfx_off(struct work_struct *work)
+{
+       struct amdgpu_device *adev =
+               container_of(work, struct amdgpu_device, gfx.gfx_off_delay_work.work);
+
+       mutex_lock(&adev->gfx.gfx_off_mutex);
+       if (!adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) {
+               if (!amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, true))
+                       adev->gfx.gfx_off_state = true;
+       }
+       mutex_unlock(&adev->gfx.gfx_off_mutex);
+}
+
 /**
  * amdgpu_device_ip_suspend_phase1 - run suspend for hardware IPs (phase 1)
  *
@@ -2394,6 +2407,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 
         INIT_DELAYED_WORK(&adev->late_init_work,
                           amdgpu_device_ip_late_init_func_handler);
+       INIT_DELAYED_WORK(&adev->gfx.gfx_off_delay_work,
+                         amdgpu_device_delay_enable_gfx_off);
 
         adev->gfx.gfx_off_req_count = 1;
         adev->pm.ac_power = power_supply_is_system_supplied() > 0 ? true : false;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 1cdb264..11d4d9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -26,6 +26,9 @@
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 
+/* 0.5 second timeout */
+#define GFX_OFF_DELAY_ENABLE         msecs_to_jiffies(500)
+
 /*
  * GPU scratch registers helpers function.
  */
@@ -360,6 +363,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)
         if (!adev->powerplay.pp_funcs->set_powergating_by_smu)
                 return;
 
+
         mutex_lock(&adev->gfx.gfx_off_mutex);
 
         if (!enable)
@@ -368,11 +372,11 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)
                 adev->gfx.gfx_off_req_count--;
 
         if (enable && !adev->gfx.gfx_off_state && !adev->gfx.gfx_off_req_count) {
-               if (!amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, true))
-                       adev->gfx.gfx_off_state = true;
+               schedule_delayed_work(&adev->gfx.gfx_off_delay_work, GFX_OFF_DELAY_ENABLE);
         } else if (!enable && adev->gfx.gfx_off_state) {
                 if (!amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false))
                         adev->gfx.gfx_off_state = false;
         }
+
         mutex_unlock(&adev->gfx.gfx_off_mutex);
 }
--
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx



_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

--------------03BB4509046401240BD05AA1-- --===============1919968409== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg== --===============1919968409==--