drm/fb-helper: Fixup fill_info cleanup (ec8bf194) · Commits · 戴 / test

drivers/gpu/drm/drm_fb_helper.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2783,9 +2783,8 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
		*
		* This function will call down into the &drm_fb_helper_funcs.fb_probe callback
		* to let the driver allocate and initialize the fbdev info structure and the
		* drm framebuffer used to back the fbdev. drm_fb_helper_fill_var() and
		* drm_fb_helper_fill_fix() are provided as helpers to setup simple default
		* values for the fbdev info structure.
		* drm framebuffer used to back the fbdev. drm_fb_helper_fill_info() is provided
		* as a helper to setup simple default values for the fbdev info structure.
		*
		* HANG DEBUGGING:
		*

+6 −12

Original line number	Diff line number	Diff line
		@@ -67,10 +67,8 @@ struct drm_fb_helper_crtc {
		* according to the largest width/height (so it is large enough for all CRTCs
		* to scanout). But the fbdev width/height is sized to the minimum width/
		* height of all the displays. This ensures that fbcon fits on the smallest
		* of the attached displays.
		*
		* So what is passed to drm_fb_helper_fill_var() should be fb_width/fb_height,
		* rather than the surface size.
		* of the attached displays. fb_width/fb_height is used by
		* drm_fb_helper_fill_info() to fill out the &fb_info.var structure.
		*/
		struct drm_fb_helper_surface_size {
		u32 fb_width;
		@@ -416,14 +414,10 @@ static inline void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
		{
		}

		static inline void drm_fb_helper_fill_var(struct fb_info *info,
		static inline void
		drm_fb_helper_fill_info(struct fb_info *info,
		struct drm_fb_helper *fb_helper,
		uint32_t fb_width, uint32_t fb_height)
		{
		}

		static inline void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
		uint32_t depth)
		struct drm_fb_helper_surface_size *sizes)
		{
		}