All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: jglisse@redhat.com, dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH 3/3] drm/radeon: uvd/vce properly pin/unpin firmware accross suspend/resume.
Date: Wed, 16 Mar 2016 13:10:35 +0100	[thread overview]
Message-ID: <56E94D3B.5020800@amd.com> (raw)
In-Reply-To: <1458129407-4940-3-git-send-email-jglisse@redhat.com>

Am 16.03.2016 um 12:56 schrieb jglisse@redhat.com:
> From: Jérome Glisse <jglisse@redhat.com>
>
> We need to unpin on suspend and pin on resume. This shuffle code around
> to do just that.
>
> Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>

NAK, that won't work correctly.

When the firmware is loaded at one location once you can't move it 
without power cycling the ASIC.

That only works when you completely shut down the system, but not if you 
just suspend to memory on an APU or do a test cycle without actually 
power down.

We already tried this approach and it took me month to figure out what's 
going wrong when the firmware end up at a different location after the 
driver started again.

Regards,
Christian.

> ---
>   drivers/gpu/drm/radeon/radeon_uvd.c | 61 ++++++++++++++++---------------------
>   drivers/gpu/drm/radeon/radeon_vce.c | 37 +++++++++-------------
>   2 files changed, 41 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
> index 6fe9e4e..333b885 100644
> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
> @@ -148,30 +148,6 @@ int radeon_uvd_init(struct radeon_device *rdev)
>   		return r;
>   	}
>   
> -	r = radeon_bo_reserve(rdev->uvd.vcpu_bo, false);
> -	if (r) {
> -		radeon_bo_unref(&rdev->uvd.vcpu_bo);
> -		dev_err(rdev->dev, "(%d) failed to reserve UVD bo\n", r);
> -		return r;
> -	}
> -
> -	r = radeon_bo_pin(rdev->uvd.vcpu_bo, RADEON_GEM_DOMAIN_VRAM,
> -			  &rdev->uvd.gpu_addr);
> -	if (r) {
> -		radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> -		radeon_bo_unref(&rdev->uvd.vcpu_bo);
> -		dev_err(rdev->dev, "(%d) UVD bo pin failed\n", r);
> -		return r;
> -	}
> -
> -	r = radeon_bo_kmap(rdev->uvd.vcpu_bo, &rdev->uvd.cpu_addr);
> -	if (r) {
> -		dev_err(rdev->dev, "(%d) UVD map failed\n", r);
> -		return r;
> -	}
> -
> -	radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> -
>   	for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
>   		atomic_set(&rdev->uvd.handles[i], 0);
>   		rdev->uvd.filp[i] = NULL;
> @@ -183,18 +159,9 @@ int radeon_uvd_init(struct radeon_device *rdev)
>   
>   void radeon_uvd_fini(struct radeon_device *rdev)
>   {
> -	int r;
> -
>   	if (rdev->uvd.vcpu_bo == NULL)
>   		return;
>   
> -	r = radeon_bo_reserve(rdev->uvd.vcpu_bo, false);
> -	if (!r) {
> -		radeon_bo_kunmap(rdev->uvd.vcpu_bo);
> -		radeon_bo_unpin(rdev->uvd.vcpu_bo);
> -		radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> -	}
> -
>   	radeon_bo_unref(&rdev->uvd.vcpu_bo);
>   
>   	radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]);
> @@ -231,6 +198,13 @@ int radeon_uvd_suspend(struct radeon_device *rdev)
>   		}
>   	}
>   
> +	r = radeon_bo_reserve(rdev->uvd.vcpu_bo, false);
> +	if (!r) {
> +		radeon_bo_kunmap(rdev->uvd.vcpu_bo);
> +		radeon_bo_unpin(rdev->uvd.vcpu_bo);
> +		radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> +	}
> +
>   	return 0;
>   }
>   
> @@ -238,9 +212,26 @@ int radeon_uvd_resume(struct radeon_device *rdev)
>   {
>   	unsigned size;
>   	void *ptr;
> +	int r;
>   
> -	if (rdev->uvd.vcpu_bo == NULL)
> -		return -EINVAL;
> +	r = radeon_bo_reserve(rdev->uvd.vcpu_bo, false);
> +	if (r) {
> +		dev_err(rdev->dev, "(%d) failed to reserve UVD bo\n", r);
> +		return r;
> +	}
> +	r = radeon_bo_pin(rdev->uvd.vcpu_bo, RADEON_GEM_DOMAIN_VRAM,
> +			  &rdev->uvd.gpu_addr);
> +	if (r) {
> +		radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> +		dev_err(rdev->dev, "(%d) UVD bo pin failed\n", r);
> +		return r;
> +	}
> +	r = radeon_bo_kmap(rdev->uvd.vcpu_bo, &rdev->uvd.cpu_addr);
> +	radeon_bo_unreserve(rdev->uvd.vcpu_bo);
> +	if (r) {
> +		dev_err(rdev->dev, "(%d) UVD map failed\n", r);
> +		return r;
> +	}
>   
>   	memcpy(rdev->uvd.cpu_addr, rdev->uvd_fw->data, rdev->uvd_fw->size);
>   
> diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
> index c1c619f..4f7ae3c 100644
> --- a/drivers/gpu/drm/radeon/radeon_vce.c
> +++ b/drivers/gpu/drm/radeon/radeon_vce.c
> @@ -147,22 +147,6 @@ int radeon_vce_init(struct radeon_device *rdev)
>   		return r;
>   	}
>   
> -	r = radeon_bo_reserve(rdev->vce.vcpu_bo, false);
> -	if (r) {
> -		radeon_bo_unref(&rdev->vce.vcpu_bo);
> -		dev_err(rdev->dev, "(%d) failed to reserve VCE bo\n", r);
> -		return r;
> -	}
> -
> -	r = radeon_bo_pin(rdev->vce.vcpu_bo, RADEON_GEM_DOMAIN_VRAM,
> -			  &rdev->vce.gpu_addr);
> -	radeon_bo_unreserve(rdev->vce.vcpu_bo);
> -	if (r) {
> -		radeon_bo_unref(&rdev->vce.vcpu_bo);
> -		dev_err(rdev->dev, "(%d) VCE bo pin failed\n", r);
> -		return r;
> -	}
> -
>   	for (i = 0; i < RADEON_MAX_VCE_HANDLES; ++i) {
>   		atomic_set(&rdev->vce.handles[i], 0);
>   		rdev->vce.filp[i] = NULL;
> @@ -196,7 +180,7 @@ void radeon_vce_fini(struct radeon_device *rdev)
>    */
>   int radeon_vce_suspend(struct radeon_device *rdev)
>   {
> -	int i;
> +	int i, r;
>   
>   	if (rdev->vce.vcpu_bo == NULL)
>   		return 0;
> @@ -209,6 +193,13 @@ int radeon_vce_suspend(struct radeon_device *rdev)
>   		return 0;
>   
>   	/* TODO: suspending running encoding sessions isn't supported */
> +
> +	r = radeon_bo_reserve(rdev->vce.vcpu_bo, false);
> +	if (!r) {
> +		radeon_bo_unpin(rdev->vce.vcpu_bo);
> +		radeon_bo_unreserve(rdev->vce.vcpu_bo);
> +	}
> +
>   	return -EINVAL;
>   }
>   
> @@ -223,15 +214,18 @@ int radeon_vce_resume(struct radeon_device *rdev)
>   	void *cpu_addr;
>   	int r;
>   
> -	if (rdev->vce.vcpu_bo == NULL)
> -		return -EINVAL;
> -
>   	r = radeon_bo_reserve(rdev->vce.vcpu_bo, false);
>   	if (r) {
>   		dev_err(rdev->dev, "(%d) failed to reserve VCE bo\n", r);
>   		return r;
>   	}
> -
> +	r = radeon_bo_pin(rdev->vce.vcpu_bo, RADEON_GEM_DOMAIN_VRAM,
> +			  &rdev->vce.gpu_addr);
> +	if (r) {
> +		radeon_bo_unreserve(rdev->vce.vcpu_bo);
> +		dev_err(rdev->dev, "(%d) VCE bo pin failed\n", r);
> +		return r;
> +	}
>   	r = radeon_bo_kmap(rdev->vce.vcpu_bo, &cpu_addr);
>   	if (r) {
>   		radeon_bo_unreserve(rdev->vce.vcpu_bo);
> @@ -246,7 +240,6 @@ int radeon_vce_resume(struct radeon_device *rdev)
>   		memcpy(cpu_addr, rdev->vce_fw->data, rdev->vce_fw->size);
>   
>   	radeon_bo_kunmap(rdev->vce.vcpu_bo);
> -
>   	radeon_bo_unreserve(rdev->vce.vcpu_bo);
>   
>   	return r;

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2016-03-16 12:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 11:56 [PATCH 1/3] drm/radeon: fix indentation jglisse
2016-03-16 11:56 ` [PATCH 2/3] drm/radeon: add driver option to disable uvd/vce block jglisse
2016-03-16 12:20   ` Christian König
2016-03-16 12:36     ` Jerome Glisse
2016-03-16 11:56 ` [PATCH 3/3] drm/radeon: uvd/vce properly pin/unpin firmware accross suspend/resume jglisse
2016-03-16 12:10   ` Christian König [this message]
2016-03-16 12:35     ` Jerome Glisse
2016-03-16 12:42       ` Christian König
2016-03-16 12:11 ` [PATCH 1/3] drm/radeon: fix indentation Christian König
2016-03-16 22:11   ` Alex Deucher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56E94D3B.5020800@amd.com \
    --to=christian.koenig@amd.com \
    --cc=alexander.deucher@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jglisse@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.