[PATCH v2 1/1] drm/amdgpu: Enable scatter gather display support

christian.koenig@xxxxxxx (Christian König) · Thu, 12 Apr 2018 20:00:29 +0200

> 1) Turn off immediate mode when flipping between VRAM/GTT.
That must be implemented independently.

See working around the hardware bug should be a different patch than 
implementing a placement policy.

> As per discussion, the 3rd one, which is the current patch, seems the best so far.
And I can only repeat myself. Alex and I are the maintainers of the 
kernel module, so we are the one who decide on how to implement things here.

And we both noted that this approach of overriding user space decisions 
is not a good design.

The placement policy I suggest by preferring GTT over VRAM on APUs 
should be trivial to implement and as far as I can see avoids all 
negative side effects.

Regards,
Christian.

Am 12.04.2018 um 19:21 schrieb Samuel Li:
>> The point is this kernel change now needs to be reworked and adapted to what Mesa is doing.
> Three options have been brought up for kernel,
> 1) Turn off immediate mode when flipping between VRAM/GTT.
> 2) Check the domain of the current fb and then adjust the new one before pinning it.
> 3) Use only VRAM or GTT depending on a threshhold.
>
> As per discussion, the 3rd one, which is the current patch, seems the best so far.
>
> Regards,
> Samuel Li
>
>
>
> On 2018-04-12 01:03 PM, Christian KÃ¶nig wrote:
>>> Can you be more specific, Christian? Mesa has this, I don't think it needs anything else:
>> Completely agree, that's what I suggested to implement.
>>
>> The point is this kernel change now needs to be reworked and adapted to what Mesa is doing.
>>
>> Regards,
>> Christian.
>>
>> Am 12.04.2018 um 18:40 schrieb Marek OlÅ¡Ã¡k:
>>> Can you be more specific, Christian? Mesa has this, I don't think it needs anything else:
>>> https://cgit.freedesktop.org/mesa/mesa/commit/?id=7d2079908d9ef05ec3f35b7078833e57846cab5b
>>>
>>> Marek
>>>
>>> On Wed, Mar 28, 2018 at 3:46 AM, Christian KÃ¶nig <ckoenig.leichtzumerken at gmail.com <mailto:ckoenig.leichtzumerken at gmail.com>> wrote:
>>>
>>>  Â Â Â  Am 28.03.2018 um 00:22 schrieb Samuel Li:
>>>
>>>  Â Â Â Â Â Â Â  It's auto by default. For CZ/ST, auto setting enables sg display
>>>  Â Â Â Â Â Â Â  when vram size is small; otherwise still uses vram.
>>>  Â Â Â Â Â Â Â  This patch fixed some potential hang issue introduced by change
>>>  Â Â Â Â Â Â Â  "allow framebuffer in GART memory as well" due to CZ/ST hardware
>>>  Â Â Â Â Â Â Â  limitation.
>>>
>>>
>>>  Â Â Â  Well that is still a NAK.
>>>
>>>  Â Â Â  As discussed now multiple times please implement the necessary
>>>  Â Â Â  changes in Mesa.
>>>
>>>  Â Â Â  Regards,
>>>  Â Â Â  Christian.
>>>
>>>
>>>
>>>  Â Â Â Â Â Â Â  v2: Change default setting to auto, also some misc changes.
>>>  Â Â Â Â Â Â Â  Signed-off-by: Samuel Li <Samuel.Li at amd.com
>>>  Â Â Â Â Â Â Â  <mailto:Samuel.Li at amd.com>>
>>>  Â Â Â Â Â Â Â  ---
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/amdgpu/amdgpu.h Â  Â |Â  1 +
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/amdgpu/amdgpu_display.c Â  Â | 10 ++++++++--
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/amdgpu/amdgpu_display.h Â  Â |Â  2 ++
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Â  Â |Â  4 ++++
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c Â  |Â  2 ++
>>>  Â Â Â Â Â Â Â  Â  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |Â  3 ++-
>>>  Â Â Â Â Â Â Â  Â  6 files changed, 19 insertions(+), 3 deletions(-)
>>>
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>>>  Â Â Â Â Â Â Â  index a7e2229..c942362 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>>>  Â Â Â Â Â Â Â  @@ -129,6 +129,7 @@ extern int amdgpu_lbpw;
>>>  Â Â Â Â Â Â Â  Â  extern int amdgpu_compute_multipipe;
>>>  Â Â Â Â Â Â Â  Â  extern int amdgpu_gpu_recovery;
>>>  Â Â Â Â Â Â Â  Â  extern int amdgpu_emu_mode;
>>>  Â Â Â Â Â Â Â  +extern int amdgpu_sg_display;
>>>  Â Â Â Â Â Â Â  Â  Â  #ifdef CONFIG_DRM_AMDGPU_SI
>>>  Â Â Â Â Â Â Â  Â  extern int amdgpu_si_support;
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
>>>  Â Â Â Â Â Â Â  index 5495b29..1e7b950 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
>>>  Â Â Â Â Â Â Â  @@ -513,8 +513,14 @@ uint32_t
>>>  Â Â Â Â Â Â Â  amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
>>>  Â Â Â Â Â Â Â  Â  #if defined(CONFIG_DRM_AMD_DC)
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  if (adev->asic_type >= CHIP_CARRIZO && adev->asic_type
>>>  Â Â Â Â Â Â Â  < CHIP_RAVEN &&
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  Â  Â  adev->flags & AMD_IS_APU &&
>>>  Â Â Â Â Â Â Â  -Â  Â  Â  Â  Â  Â amdgpu_device_asic_has_dc_support(adev->asic_type))
>>>  Â Â Â Â Â Â Â  -Â  Â  Â  Â  Â  Â  Â  Â domain |= AMDGPU_GEM_DOMAIN_GTT;
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â amdgpu_device_asic_has_dc_support(adev->asic_type)) {
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â if (amdgpu_sg_display == 1)
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â domain = AMDGPU_GEM_DOMAIN_GTT;
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â else if (amdgpu_sg_display == -1) {
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â if (adev->gmc.real_vram_size <
>>>  Â Â Â Â Â Â Â  AMDGPU_SG_THRESHOLD)
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â domain = AMDGPU_GEM_DOMAIN_GTT;
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â }
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â }
>>>  Â Â Â Â Â Â Â  Â  #endif
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  return domain;
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
>>>  Â Â Â Â Â Â Â  index 2b11d80..2b25393 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
>>>  Â Â Â Â Â Â Â  @@ -23,6 +23,8 @@
>>>  Â Â Â Â Â Â Â  Â  #ifndef __AMDGPU_DISPLAY_H__
>>>  Â Â Â Â Â Â Â  Â  #define __AMDGPU_DISPLAY_H__
>>>  Â Â Â Â Â Â Â  Â  +#define AMDGPU_SG_THRESHOLDÂ  (256*1024*1024)
>>>  Â Â Â Â Â Â Â  +
>>>  Â Â Â Â Â Â Â  Â  uint32_t amdgpu_display_framebuffer_domains(struct
>>>  Â Â Â Â Â Â Â  amdgpu_device *adev);
>>>  Â Â Â Â Â Â Â  Â  struct drm_framebuffer *
>>>  Â Â Â Â Â Â Â  Â  amdgpu_display_user_framebuffer_create(struct drm_device *dev,
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>>  Â Â Â Â Â Â Â  index 1bfce79..19f11a5 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>>  Â Â Â Â Â Â Â  @@ -132,6 +132,7 @@ int amdgpu_lbpw = -1;
>>>  Â Â Â Â Â Â Â  Â  int amdgpu_compute_multipipe = -1;
>>>  Â Â Â Â Â Â Â  Â  int amdgpu_gpu_recovery = -1; /* auto */
>>>  Â Â Â Â Â Â Â  Â  int amdgpu_emu_mode = 0;
>>>  Â Â Â Â Â Â Â  +int amdgpu_sg_display = -1;
>>>  Â Â Â Â Â Â Â  Â  Â  MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in
>>>  Â Â Â Â Â Â Â  megabytes");
>>>  Â Â Â Â Â Â Â  Â  module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
>>>  Â Â Â Â Â Â Â  @@ -290,6 +291,9 @@ module_param_named(gpu_recovery,
>>>  Â Â Â Â Â Â Â  amdgpu_gpu_recovery, int, 0444);
>>>  Â Â Â Â Â Â Â  Â  MODULE_PARM_DESC(emu_mode, "Emulation mode, (1 = enable, 0 =
>>>  Â Â Â Â Â Â Â  disable)");
>>>  Â Â Â Â Â Â Â  Â  module_param_named(emu_mode, amdgpu_emu_mode, int, 0444);
>>>  Â Â Â Â Â Â Â  Â  +MODULE_PARM_DESC(sg_display, "Enable scatter gather
>>>  Â Â Â Â Â Â Â  display, (1 = enable, 0 = disable, -1 = auto");
>>>  Â Â Â Â Â Â Â  +module_param_named(sg_display, amdgpu_sg_display, int, 0444);
>>>  Â Â Â Â Â Â Â  +
>>>  Â Â Â Â Â Â Â  Â  #ifdef CONFIG_DRM_AMDGPU_SI
>>>  Â Â Â Â Â Â Â  Â  Â  #if defined(CONFIG_DRM_RADEON) ||
>>>  Â Â Â Â Â Â Â  defined(CONFIG_DRM_RADEON_MODULE)
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>>>  Â Â Â Â Â Â Â  index 1206301..f57c355 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>>>  Â Â Â Â Â Â Â  @@ -138,6 +138,8 @@ static int
>>>  Â Â Â Â Â Â Â  amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  mode_cmd->pitches[0] = amdgpu_align_pitch(adev,
>>>  Â Â Â Â Â Â Â  mode_cmd->width, cpp,
>>>  Â Â Â Â Â Â Â  fb_tiled);
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  domain = amdgpu_display_framebuffer_domains(adev);
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â if (domain & AMDGPU_GEM_DOMAIN_GTT)
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â  Â  Â  Â  Â DRM_DEBUG_DRIVER("Scatter gather display:
>>>  Â Â Â Â Â Â Â  enabled\n");
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  height = ALIGN(mode_cmd->height, 8);
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  size = mode_cmd->pitches[0] * height;
>>>  Â Â Â Â Â Â Â  diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>>  Â Â Â Â Â Â Â  b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>>  Â Â Â Â Â Â Â  index 68ab325..7e9f247 100644
>>>  Â Â Â Â Â Â Â  --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>>  Â Â Â Â Â Â Â  +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>>  Â Â Â Â Â Â Â  @@ -3074,7 +3074,8 @@ static int
>>>  Â Â Â Â Â Â Â  dm_plane_helper_prepare_fb(struct drm_plane *plane,
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  Â  Â  Â  Â  domain = AMDGPU_GEM_DOMAIN_VRAM;
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  r = amdgpu_bo_pin(rbo, domain, &afb->address);
>>>  Â Â Â Â Â Â Â  -
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â rbo->preferred_domains = domain;
>>>  Â Â Â Â Â Â Â  +Â  Â  Â  Â rbo->allowed_domains = domain;
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  amdgpu_bo_unreserve(rbo);
>>>  Â Â Â Â Â Â Â  Â  Â  Â  Â  if (unlikely(r != 0)) {
>>>
>>>
>>>  Â Â Â  _______________________________________________
>>>  Â Â Â  amd-gfx mailing list
>>>  Â Â Â  amd-gfx at lists.freedesktop.org <mailto:amd-gfx at lists.freedesktop.org>
>>>  Â Â Â  https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>>  Â Â Â  <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
>>>
>>>
>>