diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2017-08-13 18:40:55 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2017-08-22 04:04:36 -0400 |
commit | 2d38a5359f9070c3acfbc95e0539ff7688a1cd93 (patch) | |
tree | 8e4c2cc96ca41ee4a245d6e296a1df67cc95b0ae | |
parent | 856718054a1b6f38e085021bbd5b0e74817a8fa6 (diff) |
drm/nouveau: silence suspend/resume debugging messages
These are particularly annoying on Optimus systems where these paths can
be called regularly.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index df7e2037031a..595630d1fb9e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c | |||
@@ -585,18 +585,18 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) | |||
585 | nouveau_led_suspend(dev); | 585 | nouveau_led_suspend(dev); |
586 | 586 | ||
587 | if (dev->mode_config.num_crtc) { | 587 | if (dev->mode_config.num_crtc) { |
588 | NV_INFO(drm, "suspending console...\n"); | 588 | NV_DEBUG(drm, "suspending console...\n"); |
589 | nouveau_fbcon_set_suspend(dev, 1); | 589 | nouveau_fbcon_set_suspend(dev, 1); |
590 | NV_INFO(drm, "suspending display...\n"); | 590 | NV_DEBUG(drm, "suspending display...\n"); |
591 | ret = nouveau_display_suspend(dev, runtime); | 591 | ret = nouveau_display_suspend(dev, runtime); |
592 | if (ret) | 592 | if (ret) |
593 | return ret; | 593 | return ret; |
594 | } | 594 | } |
595 | 595 | ||
596 | NV_INFO(drm, "evicting buffers...\n"); | 596 | NV_DEBUG(drm, "evicting buffers...\n"); |
597 | ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM); | 597 | ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM); |
598 | 598 | ||
599 | NV_INFO(drm, "waiting for kernel channels to go idle...\n"); | 599 | NV_DEBUG(drm, "waiting for kernel channels to go idle...\n"); |
600 | if (drm->cechan) { | 600 | if (drm->cechan) { |
601 | ret = nouveau_channel_idle(drm->cechan); | 601 | ret = nouveau_channel_idle(drm->cechan); |
602 | if (ret) | 602 | if (ret) |
@@ -609,7 +609,7 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) | |||
609 | goto fail_display; | 609 | goto fail_display; |
610 | } | 610 | } |
611 | 611 | ||
612 | NV_INFO(drm, "suspending fence...\n"); | 612 | NV_DEBUG(drm, "suspending fence...\n"); |
613 | if (drm->fence && nouveau_fence(drm)->suspend) { | 613 | if (drm->fence && nouveau_fence(drm)->suspend) { |
614 | if (!nouveau_fence(drm)->suspend(drm)) { | 614 | if (!nouveau_fence(drm)->suspend(drm)) { |
615 | ret = -ENOMEM; | 615 | ret = -ENOMEM; |
@@ -617,7 +617,7 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) | |||
617 | } | 617 | } |
618 | } | 618 | } |
619 | 619 | ||
620 | NV_INFO(drm, "suspending object tree...\n"); | 620 | NV_DEBUG(drm, "suspending object tree...\n"); |
621 | ret = nvif_client_suspend(&drm->client.base); | 621 | ret = nvif_client_suspend(&drm->client.base); |
622 | if (ret) | 622 | if (ret) |
623 | goto fail_client; | 623 | goto fail_client; |
@@ -630,7 +630,7 @@ fail_client: | |||
630 | 630 | ||
631 | fail_display: | 631 | fail_display: |
632 | if (dev->mode_config.num_crtc) { | 632 | if (dev->mode_config.num_crtc) { |
633 | NV_INFO(drm, "resuming display...\n"); | 633 | NV_DEBUG(drm, "resuming display...\n"); |
634 | nouveau_display_resume(dev, runtime); | 634 | nouveau_display_resume(dev, runtime); |
635 | } | 635 | } |
636 | return ret; | 636 | return ret; |
@@ -641,19 +641,19 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) | |||
641 | { | 641 | { |
642 | struct nouveau_drm *drm = nouveau_drm(dev); | 642 | struct nouveau_drm *drm = nouveau_drm(dev); |
643 | 643 | ||
644 | NV_INFO(drm, "resuming object tree...\n"); | 644 | NV_DEBUG(drm, "resuming object tree...\n"); |
645 | nvif_client_resume(&drm->client.base); | 645 | nvif_client_resume(&drm->client.base); |
646 | 646 | ||
647 | NV_INFO(drm, "resuming fence...\n"); | 647 | NV_DEBUG(drm, "resuming fence...\n"); |
648 | if (drm->fence && nouveau_fence(drm)->resume) | 648 | if (drm->fence && nouveau_fence(drm)->resume) |
649 | nouveau_fence(drm)->resume(drm); | 649 | nouveau_fence(drm)->resume(drm); |
650 | 650 | ||
651 | nouveau_run_vbios_init(dev); | 651 | nouveau_run_vbios_init(dev); |
652 | 652 | ||
653 | if (dev->mode_config.num_crtc) { | 653 | if (dev->mode_config.num_crtc) { |
654 | NV_INFO(drm, "resuming display...\n"); | 654 | NV_DEBUG(drm, "resuming display...\n"); |
655 | nouveau_display_resume(dev, runtime); | 655 | nouveau_display_resume(dev, runtime); |
656 | NV_INFO(drm, "resuming console...\n"); | 656 | NV_DEBUG(drm, "resuming console...\n"); |
657 | nouveau_fbcon_set_suspend(dev, 0); | 657 | nouveau_fbcon_set_suspend(dev, 0); |
658 | } | 658 | } |
659 | 659 | ||