| Message ID | 20220203082611.2654810-2-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/msm/dpu: cleanup dpu encoder code | expand |
On 2/3/2022 12:26 AM, Dmitry Baryshkov wrote: > The msm_display_info structure is not used by the rest of msm driver, so > move it into the dpu1 (dpu_encoder.h to be precise). > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Yes, this is true. Its not used by rest of msm driver. Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 18 ++++++++++++++++++ > drivers/gpu/drm/msm/msm_drv.h | 18 ------------------ > 2 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > index e241914a9677..ebe3944355bb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > @@ -34,6 +34,24 @@ struct dpu_encoder_hw_resources { > void dpu_encoder_get_hw_resources(struct drm_encoder *encoder, > struct dpu_encoder_hw_resources *hw_res); > > +/** > + * 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; > +}; > + > /** > * dpu_encoder_assign_crtc - Link the encoder to the crtc it's assigned to > * @encoder: encoder pointer > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index d7574e6bd4e4..16f9e25ee19e 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -109,24 +109,6 @@ struct msm_display_topology { > u32 num_dspp; > }; > > -/** > - * 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; > -}; > - > /* Commit/Event thread specific structure */ > struct msm_drm_thread { > struct drm_device *dev;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h index e241914a9677..ebe3944355bb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -34,6 +34,24 @@ struct dpu_encoder_hw_resources { void dpu_encoder_get_hw_resources(struct drm_encoder *encoder, struct dpu_encoder_hw_resources *hw_res); +/** + * 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; +}; + /** * dpu_encoder_assign_crtc - Link the encoder to the crtc it's assigned to * @encoder: encoder pointer diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index d7574e6bd4e4..16f9e25ee19e 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -109,24 +109,6 @@ struct msm_display_topology { u32 num_dspp; }; -/** - * 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; -}; - /* Commit/Event thread specific structure */ struct msm_drm_thread { struct drm_device *dev;
The msm_display_info structure is not used by the rest of msm driver, so move it into the dpu1 (dpu_encoder.h to be precise). Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 18 ++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.h | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-)