From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 066D5C433F5 for ; Tue, 19 Apr 2022 13:47:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A52F10E67E; Tue, 19 Apr 2022 13:47:17 +0000 (UTC) Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE04510EA09 for ; Tue, 19 Apr 2022 13:47:16 +0000 (UTC) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-e604f712ecso4247211fac.9 for ; Tue, 19 Apr 2022 06:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=q8f0rTTHxc5vgH67sPlSnaTmk5l73a/PSW3WGeuNUSQ=; b=BYPq4+jx7JPjr/G1heSjmqZMwbRJjhVEzyAjxCnFiGt6eCEvqT9MBPNh0EIrAfWMMJ K6LHjwWXo4TRlMWjvigdG2JOfHivhehCv+EBSj/kDE6j9EN89Us9Wp75X55MS7UQlUSH 8fmbbf5KT5Ic6Wsa0txv34KatV1irgdbAC9BY+OXAZbFNZh/tkMID3o5mCErrwyuakml 4bAsTNrLz3uzvx0Q18NNpVvBKsFCbq71TyjsvVmQIhmqLtRGRaasrQn9mWnI6/Y+BAJ5 T46uXQHwCRroSMFD+cyRSxzxbz6bL9yfB3Yh54plMeeHr/+6h714wuZzLf0JmRN7MC1x Td7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=q8f0rTTHxc5vgH67sPlSnaTmk5l73a/PSW3WGeuNUSQ=; b=FXCCSJT13S3Art/tf5b570czdLCksw8UStDa+62gpTtFXpgLRkyOGlGElrY+BS5vnk 5jZ1l1N7W0RIw7g1i158TYFjUVaSG4Gf/jEL0ykgcCosuddb/8pQPhWISX86yyfx7Vvh 7nGQGTLkCIcOqN8K2R+SHd+OjIVberIL2Tvp0vyvqfJU0Dpt5VGm1oI+pbaVVyi6noVb HlEb1DnG3nVZz5eJr56wphQGXuvg168gr4nUu+VWdkVCAkwEndBSsSIxraYDU7TpsGwK OUqK0zs36pBec+ivBanI0ZWbLn1jBRp01KqnZR1maseKJXqo8KLOsJ3Hi+sXdFTlU5D/ Dtjw== X-Gm-Message-State: AOAM533LjziDGcn1aOgenh626jM/vTqns8qtJnp5S9vre3e/tHxzMRJD hxmiNMbLbcjUALSXpRE+UN9ykdW/w3EO2DIVkuUo9Wsi X-Google-Smtp-Source: ABdhPJzRT1WIdF6hzW8qRPj3VAb+L9DCsK7yLd64+bXbqt0m8UKx6nIpZmZvWwrSdL7/pVxqXXQ7g/BDp6EA5UgSq9g= X-Received: by 2002:a05:6870:d683:b0:de:eaa2:3550 with SMTP id z3-20020a056870d68300b000deeaa23550mr6602037oap.253.1650376036104; Tue, 19 Apr 2022 06:47:16 -0700 (PDT) MIME-Version: 1.0 References: <20220413201522.2084041-1-alexander.deucher@amd.com> In-Reply-To: <20220413201522.2084041-1-alexander.deucher@amd.com> From: Alex Deucher Date: Tue, 19 Apr 2022 09:47:04 -0400 Message-ID: Subject: Re: [PATCH] drm/amdgpu: don't runtime suspend if there are displays attached (v2) To: Alex Deucher Content-Type: text/plain; charset="UTF-8" X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michele Ballabio , amd-gfx list Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Ping? On Wed, Apr 13, 2022 at 4:15 PM Alex Deucher wrote: > > We normally runtime suspend when there are displays attached if they > are in the DPMS off state, however, if something wakes the GPU > we send a hotplug event on resume (in case any displays were connected > while the GPU was in suspend) which can cause userspace to light > up the displays again soon after they were turned off. > > Prior to > commit 087451f372bf76 ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's."), > the driver took a runtime pm reference when the fbdev emulation was > enabled because we didn't implement proper shadowing support for > vram access when the device was off so the device never runtime > suspended when there was a console bound. Once that commit landed, > we now utilize the core fb helper implementation which properly > handles the emulation, so runtime pm now suspends in cases where it did > not before. Ultimately, we need to sort out why runtime suspend in not > working in this case for some users, but this should restore similar > behavior to before. > > v2: move check into runtime_suspend > > Fixes: 087451f372bf76 ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.") > Tested-by: Michele Ballabio > Signed-off-by: Alex Deucher > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 107 ++++++++++++++++-------- > 1 file changed, 72 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 4efaa183abcd..97a1aa02d76e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -2395,6 +2395,71 @@ static int amdgpu_pmops_restore(struct device *dev) > return amdgpu_device_resume(drm_dev, true); > } > > +static int amdgpu_runtime_idle_check_display(struct device *dev) > +{ > + struct pci_dev *pdev = to_pci_dev(dev); > + struct drm_device *drm_dev = pci_get_drvdata(pdev); > + struct amdgpu_device *adev = drm_to_adev(drm_dev); > + > + if (adev->mode_info.num_crtc) { > + struct drm_connector *list_connector; > + struct drm_connector_list_iter iter; > + int ret = 0; > + > + /* XXX: Return busy if any displays are connected to avoid > + * possible display wake ups after runtime resume due to > + * hotplug events in case any displays were connected while > + * the GPU was in suspend. Remove this once that is fixed. > + */ > + mutex_lock(&drm_dev->mode_config.mutex); > + drm_connector_list_iter_begin(drm_dev, &iter); > + drm_for_each_connector_iter(list_connector, &iter) { > + if (list_connector->status == connector_status_connected) { > + ret = -EBUSY; > + break; > + } > + } > + drm_connector_list_iter_end(&iter); > + mutex_unlock(&drm_dev->mode_config.mutex); > + > + if (ret) > + return ret; > + > + if (amdgpu_device_has_dc_support(adev)) { > + struct drm_crtc *crtc; > + > + drm_for_each_crtc(crtc, drm_dev) { > + drm_modeset_lock(&crtc->mutex, NULL); > + if (crtc->state->active) > + ret = -EBUSY; > + drm_modeset_unlock(&crtc->mutex); > + if (ret < 0) > + break; > + } > + } else { > + mutex_lock(&drm_dev->mode_config.mutex); > + drm_modeset_lock(&drm_dev->mode_config.connection_mutex, NULL); > + > + drm_connector_list_iter_begin(drm_dev, &iter); > + drm_for_each_connector_iter(list_connector, &iter) { > + if (list_connector->dpms == DRM_MODE_DPMS_ON) { > + ret = -EBUSY; > + break; > + } > + } > + > + drm_connector_list_iter_end(&iter); > + > + drm_modeset_unlock(&drm_dev->mode_config.connection_mutex); > + mutex_unlock(&drm_dev->mode_config.mutex); > + } > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > static int amdgpu_pmops_runtime_suspend(struct device *dev) > { > struct pci_dev *pdev = to_pci_dev(dev); > @@ -2407,6 +2472,10 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) > return -EBUSY; > } > > + ret = amdgpu_runtime_idle_check_display(dev); > + if (ret) > + return ret; > + > /* wait for all rings to drain before suspending */ > for (i = 0; i < AMDGPU_MAX_RINGS; i++) { > struct amdgpu_ring *ring = adev->rings[i]; > @@ -2516,41 +2585,9 @@ static int amdgpu_pmops_runtime_idle(struct device *dev) > return -EBUSY; > } > > - if (amdgpu_device_has_dc_support(adev)) { > - struct drm_crtc *crtc; > - > - drm_for_each_crtc(crtc, drm_dev) { > - drm_modeset_lock(&crtc->mutex, NULL); > - if (crtc->state->active) > - ret = -EBUSY; > - drm_modeset_unlock(&crtc->mutex); > - if (ret < 0) > - break; > - } > - > - } else { > - struct drm_connector *list_connector; > - struct drm_connector_list_iter iter; > - > - mutex_lock(&drm_dev->mode_config.mutex); > - drm_modeset_lock(&drm_dev->mode_config.connection_mutex, NULL); > - > - drm_connector_list_iter_begin(drm_dev, &iter); > - drm_for_each_connector_iter(list_connector, &iter) { > - if (list_connector->dpms == DRM_MODE_DPMS_ON) { > - ret = -EBUSY; > - break; > - } > - } > - > - drm_connector_list_iter_end(&iter); > - > - drm_modeset_unlock(&drm_dev->mode_config.connection_mutex); > - mutex_unlock(&drm_dev->mode_config.mutex); > - } > - > - if (ret == -EBUSY) > - DRM_DEBUG_DRIVER("failing to power off - crtc active\n"); > + ret = amdgpu_runtime_idle_check_display(dev); > + if (ret) > + return ret; > > pm_runtime_mark_last_busy(dev); > pm_runtime_autosuspend(dev); > -- > 2.35.1 >