lkml.org 
[lkml]   [2021]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATH 2/3] drm: set fb_modifiers_not_supported flag in legacy drivers
    Date
    Set fb_modifiers_not_supported flag in legacy drivers whose planes
    support non-linear layouts but does not support modifiers, and replace
    allow_fb_modifiers with fb_modifiers_not_supported.

    Signed-off-by: Tomohito Esaki <etom@igel.co.jp>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++---
    drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++
    drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++
    drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 +
    drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++
    drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++--
    drivers/gpu/drm/radeon/radeon_display.c | 2 ++
    7 files changed, 16 insertions(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    index dc50c05f23fc..cbaea9c6cfda 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    @@ -958,7 +958,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb)
    int ret;
    unsigned int i, block_width, block_height, block_size_log2;

    - if (!rfb->base.dev->mode_config.allow_fb_modifiers)
    + if (rfb->base.dev->mode_config.fb_modifiers_not_supported)
    return 0;

    for (i = 0; i < format_info->num_planes; ++i) {
    @@ -1145,7 +1145,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev,
    if (ret)
    return ret;

    - if (!dev->mode_config.allow_fb_modifiers) {
    + if (dev->mode_config.fb_modifiers_not_supported) {
    drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI,
    "GFX9+ requires FB check based on format modifier\n");
    ret = check_tiling_flags_gfx6(rfb);
    @@ -1153,7 +1153,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev,
    return ret;
    }

    - if (dev->mode_config.allow_fb_modifiers &&
    + if (!dev->mode_config.fb_modifiers_not_supported &&
    !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) {
    ret = convert_tiling_flags_to_modifier(rfb);
    if (ret) {
    diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
    index d1570a462a51..fb61c0814115 100644
    --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
    @@ -2798,6 +2798,8 @@ static int dce_v10_0_sw_init(void *handle)
    adev_to_drm(adev)->mode_config.preferred_depth = 24;
    adev_to_drm(adev)->mode_config.prefer_shadow = 1;

    + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
    +
    adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;

    r = amdgpu_display_modeset_create_props(adev);
    diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
    index 18a7b3bd633b..17942a11366d 100644
    --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
    @@ -2916,6 +2916,8 @@ static int dce_v11_0_sw_init(void *handle)
    adev_to_drm(adev)->mode_config.preferred_depth = 24;
    adev_to_drm(adev)->mode_config.prefer_shadow = 1;

    + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
    +
    adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;

    r = amdgpu_display_modeset_create_props(adev);
    diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
    index c7803dc2b2d5..2ec99ec8e1a3 100644
    --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
    @@ -2674,6 +2674,7 @@ static int dce_v6_0_sw_init(void *handle)
    adev_to_drm(adev)->mode_config.max_height = 16384;
    adev_to_drm(adev)->mode_config.preferred_depth = 24;
    adev_to_drm(adev)->mode_config.prefer_shadow = 1;
    + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
    adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;

    r = amdgpu_display_modeset_create_props(adev);
    diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
    index b200b9e722d9..8369336cec90 100644
    --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
    @@ -2699,6 +2699,8 @@ static int dce_v8_0_sw_init(void *handle)
    adev_to_drm(adev)->mode_config.preferred_depth = 24;
    adev_to_drm(adev)->mode_config.prefer_shadow = 1;

    + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
    +
    adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;

    r = amdgpu_display_modeset_create_props(adev);
    diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
    index 929de41c281f..1ecad7fa3e8a 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_display.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
    @@ -711,10 +711,12 @@ nouveau_display_create(struct drm_device *dev)
    &disp->disp);
    if (ret == 0) {
    nouveau_display_create_properties(dev);
    - if (disp->disp.object.oclass < NV50_DISP)
    + if (disp->disp.object.oclass < NV50_DISP) {
    + dev->mode_config.fb_modifiers_not_supported = true;
    ret = nv04_display_create(dev);
    - else
    + } else {
    ret = nv50_display_create(dev);
    + }
    }
    } else {
    ret = 0;
    diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
    index 573154268d43..b9a07677a71e 100644
    --- a/drivers/gpu/drm/radeon/radeon_display.c
    +++ b/drivers/gpu/drm/radeon/radeon_display.c
    @@ -1596,6 +1596,8 @@ int radeon_modeset_init(struct radeon_device *rdev)
    rdev->ddev->mode_config.preferred_depth = 24;
    rdev->ddev->mode_config.prefer_shadow = 1;

    + rdev->ddev->mode_config.fb_modifiers_not_supported = true;
    +
    rdev->ddev->mode_config.fb_base = rdev->mc.aper_base;

    ret = radeon_modeset_create_props(rdev);
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-12-22 06:28    [W:3.261 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site