@@ -19,26 +19,6 @@
#define IDLE_TIMEOUT (66 - 16/2)
/**
- * struct msm_display_info - defines display properties
- * @intf_type: DRM_MODE_ENCODER_ type
- * @capabilities: Bitmask of display flags
- * @num_of_h_tiles: Number of horizontal tiles in case of split interface
- * @h_tile_instance: Controller instance used per tile. Number of elements is
- * based on num_of_h_tiles
- * @is_te_using_watchdog_timer: Boolean to indicate watchdog TE is
- * used instead of panel TE in cmd mode panels
- * @dsc: DSC configuration data for DSC-enabled displays
- */
-struct msm_display_info {
- int intf_type;
- uint32_t capabilities;
- uint32_t num_of_h_tiles;
- uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY];
- bool is_te_using_watchdog_timer;
- struct msm_display_dsc_config *dsc;
-};
-
-/**
* dpu_encoder_assign_crtc - Link the encoder to the crtc it's assigned to
* @encoder: encoder pointer
* @crtc: crtc pointer
@@ -106,11 +106,30 @@ struct msm_drm_thread {
struct kthread_worker *worker;
};
+<<<<<<< HEAD
/* DSC config */
struct msm_display_dsc_config {
struct drm_dsc_config *drm;
};
+/**
+ * struct msm_display_info - defines display properties
+ * @intf_type: DRM_MODE_ENCODER_ type
+ * @capabilities: Bitmask of display flags
+ * @num_of_h_tiles: Number of horizontal tiles in case of split interface
+ * @h_tile_instance: Controller instance used per tile. Number of elements is
+ * based on num_of_h_tiles
+ * @is_te_using_watchdog_timer: Boolean to indicate watchdog TE is
+ * used instead of panel TE in cmd mode panels
+ */
+struct msm_display_info {
+ int intf_type;
+ uint32_t capabilities;
+ uint32_t num_of_h_tiles;
+ uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY];
+ bool is_te_using_watchdog_timer;
+};
+
struct msm_drm_private {
struct drm_device *dev;
With current implementation, communication between interface driver and upper mdss encoder layer are implemented through function calls. This increase code complexity. Since struct msm_display_info contains msm generic display information, it can be expended to contains more useful information, such as widebus and dcs, in future to serve as communication channel purpose between interface driver and upper mdss encoder layer so that existing function calls can be eliminated. This patch more struct msm_display_info to msm_drv.h to be visible by whole msm scope. Signed-off-by: Kuogee Hsieh <quic_khsieh@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 20 -------------------- drivers/gpu/drm/msm/msm_drv.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-)