drm/amd/display: expand plane caps to include fp16 and scaling capability

[why]
there are some scaling capabilities such as fp16 which are known to be unsupported
on a given ASIC.  exposing these static capabilities allows much simpler implementation
for OS interfaces which require to report such static capabilities to reduce the
number of dynamic validation calls

[how]
refactor the existing plane caps to be more extensible, and add fp16 and scaling
capabilities

Signed-off-by: Jun Lei <Jun.Lei@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet Lakha@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 89d30eeea05748de40971b156f154aadd2e58d37..dd93f7d854ac78636362e3fdcabc09e5413f6435 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2085,7 +2085,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
                if (!plane->blends_with_above || !plane->blends_with_below)
                        continue;
 
-               if (!plane->supports_argb8888)
+               if (!plane->pixel_format_support.argb8888)
                        continue;
 
                if (initialize_plane(dm, NULL, primary_planes + i,
@@ -4142,7 +4142,7 @@ static int get_plane_formats(const struct drm_plane *plane,
                        formats[num_formats++] = rgb_formats[i];
                }
 
-               if (plane_cap && plane_cap->supports_nv12)
+               if (plane_cap && plane_cap->pixel_format_support.nv12)
                        formats[num_formats++] = DRM_FORMAT_NV12;
                break;
 
@@ -4196,7 +4196,7 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
        }
 
        if (plane->type == DRM_PLANE_TYPE_PRIMARY &&
-           plane_cap && plane_cap->supports_nv12) {
+           plane_cap && plane_cap->pixel_format_support.nv12) {
                /* This only affects YUV formats. */
                drm_plane_create_color_properties(
                        plane,

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 704e5430d4dcb13593488a4b3d2ed0c0882844c5..ced53db1a1beafefb694d6042ad01b20f1c6c22f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -66,8 +66,27 @@ struct dc_plane_cap {
        uint32_t blends_with_above : 1;
        uint32_t blends_with_below : 1;
        uint32_t per_pixel_alpha : 1;
-       uint32_t supports_argb8888 : 1;
-       uint32_t supports_nv12 : 1;
+       struct {
+               uint32_t argb8888 : 1;
+               uint32_t nv12 : 1;
+               uint32_t fp16 : 1;
+       } pixel_format_support;
+       // max upscaling factor x1000
+       // upscaling factors are always >= 1
+       // for example, 1080p -> 8K is 4.0, or 4000 raw value
+       struct {
+               uint32_t argb8888;
+               uint32_t nv12;
+               uint32_t fp16;
+       } max_upscale_factor;
+       // max downscale factor x1000
+       // downscale factors are always <= 1
+       // for example, 8K -> 1080p is 0.25, or 250 raw value
+       struct {
+               uint32_t argb8888;
+               uint32_t nv12;
+               uint32_t fp16;
+       } max_downscale_factor;
 };
 
 struct dc_caps {

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 767d37c6d942bf80242d80e28dab623d1c85c320..f38ea29b33771db39d15bb2783a5873b3b31b4e7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -380,7 +380,24 @@ static const struct resource_caps res_cap = {
 
 static const struct dc_plane_cap plane_cap = {
        .type = DC_PLANE_TYPE_DCE_RGB,
-       .supports_argb8888 = true,
+
+       .pixel_format_support = {
+                       .argb8888 = true,
+                       .nv12 = false,
+                       .fp16 = false
+       },
+
+       .max_upscale_factor = {
+                       .argb8888 = 16000,
+                       .nv12 = 1,
+                       .fp16 = 1
+       },
+
+       .max_downscale_factor = {
+                       .argb8888 = 250,
+                       .nv12 = 1,
+                       .fp16 = 1
+       }
 };
 
 #define CTX  ctx

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 7c4914b2b524c98b9d6fabdf1fb429e382ebab57..d5ebc453871185cd9d832a2d325969f054519ccd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -397,14 +397,48 @@ static const struct dc_plane_cap plane_cap = {
                .blends_with_below = true,
                .blends_with_above = true,
                .per_pixel_alpha = 1,
-               .supports_argb8888 = true,
+
+               .pixel_format_support = {
+                               .argb8888 = true,
+                               .nv12 = false,
+                               .fp16 = false
+               },
+
+               .max_upscale_factor = {
+                               .argb8888 = 16000,
+                               .nv12 = 1,
+                               .fp16 = 1
+               },
+
+               .max_downscale_factor = {
+                               .argb8888 = 250,
+                               .nv12 = 1,
+                               .fp16 = 1
+               }
 };
 
 static const struct dc_plane_cap underlay_plane_cap = {
                .type = DC_PLANE_TYPE_DCE_UNDERLAY,
                .blends_with_above = true,
                .per_pixel_alpha = 1,
-               .supports_nv12 = true
+
+               .pixel_format_support = {
+                               .argb8888 = false,
+                               .nv12 = true,
+                               .fp16 = false
+               },
+
+               .max_upscale_factor = {
+                               .argb8888 = 1,
+                               .nv12 = 16000,
+                               .fp16 = 1
+               },
+
+               .max_downscale_factor = {
+                               .argb8888 = 1,
+                               .nv12 = 250,
+                               .fp16 = 1
+               }
 };
 
 #define CTX  ctx

diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 2f28a74383f55d8387ee58ab25b0a6d5aba45ec9..afbc82b87982cd78ded19a9f4b63aaf1e530e85c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -399,7 +399,24 @@ static const struct resource_caps polaris_11_resource_cap = {
 
 static const struct dc_plane_cap plane_cap = {
        .type = DC_PLANE_TYPE_DCE_RGB,
-       .supports_argb8888 = true,
+
+       .pixel_format_support = {
+                       .argb8888 = true,
+                       .nv12 = false,
+                       .fp16 = false
+       },
+
+       .max_upscale_factor = {
+                       .argb8888 = 16000,
+                       .nv12 = 1,
+                       .fp16 = 1
+       },
+
+       .max_downscale_factor = {
+                       .argb8888 = 250,
+                       .nv12 = 1,
+                       .fp16 = 1
+       }
 };
 
 #define CTX  ctx

diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 01ea503faa12c2ba94b20513d9b5faf7bcd75c7e..6d49c7143c672f995f59f741be9d6c1c35780eb6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -456,7 +456,24 @@ static const struct resource_caps res_cap = {
 
 static const struct dc_plane_cap plane_cap = {
        .type = DC_PLANE_TYPE_DCE_RGB,
-       .supports_argb8888 = true,
+
+       .pixel_format_support = {
+                       .argb8888 = true,
+                       .nv12 = false,
+                       .fp16 = false
+       },
+
+       .max_upscale_factor = {
+                       .argb8888 = 16000,
+                       .nv12 = 1,
+                       .fp16 = 1
+       },
+
+       .max_downscale_factor = {
+                       .argb8888 = 250,
+                       .nv12 = 1,
+                       .fp16 = 1
+       }
 };
 
 static const struct dc_debug_options debug_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
index c7899ec96287d6dab9ed2a56dabdd59b9879ecb5..9569f3af12a3eb9074debd512312a9aa33a88f0f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
@@ -389,7 +389,24 @@ static const struct resource_caps res_cap_83 = {
 
 static const struct dc_plane_cap plane_cap = {
        .type = DC_PLANE_TYPE_DCE_RGB,
-       .supports_argb8888 = true,
+
+       .pixel_format_support = {
+                       .argb8888 = true,
+                       .nv12 = false,
+                       .fp16 = false
+       },
+
+       .max_upscale_factor = {
+                       .argb8888 = 16000,
+                       .nv12 = 1,
+                       .fp16 = 1
+       },
+
+       .max_downscale_factor = {
+                       .argb8888 = 250,
+                       .nv12 = 1,
+                       .fp16 = 1
+       }
 };
 
 static const struct dce_dmcu_registers dmcu_regs = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 79f4fbb8a14532794922872acfe1a14cb5fde8ca..7eccb54c421d9090c9fdbc5a0b45f8c1cf4b7454 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -521,8 +521,24 @@ static const struct dc_plane_cap plane_cap = {
        .blends_with_above = true,
        .blends_with_below = true,
        .per_pixel_alpha = true,
-       .supports_argb8888 = true,
-       .supports_nv12 = true
+
+       .pixel_format_support = {
+                       .argb8888 = true,
+                       .nv12 = true,
+                       .fp16 = true
+       },
+
+       .max_upscale_factor = {
+                       .argb8888 = 16000,
+                       .nv12 = 16000,
+                       .fp16 = 1
+       },
+
+       .max_downscale_factor = {
+                       .argb8888 = 250,
+                       .nv12 = 250,
+                       .fp16 = 1
+       }
 };
 
 static const struct dc_debug_options debug_defaults_drv = {