Commit e5852bee authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/fb-helper: Remove drm_fb_helper_connector 



All drivers add all their connectors so there's no need to keep around an
array of available connectors. Instead we just put the useable (not
writeback) connectors in a temporary array using
drm_client_for_each_connector_iter() everytime we probe the outputs.
Other places where it's necessary to look at the connectors, we just
iterate over them using the same iterator function.

Rename functions which signature is changed since they will be moved to
drm_client in a later patch.

v6: Improve commit message (Sam Ravnborg)

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190608152657.36613-2-noralf@tronnes.org
parent 9ff3a5c8

Documentation/gpu/todo.rst

+4 −0
Original line number Diff line number Diff line
@@ -292,6 +292,10 @@ drm_fb_helper tasks 
- The max connector argument for drm_fb_helper_init() and

  drm_fb_helper_fbdev_setup() isn't used anymore and can be removed.



- The helper doesn't keep an array of connectors anymore so these can be

  removed: drm_fb_helper_single_add_all_connectors(),

  drm_fb_helper_add_one_connector() and drm_fb_helper_remove_one_connector().



Core refactorings

=================

drivers/gpu/drm/drm_fb_helper.c

+157 −349

File changed.

Preview size limit exceeded, changes collapsed.

include/drm/drm_client.h

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/mutex.h>

#include <linux/types.h>



#include <drm/drm_connector.h>

#include <drm/drm_crtc.h>



struct drm_client_dev;
@@ -169,6 +170,20 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode); 
	for (({ lockdep_assert_held(&(client)->modeset_mutex); }), \

	     modeset = (client)->modesets; modeset->crtc; modeset++)



/**

 * drm_client_for_each_connector_iter - connector_list iterator macro

 * @connector: &struct drm_connector pointer used as cursor

 * @iter: &struct drm_connector_list_iter

 *

 * This iterates the connectors that are useable for internal clients (excludes

 * writeback connectors).

 *

 * For more info see drm_for_each_connector_iter().

 */

#define drm_client_for_each_connector_iter(connector, iter) \

	drm_for_each_connector_iter(connector, iter) \

		if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)



int drm_client_debugfs_init(struct drm_minor *minor);



#endif

include/drm/drm_fb_helper.h

+21 −59
Original line number Diff line number Diff line
@@ -97,16 +97,10 @@ struct drm_fb_helper_funcs { 
			struct drm_fb_helper_surface_size *sizes);

};



struct drm_fb_helper_connector {

	struct drm_connector *connector;

};



/**

 * struct drm_fb_helper - main structure to emulate fbdev on top of KMS

 * @fb: Scanout framebuffer object

 * @dev: DRM device

 * @connector_count: number of connected connectors

 * @connector_info_alloc_count: size of connector_info

 * @funcs: driver callbacks for fb helper

 * @fbdev: emulated fbdev device info struct

 * @pseudo_palette: fake palette of 16 colors
@@ -138,15 +132,6 @@ struct drm_fb_helper { 


	struct drm_framebuffer *fb;

	struct drm_device *dev;

	int connector_count;

	int connector_info_alloc_count;

	/**

	 * @connector_info:

	 *

	 * Array of per-connector information. Do not iterate directly, but use

	 * drm_fb_helper_for_each_connector.

	 */

	struct drm_fb_helper_connector **connector_info;

	const struct drm_fb_helper_funcs *funcs;

	struct fb_info *fbdev;

	u32 pseudo_palette[17];
@@ -286,18 +271,8 @@ int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd, 


int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);

int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);

int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);

int drm_fb_helper_debug_enter(struct fb_info *info);

int drm_fb_helper_debug_leave(struct fb_info *info);

struct drm_display_mode *

drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,

			int width, int height);

struct drm_display_mode *

drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);



int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);

int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,

				       struct drm_connector *connector);



int drm_fb_helper_fbdev_setup(struct drm_device *dev,

			      struct drm_fb_helper *fb_helper,
@@ -472,12 +447,6 @@ static inline int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, 
	return 0;

}



static inline int

drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)

{

	return 0;

}



static inline int drm_fb_helper_debug_enter(struct fb_info *info)

{

	return 0;
@@ -488,34 +457,6 @@ static inline int drm_fb_helper_debug_leave(struct fb_info *info) 
	return 0;

}



static inline struct drm_display_mode *

drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,

		       int width, int height)

{

	return NULL;

}



static inline struct drm_display_mode *

drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

		      int width, int height)

{

	return NULL;

}



static inline int

drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper,

				struct drm_connector *connector)

{

	return 0;

}



static inline int

drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,

				   struct drm_connector *connector)

{

	return 0;

}



static inline int

drm_fb_helper_fbdev_setup(struct drm_device *dev,

			  struct drm_fb_helper *fb_helper,
@@ -557,6 +498,27 @@ drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp) 


#endif



/* TODO: There's a todo entry to remove these three */

static inline int

drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)

{

	return 0;

}



static inline int

drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper,

				struct drm_connector *connector)

{

	return 0;

}



static inline int

drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,

				   struct drm_connector *connector)

{

	return 0;

}



/**

 * drm_fb_helper_remove_conflicting_framebuffers - remove firmware-configured framebuffers

 * @a: memory range, users of which are to be removed

CRA Git | Maintained and supported by SUSTech CRA and CCSE