drm/amd/display: Stub new resource objects

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / amd / display / dc / inc / core_types.h

diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index ab389abf4e79d970499686503bc1d90999b067a6..6c937411af23279c50379658c0f3f9c8b1522818 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -32,13 +32,11 @@
 #include "ddc_service_types.h"
 #include "dc_bios_types.h"
 #include "mem_input.h"
-#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 #include "mpc.h"
-#endif
 
 #define MAX_CLOCK_SOURCES 7
 
-void enable_surface_flip_reporting(struct dc_surface *dc_surface,
+void enable_surface_flip_reporting(struct dc_plane_state *plane_state,
                uint32_t controller_id);
 
 #include "grph_object_id.h"
@@ -62,7 +60,7 @@ struct dc_link *link_create(const struct link_init_data *init_params);
 void link_destroy(struct dc_link **link);
 
 enum dc_status dc_link_validate_mode_timing(
-               const struct dc_stream *stream,
+               const struct dc_stream_state *stream,
                struct dc_link *link,
                const struct dc_crtc_timing *timing);
 
@@ -94,7 +92,7 @@ struct resource_funcs {
 
        enum dc_status (*validate_guaranteed)(
                                        const struct core_dc *dc,
-                                       struct dc_stream *stream,
+                                       struct dc_stream_state *stream,
                                        struct validate_context *context);
 
        bool (*validate_bandwidth)(
@@ -104,9 +102,8 @@ struct resource_funcs {
        struct pipe_ctx *(*acquire_idle_pipe_for_layer)(
                        struct validate_context *context,
                        const struct resource_pool *pool,
-                       struct dc_stream *stream);
-
-       enum dc_status (*validate_surface)(const struct dc_surface *surface);
+                       struct dc_stream_state *stream);
+       enum dc_status (*validate_plane)(const struct dc_plane_state *plane_state);
 };
 
 struct audio_support{
@@ -155,9 +152,20 @@ struct resource_pool {
        const struct resource_caps *res_cap;
 };
 
+struct stream_resource {
+       int stub;
+};
+
+struct plane_resource {
+       int stub;
+};
+
 struct pipe_ctx {
-       struct dc_surface *surface;
-       struct dc_stream *stream;
+       struct dc_plane_state *plane_state;
+       struct dc_stream_state *stream;
+
+       struct plane_resource plane_res;
+       struct stream_resource stream_res;
 
        struct mem_input *mi;
        struct input_pixel_processor *ipp;
@@ -242,7 +250,7 @@ union bw_context {
 };
 
 struct validate_context {
-       struct dc_stream *streams[MAX_PIPES];
+       struct dc_stream_state *streams[MAX_PIPES];
        struct dc_stream_status stream_status[MAX_PIPES];
        uint8_t stream_count;