Commit f2e99524 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Allocate instance of struct mga_i2c_chan dynamically 



Allocate instances of struct mga_i2c_chan in mgag200_ddc_create()
and return a pointer to the contained i2c adapter. The callers of
the function are now independent from struct mga_i2c_chan.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240513125620.6337-5-tzimmermann@suse.de
parent 23368d7b

drivers/gpu/drm/mgag200/mgag200_ddc.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



#ifndef __MGAG200_DDC_H__

#define __MGAG200_DDC_H__



struct i2c_adapter;

struct mga_device;



struct i2c_adapter *mgag200_ddc_create(struct mga_device *mdev);



#endif

drivers/gpu/drm/mgag200/mgag200_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ struct mga_device { 
	struct drm_plane primary_plane;

	struct drm_crtc crtc;

	struct drm_encoder encoder;

	struct mga_i2c_chan i2c;

	struct drm_connector connector;

};
@@ -453,7 +452,4 @@ int mgag200_mode_config_init(struct mga_device *mdev, resource_size_t vram_avail 
void mgag200_bmc_disable_vidrst(struct mga_device *mdev);

void mgag200_bmc_enable_vidrst(struct mga_device *mdev);



				/* mgag200_i2c.c */

int mgag200_i2c_init(struct mga_device *mdev, struct mga_i2c_chan *i2c);



#endif				/* __MGAG200_DRV_H__ */

drivers/gpu/drm/mgag200/mgag200_g200.c

+6 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <drm/drm_gem_atomic_helper.h>

#include <drm/drm_probe_helper.h>



#include "mgag200_ddc.h"

#include "mgag200_drv.h"



static int mgag200_g200_init_pci_options(struct pci_dev *pdev)
@@ -201,8 +202,8 @@ static int mgag200_g200_pipeline_init(struct mga_device *mdev) 
	struct drm_plane *primary_plane = &mdev->primary_plane;

	struct drm_crtc *crtc = &mdev->crtc;

	struct drm_encoder *encoder = &mdev->encoder;

	struct mga_i2c_chan *i2c = &mdev->i2c;

	struct drm_connector *connector = &mdev->connector;

	struct i2c_adapter *ddc;

	int ret;



	ret = drm_universal_plane_init(dev, primary_plane, 0,
@@ -238,16 +239,16 @@ static int mgag200_g200_pipeline_init(struct mga_device *mdev) 
		return ret;

	}



	ret = mgag200_i2c_init(mdev, i2c);

	if (ret) {

	ddc = mgag200_ddc_create(mdev);

	if (IS_ERR(ddc)) {

		ret = PTR_ERR(ddc);

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

		return ret;

	}



	ret = drm_connector_init_with_ddc(dev, connector,

					  &mgag200_g200_vga_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &i2c->adapter);

					  DRM_MODE_CONNECTOR_VGA, ddc);

	if (ret) {

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

		return ret;

drivers/gpu/drm/mgag200/mgag200_g200eh.c

+6 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <drm/drm_gem_atomic_helper.h>

#include <drm/drm_probe_helper.h>



#include "mgag200_ddc.h"

#include "mgag200_drv.h"



void mgag200_g200eh_init_registers(struct mga_device *mdev)
@@ -200,8 +201,8 @@ static int mgag200_g200eh_pipeline_init(struct mga_device *mdev) 
	struct drm_plane *primary_plane = &mdev->primary_plane;

	struct drm_crtc *crtc = &mdev->crtc;

	struct drm_encoder *encoder = &mdev->encoder;

	struct mga_i2c_chan *i2c = &mdev->i2c;

	struct drm_connector *connector = &mdev->connector;

	struct i2c_adapter *ddc;

	int ret;



	ret = drm_universal_plane_init(dev, primary_plane, 0,
@@ -237,16 +238,16 @@ static int mgag200_g200eh_pipeline_init(struct mga_device *mdev) 
		return ret;

	}



	ret = mgag200_i2c_init(mdev, i2c);

	if (ret) {

	ddc = mgag200_ddc_create(mdev);

	if (IS_ERR(ddc)) {

		ret = PTR_ERR(ddc);

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

		return ret;

	}



	ret = drm_connector_init_with_ddc(dev, connector,

					  &mgag200_g200eh_vga_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &i2c->adapter);

					  DRM_MODE_CONNECTOR_VGA, ddc);

	if (ret) {

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

		return ret;

drivers/gpu/drm/mgag200/mgag200_g200eh3.c

+6 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <drm/drm_gem_atomic_helper.h>

#include <drm/drm_probe_helper.h>



#include "mgag200_ddc.h"

#include "mgag200_drv.h"



/*
@@ -104,8 +105,8 @@ static int mgag200_g200eh3_pipeline_init(struct mga_device *mdev) 
	struct drm_plane *primary_plane = &mdev->primary_plane;

	struct drm_crtc *crtc = &mdev->crtc;

	struct drm_encoder *encoder = &mdev->encoder;

	struct mga_i2c_chan *i2c = &mdev->i2c;

	struct drm_connector *connector = &mdev->connector;

	struct i2c_adapter *ddc;

	int ret;



	ret = drm_universal_plane_init(dev, primary_plane, 0,
@@ -141,16 +142,16 @@ static int mgag200_g200eh3_pipeline_init(struct mga_device *mdev) 
		return ret;

	}



	ret = mgag200_i2c_init(mdev, i2c);

	if (ret) {

	ddc = mgag200_ddc_create(mdev);

	if (IS_ERR(ddc)) {

		ret = PTR_ERR(ddc);

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

		return ret;

	}



	ret = drm_connector_init_with_ddc(dev, connector,

					  &mgag200_g200eh3_vga_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &i2c->adapter);

					  DRM_MODE_CONNECTOR_VGA, ddc);

	if (ret) {

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

		return ret;