On 2018-04-18 04:34 AM, Christian König wrote:
> Am 18.04.2018 um 06:14 schrieb Alex Deucher:
>> On Tue, Apr 17, 2018 at 8:40 PM, Samuel Li <Samuel.Li at amd.com> wrote:
>>> 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 potention hang issue introduced by change
>>> "allow framebuffer in GART memory as well" due to CZ/ST hardware
>>> limitation.
>>>
>>> v2: Change default setting to auto.
>>> v3: Move some logic from amdgpu_display_framebuffer_domains()
>>> Â Â Â Â to pin function, suggested by Christian.
>>> Signed-off-by: Samuel Li <Samuel.Li at amd.com>
>>> ---
>>>  drivers/gpu/drm/amd/amdgpu/amdgpu.h              | 2 ++
>>>  drivers/gpu/drm/amd/amdgpu/amdgpu_display.c      | 4 ++--
>>>  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/amdgpu/amdgpu_object.c       | 25 +++++++++++++++++++++--
>>>  drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c        | 2 +-
>>> Â drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |Â 3 +--
>>> Â 8 files changed, 35 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
[...]
>> This is a bug fix and should be split out into a separate patch.
>>
>>> +
>>> +Â Â Â Â Â Â /* display buffer */
>>> +#if defined(CONFIG_DRM_AMD_DC)
>
> Please drop that #if, we certainly don't want this to be depend on any define.
OK.
>
>>> +Â Â Â Â Â Â 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) &&
>
> Those checks are static and don't depend on the BO. So they should be in amdgpu_display_supported_domains().
OK. That is going to be risky for the future though.
Regards,
Samuel Li
>
> Regards,
> Christian.
>
>>> +Â Â Â Â Â Â Â Â Â Â domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
>>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â 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;
>>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â else
>>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â domain = AMDGPU_GEM_DOMAIN_VRAM;
>>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
>> I thought we were dropping the module parameter. Also, we had talked
>> about taking preferred domains into account here as well, but that can
>> be a follow on patch.
>>
>> Alex
>>
>>> +Â Â Â Â Â Â }
>>> +#endif
>>>
>>> Â Â Â Â Â Â Â Â if (bo->pin_count) {
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_t mem_type = bo->tbo.mem.mem_type;
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>>> index 4b584cb7..cf0749f 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>>> @@ -209,7 +209,7 @@ static int amdgpu_gem_begin_cpu_access(struct dma_buf *dma_buf,
>>> Â Â Â Â Â Â Â Â struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv);
>>> Â Â Â Â Â Â Â Â struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
>>> Â Â Â Â Â Â Â Â struct ttm_operation_ctx ctx = { true, false };
>>> -Â Â Â Â Â Â u32 domain = amdgpu_display_framebuffer_domains(adev);
>>> +Â Â Â Â Â Â u32 domain = amdgpu_display_supported_domains(adev);
>>> Â Â Â Â Â Â Â Â int ret;
>>> Â Â Â Â Â Â Â Â bool reads = (direction == DMA_BIDIRECTIONAL ||
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â direction == DMA_FROM_DEVICE);
>>> 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 6f92a19..1f5603a 100644
>>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> @@ -3109,12 +3109,11 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return r;
>>>
>>> Â Â Â Â Â Â Â Â if (plane->type != DRM_PLANE_TYPE_CURSOR)
>>> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â domain = amdgpu_display_framebuffer_domains(adev);
>>> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â domain = amdgpu_display_supported_domains(adev);
>>> Â Â Â Â Â Â Â Â else
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â domain = AMDGPU_GEM_DOMAIN_VRAM;
>>>
>>> Â Â Â Â Â Â Â Â r = amdgpu_bo_pin(rbo, domain, &afb->address);
>>> -
>>> Â Â Â Â Â Â Â Â amdgpu_bo_unreserve(rbo);
>>>
>>> Â Â Â Â Â Â Â Â if (unlikely(r != 0)) {
>>> --
>>> 2.7.4
>>>
>>> _______________________________________________
>>> amd-gfx mailing list
>>> amd-gfx at lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
