Commit 8219f11f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Remove struct mga_connector 



struct mga_connector has outlived its purpose. Inline the rsp init
helper into the mode-config code and remove the data structure. No
functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Tested-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220516134343.6085-6-tzimmermann@suse.de
parent b279df24

drivers/gpu/drm/mgag200/mgag200_drv.h

+1 −7
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ static inline struct mgag200_crtc_state *to_mgag200_crtc_state(struct drm_crtc_s 
	return container_of(base, struct mgag200_crtc_state, base);

}



#define to_mga_connector(x) container_of(x, struct mga_connector, base)



struct mga_i2c_chan {

	struct i2c_adapter adapter;

	struct drm_device *dev;
@@ -177,10 +175,6 @@ struct mga_i2c_chan { 
	int data, clock;

};



struct mga_connector {

	struct drm_connector base;

};



struct mga_mc {

	resource_size_t			vram_size;

	resource_size_t			vram_base;
@@ -236,9 +230,9 @@ struct mga_device { 
		} g200se;

	} model;



	struct mga_connector connector;

	struct mgag200_pll pixpll;

	struct mga_i2c_chan i2c;

	struct drm_connector connector;

	struct drm_simple_display_pipe display_pipe;

};

drivers/gpu/drm/mgag200/mgag200_mode.c

+14 −30
Original line number Diff line number Diff line
@@ -824,31 +824,6 @@ static const struct drm_connector_funcs mga_vga_connector_funcs = { 
	.atomic_destroy_state   = drm_atomic_helper_connector_destroy_state,

};



static int mgag200_vga_connector_init(struct mga_device *mdev)

{

	struct drm_device *dev = &mdev->base;

	struct mga_connector *mconnector = &mdev->connector;

	struct drm_connector *connector = &mconnector->base;

	struct mga_i2c_chan *i2c = &mdev->i2c;

	int ret;



	ret = mgag200_i2c_init(mdev, i2c);

	if (ret) {

		drm_err(dev, "failed to add DDC bus: %d\n", ret);

		return ret;

	}



	ret = drm_connector_init_with_ddc(dev, connector,

					  &mga_vga_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &i2c->adapter);

	if (ret)

		return ret;

	drm_connector_helper_add(connector, &mga_vga_connector_helper_funcs);



	return 0;

}



/*

 * Simple Display Pipe

 */
@@ -1109,7 +1084,8 @@ static unsigned int mgag200_preferred_depth(struct mga_device *mdev) 
int mgag200_modeset_init(struct mga_device *mdev)

{

	struct drm_device *dev = &mdev->base;

	struct drm_connector *connector = &mdev->connector.base;

	struct mga_i2c_chan *i2c = &mdev->i2c;

	struct drm_connector *connector = &mdev->connector;

	struct drm_simple_display_pipe *pipe = &mdev->display_pipe;

	size_t format_count = ARRAY_SIZE(mgag200_simple_display_pipe_formats);

	int ret;
@@ -1132,14 +1108,22 @@ int mgag200_modeset_init(struct mga_device *mdev) 


	dev->mode_config.funcs = &mgag200_mode_config_funcs;



	ret = mgag200_vga_connector_init(mdev);

	ret = mgag200_i2c_init(mdev, i2c);

	if (ret) {

		drm_err(dev,

			"mgag200_vga_connector_init() failed, error %d\n",

			ret);

		drm_err(dev, "failed to add DDC bus: %d\n", ret);

		return ret;

	}



	ret = drm_connector_init_with_ddc(dev, connector,

					  &mga_vga_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &i2c->adapter);

	if (ret) {

		drm_err(dev, "drm_connector_init_with_ddc() failed: %d\n", ret);

		return ret;

	}

	drm_connector_helper_add(connector, &mga_vga_connector_helper_funcs);



	ret = mgag200_pixpll_init(&mdev->pixpll, mdev);

	if (ret)

		return ret;