* drm/amdgpu: Add helper function to get buffer domain
@ 2018-05-26 0:12 Deepak Sharma
[not found] ` <20180526001229.15509-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Deepak Sharma @ 2018-05-26 0:12 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
alexander.deucher-5C7GfCeVMHo, michel-otUistvHUpPR7s880joybQ,
christian.koenig-5C7GfCeVMHo
Cc: Deepak Sharma
Move logic of getting supported domain to a helper
function
Signed-off-by: Deepak Sharma <Deepak.Sharma@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 ++++++++++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 ++-
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 63758db5e2ea..556406a44da3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
struct amdgpu_device *adev = dev->dev_private;
struct drm_gem_object *gobj;
uint32_t handle;
- u32 domain = amdgpu_display_supported_domains(adev);
+ u32 domain;
int r;
args->pitch = amdgpu_align_pitch(adev, args->width,
DIV_ROUND_UP(args->bpp, 8), 0);
args->size = (u64)args->pitch * args->height;
args->size = ALIGN(args->size, PAGE_SIZE);
- if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
- domain = AMDGPU_GEM_DOMAIN_VRAM;
- if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
- domain = AMDGPU_GEM_DOMAIN_GTT;
- }
-
+ domain = amdgpu_bo_get_preferred_pin_domain(adev,
+ amdgpu_display_supported_domains(adev));
r = amdgpu_gem_object_create(adev, args->size, 0, domain,
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
false, NULL, &gobj);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 6a9e46ae7f0a..5e4e1bd90383 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
/* This assumes only APU display buffers are pinned with (VRAM|GTT).
* See function amdgpu_display_supported_domains()
*/
- if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
- domain = AMDGPU_GEM_DOMAIN_VRAM;
- if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
- domain = AMDGPU_GEM_DOMAIN_GTT;
- }
+ domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
if (bo->pin_count) {
uint32_t mem_type = bo->tbo.mem.mem_type;
@@ -1066,3 +1062,14 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
return bo->tbo.offset;
}
+
+uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
+ uint32_t domain)
+{
+ if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
+ domain = AMDGPU_GEM_DOMAIN_VRAM;
+ if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
+ domain = AMDGPU_GEM_DOMAIN_GTT;
+ }
+ return domain;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 540e03fa159f..731748033878 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -289,7 +289,8 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
struct reservation_object *resv,
struct dma_fence **fence,
bool direct);
-
+uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
+ uint32_t domain);
/*
* sub allocation
--
2.15.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: drm/amdgpu: Add helper function to get buffer domain
[not found] ` <20180526001229.15509-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
@ 2018-05-26 0:19 ` Deepak Sharma
[not found] ` <f58bea93-8f1a-bc97-a0c6-a3d2f324275c-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Deepak Sharma @ 2018-05-26 0:19 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
alexander.deucher-5C7GfCeVMHo, michel-otUistvHUpPR7s880joybQ,
christian.koenig-5C7GfCeVMHo
If look fine , please give rb for this and
https://patchwork.freedesktop.org/patch/224850/
Thanks,
Deepak
On 05/25/2018 05:12 PM, Deepak Sharma wrote:
> Move logic of getting supported domain to a helper
> function
>
> Signed-off-by: Deepak Sharma <Deepak.Sharma@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 ++++++++++++-----
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 ++-
> 3 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 63758db5e2ea..556406a44da3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
> struct amdgpu_device *adev = dev->dev_private;
> struct drm_gem_object *gobj;
> uint32_t handle;
> - u32 domain = amdgpu_display_supported_domains(adev);
> + u32 domain;
> int r;
>
> args->pitch = amdgpu_align_pitch(adev, args->width,
> DIV_ROUND_UP(args->bpp, 8), 0);
> args->size = (u64)args->pitch * args->height;
> args->size = ALIGN(args->size, PAGE_SIZE);
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> -
> + domain = amdgpu_bo_get_preferred_pin_domain(adev,
> + amdgpu_display_supported_domains(adev));
> r = amdgpu_gem_object_create(adev, args->size, 0, domain,
> AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
> false, NULL, &gobj);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 6a9e46ae7f0a..5e4e1bd90383 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
> /* This assumes only APU display buffers are pinned with (VRAM|GTT).
> * See function amdgpu_display_supported_domains()
> */
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> + domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
>
> if (bo->pin_count) {
> uint32_t mem_type = bo->tbo.mem.mem_type;
> @@ -1066,3 +1062,14 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
>
> return bo->tbo.offset;
> }
> +
> +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> + uint32_t domain)
> +{
> + if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> + domain = AMDGPU_GEM_DOMAIN_VRAM;
> + if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> + domain = AMDGPU_GEM_DOMAIN_GTT;
> + }
> + return domain;
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 540e03fa159f..731748033878 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -289,7 +289,8 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
> struct reservation_object *resv,
> struct dma_fence **fence,
> bool direct);
> -
> +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> + uint32_t domain);
>
> /*
> * sub allocation
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: drm/amdgpu: Add helper function to get buffer domain
[not found] ` <f58bea93-8f1a-bc97-a0c6-a3d2f324275c-5C7GfCeVMHo@public.gmane.org>
@ 2018-05-26 13:23 ` Deucher, Alexander
[not found] ` <BN6PR12MB18092E2599E79AA9FCE2BB48F7680-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Deucher, Alexander @ 2018-05-26 13:23 UTC (permalink / raw)
To: Sharma, Deepak, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
michel-otUistvHUpPR7s880joybQ, Koenig, Christian
[-- Attachment #1.1: Type: text/plain, Size: 4549 bytes --]
Both patches are:
Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
________________________________
From: Sharma, Deepak
Sent: Friday, May 25, 2018 8:19:26 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; Deucher, Alexander; michel-otUistvHUpPR7s880joybQ@public.gmane.org; Koenig, Christian
Subject: Re: drm/amdgpu: Add helper function to get buffer domain
If look fine , please give rb for this and
https://patchwork.freedesktop.org/patch/224850/
Thanks,
Deepak
On 05/25/2018 05:12 PM, Deepak Sharma wrote:
> Move logic of getting supported domain to a helper
> function
>
> Signed-off-by: Deepak Sharma <Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 ++++++++++++-----
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 ++-
> 3 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 63758db5e2ea..556406a44da3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
> struct amdgpu_device *adev = dev->dev_private;
> struct drm_gem_object *gobj;
> uint32_t handle;
> - u32 domain = amdgpu_display_supported_domains(adev);
> + u32 domain;
> int r;
>
> args->pitch = amdgpu_align_pitch(adev, args->width,
> DIV_ROUND_UP(args->bpp, 8), 0);
> args->size = (u64)args->pitch * args->height;
> args->size = ALIGN(args->size, PAGE_SIZE);
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> -
> + domain = amdgpu_bo_get_preferred_pin_domain(adev,
> + amdgpu_display_supported_domains(adev));
> r = amdgpu_gem_object_create(adev, args->size, 0, domain,
> AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
> false, NULL, &gobj);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 6a9e46ae7f0a..5e4e1bd90383 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
> /* This assumes only APU display buffers are pinned with (VRAM|GTT).
> * See function amdgpu_display_supported_domains()
> */
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> + domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
>
> if (bo->pin_count) {
> uint32_t mem_type = bo->tbo.mem.mem_type;
> @@ -1066,3 +1062,14 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
>
> return bo->tbo.offset;
> }
> +
> +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> + uint32_t domain)
> +{
> + if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> + domain = AMDGPU_GEM_DOMAIN_VRAM;
> + if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> + domain = AMDGPU_GEM_DOMAIN_GTT;
> + }
> + return domain;
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 540e03fa159f..731748033878 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -289,7 +289,8 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
> struct reservation_object *resv,
> struct dma_fence **fence,
> bool direct);
> -
> +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> + uint32_t domain);
>
> /*
> * sub allocation
>
[-- Attachment #1.2: Type: text/html, Size: 9409 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: drm/amdgpu: Add helper function to get buffer domain
[not found] ` <BN6PR12MB18092E2599E79AA9FCE2BB48F7680-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
@ 2018-05-28 7:07 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2018-05-28 7:07 UTC (permalink / raw)
To: Deucher, Alexander, Sharma, Deepak,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
michel-otUistvHUpPR7s880joybQ, Koenig, Christian
[-- Attachment #1.1: Type: text/plain, Size: 4967 bytes --]
Reviewed-by: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org> for both as well.
Christian.
Am 26.05.2018 um 15:23 schrieb Deucher, Alexander:
>
> Both patches are:
>
> Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
>
> ------------------------------------------------------------------------
> *From:* Sharma, Deepak
> *Sent:* Friday, May 25, 2018 8:19:26 PM
> *To:* amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; Deucher, Alexander;
> michel-otUistvHUpPR7s880joybQ@public.gmane.org; Koenig, Christian
> *Subject:* Re: drm/amdgpu: Add helper function to get buffer domain
> If look fine , please give rb for this and
> https://patchwork.freedesktop.org/patch/224850/
>
> Thanks,
> Deepak
>
> On 05/25/2018 05:12 PM, Deepak Sharma wrote:
> > Move logic of getting supported domain to a helper
> > function
> >
> > Signed-off-by: Deepak Sharma <Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
> > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 ++++++++++++-----
> > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 ++-
> > 3 files changed, 17 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> > index 63758db5e2ea..556406a44da3 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> > @@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file
> *file_priv,
> > struct amdgpu_device *adev = dev->dev_private;
> > struct drm_gem_object *gobj;
> > uint32_t handle;
> > - u32 domain = amdgpu_display_supported_domains(adev);
> > + u32 domain;
> > int r;
> >
> > args->pitch = amdgpu_align_pitch(adev, args->width,
> > DIV_ROUND_UP(args->bpp, 8), 0);
> > args->size = (u64)args->pitch * args->height;
> > args->size = ALIGN(args->size, PAGE_SIZE);
> > - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> > - domain = AMDGPU_GEM_DOMAIN_VRAM;
> > - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> > - domain = AMDGPU_GEM_DOMAIN_GTT;
> > - }
> > -
> > + domain = amdgpu_bo_get_preferred_pin_domain(adev,
> > + amdgpu_display_supported_domains(adev));
> > r = amdgpu_gem_object_create(adev, args->size, 0, domain,
> > AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
> > false, NULL, &gobj);
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > index 6a9e46ae7f0a..5e4e1bd90383 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> > @@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo
> *bo, u32 domain,
> > /* This assumes only APU display buffers are pinned with
> (VRAM|GTT).
> > * See function amdgpu_display_supported_domains()
> > */
> > - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> > - domain = AMDGPU_GEM_DOMAIN_VRAM;
> > - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> > - domain = AMDGPU_GEM_DOMAIN_GTT;
> > - }
> > + domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
> >
> > if (bo->pin_count) {
> > uint32_t mem_type = bo->tbo.mem.mem_type;
> > @@ -1066,3 +1062,14 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
> >
> > return bo->tbo.offset;
> > }
> > +
> > +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> > + uint32_t domain)
> > +{
> > + if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> > + domain = AMDGPU_GEM_DOMAIN_VRAM;
> > + if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> > + domain = AMDGPU_GEM_DOMAIN_GTT;
> > + }
> > + return domain;
> > +}
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> > index 540e03fa159f..731748033878 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> > @@ -289,7 +289,8 @@ int amdgpu_bo_restore_from_shadow(struct
> amdgpu_device *adev,
> > struct reservation_object *resv,
> > struct dma_fence **fence,
> > bool direct);
> > -
> > +uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> > + uint32_t domain);
> >
> > /*
> > * sub allocation
> >
>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[-- Attachment #1.2: Type: text/html, Size: 9614 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: drm/amdgpu: Add helper function to get buffer domain
[not found] ` <20180525001504.17285-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
@ 2018-05-25 6:49 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2018-05-25 6:49 UTC (permalink / raw)
To: Deepak Sharma, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
alexander.deucher-5C7GfCeVMHo, michel-otUistvHUpPR7s880joybQ,
christian.koenig-5C7GfCeVMHo
Am 25.05.2018 um 02:15 schrieb Deepak Sharma:
> Move logic of getting supported domain to a helper
> function
>
> Signed-off-by: Deepak Sharma <Deepak.Sharma@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 16 +++++++++++-----
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +-
> 3 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 63758db5e2ea..1e9cfbfa9c2a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
> struct amdgpu_device *adev = dev->dev_private;
> struct drm_gem_object *gobj;
> uint32_t handle;
> - u32 domain = amdgpu_display_supported_domains(adev);
> + u32 domain;
> int r;
>
> args->pitch = amdgpu_align_pitch(adev, args->width,
> DIV_ROUND_UP(args->bpp, 8), 0);
> args->size = (u64)args->pitch * args->height;
> args->size = ALIGN(args->size, PAGE_SIZE);
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> -
> + domain = amdgpu_bo_get_domain(adev,
> + amdgpu_display_supported_domains(adev));
> r = amdgpu_gem_object_create(adev, args->size, 0, domain,
> AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
> false, NULL, &gobj);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 6a9e46ae7f0a..8acffd9990d2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
> /* This assumes only APU display buffers are pinned with (VRAM|GTT).
> * See function amdgpu_display_supported_domains()
> */
> - if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> - domain = AMDGPU_GEM_DOMAIN_VRAM;
> - if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> - domain = AMDGPU_GEM_DOMAIN_GTT;
> - }
> + domain = amdgpu_bo_get_domain(adev, domain);
>
> if (bo->pin_count) {
> uint32_t mem_type = bo->tbo.mem.mem_type;
> @@ -1066,3 +1062,13 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
>
> return bo->tbo.offset;
> }
> +
> +uint32_t amdgpu_bo_get_domain(struct amdgpu_device *adev, uint32_t domain)
That needs a better name. Something like
amdgpu_bo_get_preferred_pin_domain() or something like that.
Apart from that looks good to me,
Christian.
> +{
> + if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> + domain = AMDGPU_GEM_DOMAIN_VRAM;
> + if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
> + domain = AMDGPU_GEM_DOMAIN_GTT;
> + }
> + return domain;
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 540e03fa159f..89e05e1f0029 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -289,7 +289,7 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
> struct reservation_object *resv,
> struct dma_fence **fence,
> bool direct);
> -
> +uint32_t amdgpu_bo_get_domain(struct amdgpu_device *adev, uint32_t domain);
>
> /*
> * sub allocation
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* drm/amdgpu: Add helper function to get buffer domain
@ 2018-05-25 0:15 Deepak Sharma
[not found] ` <20180525001504.17285-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Deepak Sharma @ 2018-05-25 0:15 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
alexander.deucher-5C7GfCeVMHo, michel-otUistvHUpPR7s880joybQ,
christian.koenig-5C7GfCeVMHo
Cc: Deepak Sharma
Move logic of getting supported domain to a helper
function
Signed-off-by: Deepak Sharma <Deepak.Sharma@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++-------
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 16 +++++++++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +-
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 63758db5e2ea..1e9cfbfa9c2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
struct amdgpu_device *adev = dev->dev_private;
struct drm_gem_object *gobj;
uint32_t handle;
- u32 domain = amdgpu_display_supported_domains(adev);
+ u32 domain;
int r;
args->pitch = amdgpu_align_pitch(adev, args->width,
DIV_ROUND_UP(args->bpp, 8), 0);
args->size = (u64)args->pitch * args->height;
args->size = ALIGN(args->size, PAGE_SIZE);
- if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
- domain = AMDGPU_GEM_DOMAIN_VRAM;
- if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
- domain = AMDGPU_GEM_DOMAIN_GTT;
- }
-
+ domain = amdgpu_bo_get_domain(adev,
+ amdgpu_display_supported_domains(adev));
r = amdgpu_gem_object_create(adev, args->size, 0, domain,
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
false, NULL, &gobj);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 6a9e46ae7f0a..8acffd9990d2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
/* This assumes only APU display buffers are pinned with (VRAM|GTT).
* See function amdgpu_display_supported_domains()
*/
- if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
- domain = AMDGPU_GEM_DOMAIN_VRAM;
- if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
- domain = AMDGPU_GEM_DOMAIN_GTT;
- }
+ domain = amdgpu_bo_get_domain(adev, domain);
if (bo->pin_count) {
uint32_t mem_type = bo->tbo.mem.mem_type;
@@ -1066,3 +1062,13 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
return bo->tbo.offset;
}
+
+uint32_t amdgpu_bo_get_domain(struct amdgpu_device *adev, uint32_t domain)
+{
+ if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
+ domain = AMDGPU_GEM_DOMAIN_VRAM;
+ if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
+ domain = AMDGPU_GEM_DOMAIN_GTT;
+ }
+ return domain;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 540e03fa159f..89e05e1f0029 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -289,7 +289,7 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
struct reservation_object *resv,
struct dma_fence **fence,
bool direct);
-
+uint32_t amdgpu_bo_get_domain(struct amdgpu_device *adev, uint32_t domain);
/*
* sub allocation
--
2.15.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-28 7:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-26 0:12 drm/amdgpu: Add helper function to get buffer domain Deepak Sharma
[not found] ` <20180526001229.15509-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
2018-05-26 0:19 ` Deepak Sharma
[not found] ` <f58bea93-8f1a-bc97-a0c6-a3d2f324275c-5C7GfCeVMHo@public.gmane.org>
2018-05-26 13:23 ` Deucher, Alexander
[not found] ` <BN6PR12MB18092E2599E79AA9FCE2BB48F7680-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2018-05-28 7:07 ` Christian König
-- strict thread matches above, loose matches on Subject: below --
2018-05-25 0:15 Deepak Sharma
[not found] ` <20180525001504.17285-1-Deepak.Sharma-5C7GfCeVMHo@public.gmane.org>
2018-05-25 6:49 ` Christian König
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.