drm/amdgpu: use the actual placement for pin accounting
Subsystems (3)
PATCH 1/5 drm/amdgpu: use the actual placement for pin accounting
From: Christian König <[email protected]>
This allows us to specify multiple possible placements again.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -0
@@ -697,6 +697,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, } *gpu_addr =amdgpu_bo_gpu_offset (bo); } + + domain =amdgpu_mem_type_to_domain (bo->tbo.mem.mem_type);if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) { adev->vram_pin_size +=amdgpu_bo_size (bo);if (bo->flags &AMDGPU_GEM_CREATE_NO_CPU_ACCESS )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1508855862-1817-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
PATCH 2/5 drm/amdgpu: always bind pinned BOs
From: Christian König <[email protected]>
We always need to bind pinned BOs, not just when the caller requested the address.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7 -7
@@ -688,15 +688,15 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, goto error; } + r =amdgpu_ttm_bind (&bo->tbo, &bo->tbo.mem); +if (unlikely (r)) { +dev_err (adev->dev,"%p bind failed\n" , bo); + goto error; + } + bo->pin_count =1 ; -if (gpu_addr !=NULL ) { - r =amdgpu_ttm_bind (&bo->tbo, &bo->tbo.mem); -if (unlikely (r)) { -dev_err (adev->dev,"%p bind failed\n" , bo); - goto error; - } +if (gpu_addr !=NULL ) *gpu_addr =amdgpu_bo_gpu_offset (bo); - } domain =amdgpu_mem_type_to_domain (bo->tbo.mem.mem_type);if (domain ==AMDGPU_GEM_DOMAIN_VRAM ) {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amdgpu: fix pin domain compatibility check
In reply to a message not in the archiveFrom: Christian König <[email protected]>
We need to test if any domain fits, not all of them.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
@@ -647,7 +647,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,if (bo->pin_count) {uint32_t mem_type = bo->tbo.mem.mem_type; -if (domain !=amdgpu_mem_type_to_domain (mem_type)) +if (!(domain &amdgpu_mem_type_to_domain (mem_type)))return -EINVAL ; bo->pin_count++;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amdgpu: fix indentation in amdgpu_display.h
In reply to a message not in the archiveFrom: Christian König <[email protected]>
That was somehow completely of.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +2 -3
@@ -25,9 +25,8 @@struct drm_framebuffer *amdgpu_user_framebuffer_create (struct drm_device *dev, -struct drm_file *file_priv, -const struct drm_mode_fb_cmd2 *mode_cmd); - +struct drm_file *file_priv, +const struct drm_mode_fb_cmd2 *mode_cmd);void amdgpu_output_poll_changed (struct drm_device *dev);#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 WIP: allow framebuffer in GART memory as well
In reply to a message not in the archiveFrom: Christian König <[email protected]>
On CZ and newer APUs we can pin the fb into GART as well as VRAM.
TODO: Somehow only results in first 8x8 tile to be repeated over and over
again on the screen.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 ++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 10 ++++++---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 ++++++++++--- 4 files changed, 29 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +12 -1
@@ -29,6 +29,7 @@#include "amdgpu_i2c.h" #include "atom.h" #include "amdgpu_connectors.h" +#include "amdgpu_display.h" #include <asm/div64.h> #include <linux/pm_runtime.h>
@@ -188,7 +189,7 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, goto cleanup; } - r =amdgpu_bo_pin (new_abo,AMDGPU_GEM_DOMAIN_VRAM , &base); + r =amdgpu_bo_pin (new_abo,amdgpu_framebuffer_domains (adev), &base);if (unlikely (r !=0 )) {DRM_ERROR ("failed to pin new abo buffer before flip\n" ); goto unreserve;
@@ -501,6 +502,16 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { .create_handle = amdgpu_user_framebuffer_create_handle, }; +uint32_t amdgpu_framebuffer_domains (struct amdgpu_device *adev) +{ +uint32_t domain =AMDGPU_GEM_DOMAIN_VRAM ; + +if (adev->asic_type >=CHIP_CARRIZO && adev->flags &AMD_IS_APU ) + domain =AMDGPU_GEM_DOMAIN_GTT ; + +return domain; +} + int amdgpu_framebuffer_init(struct drm_device *dev, struct amdgpu_framebuffer *rfb,
drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +1 -0
@@ -23,6 +23,7 @@#ifndef __AMDGPU_DISPLAY_H__#define __AMDGPU_DISPLAY_H__ +uint32_t amdgpu_framebuffer_domains (struct amdgpu_device *adev);struct drm_framebuffer * amdgpu_user_framebuffer_create(struct drm_device *dev, struct drm_file *file_priv,
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +6 -4
@@ -38,6 +38,8 @@#include <linux/vga_switcheroo.h> +#include "amdgpu_display.h" +/* object hierarchy - this contains a helper + a amdgpu fb the helper contains a pointer to amdgpu framebuffer baseclass.
@@ -124,7 +126,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,struct drm_gem_object *gobj =NULL ;struct amdgpu_bo *abo =NULL ;bool fb_tiled = false;/* useful for testing */ -u32 tiling_flags =0 ; +u32 tiling_flags =0 , domain;int ret;int aligned_size, size;int height = mode_cmd->height;
@@ -135,12 +137,12 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,/* need to align pitch with crtc limits */ mode_cmd->pitches[0 ] =amdgpu_align_pitch (adev, mode_cmd->width, cpp, fb_tiled); + domain =amdgpu_framebuffer_domains (adev); height =ALIGN (mode_cmd->height,8 ); size = mode_cmd->pitches[0 ] * height; aligned_size =ALIGN (size,PAGE_SIZE ); - ret = amdgpu_gem_object_create(adev, aligned_size, 0, - AMDGPU_GEM_DOMAIN_VRAM, + ret = amdgpu_gem_object_create(adev, aligned_size, 0, domain, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | AMDGPU_GEM_CREATE_VRAM_CLEARED,
@@ -166,7 +168,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, } - ret =amdgpu_bo_pin (abo,AMDGPU_GEM_DOMAIN_VRAM ,NULL ); + ret =amdgpu_bo_pin (abo, domain,NULL );if (ret) {amdgpu_bo_unreserve (abo); goto out_unref;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -3
@@ -2985,10 +2985,12 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, {struct amdgpu_framebuffer *afb;struct drm_gem_object *obj; +struct amdgpu_device *adev;struct amdgpu_bo *rbo; -int r;struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;unsigned int awidth; +uint32_t domain; +int r; dm_plane_state_old =to_dm_plane_state (plane->state); dm_plane_state_new =to_dm_plane_state (new_state);
@@ -3002,17 +3004,22 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, obj = afb->obj; rbo =gem_to_amdgpu_bo (obj); + adev =amdgpu_ttm_adev (rbo->tbo.bdev); r =amdgpu_bo_reserve (rbo, false);if (unlikely (r !=0 ))return r; - r =amdgpu_bo_pin (rbo,AMDGPU_GEM_DOMAIN_VRAM , &afb->address); +if (plane->type !=DRM_PLANE_TYPE_CURSOR ) + domain =amdgpu_framebuffer_domains (adev); +else + domain =AMDGPU_GEM_DOMAIN_VRAM ; + r =amdgpu_bo_pin (rbo, domain, &afb->address);amdgpu_bo_unreserve (rbo);if (unlikely (r !=0 )) { -DRM_ERROR ("Failed to pin framebuffer\n" ); +DRM_ERROR ("Failed to pin framebuffer (%d)\n" , r);return r; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx