Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454c1ca8 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: convert VGA driver to new encoder/connector structure 



Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 9c9e7927

drivers/gpu/drm/i915/intel_crt.c

+22 −13
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) 
	return false;

}



static bool intel_crt_detect_ddc(struct drm_connector *connector)

static bool intel_crt_detect_ddc(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(connector);

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);



	/* CRT should always be at 0, but check anyway */

	if (intel_encoder->type != INTEL_OUTPUT_ANALOG)
@@ -403,8 +403,8 @@ intel_crt_load_detect(struct drm_crtc *crtc, struct intel_encoder *intel_encoder 
static enum drm_connector_status intel_crt_detect(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct intel_encoder *intel_encoder = to_intel_encoder(connector);

	struct drm_encoder *encoder = &intel_encoder->enc;

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct drm_crtc *crtc;

	int dpms_mode;

	enum drm_connector_status status;
@@ -416,7 +416,7 @@ static enum drm_connector_status intel_crt_detect(struct drm_connector *connecto 
			return connector_status_disconnected;

	}



	if (intel_crt_detect_ddc(connector))

	if (intel_crt_detect_ddc(encoder))

		return connector_status_connected;



	/* for pre-945g platforms use load detect */
@@ -438,9 +438,6 @@ static enum drm_connector_status intel_crt_detect(struct drm_connector *connecto 


static void intel_crt_destroy(struct drm_connector *connector)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(connector);



	intel_i2c_destroy(intel_encoder->ddc_bus);

	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);
@@ -449,7 +446,8 @@ static void intel_crt_destroy(struct drm_connector *connector) 
static int intel_crt_get_modes(struct drm_connector *connector)

{

	int ret;

	struct intel_encoder *intel_encoder = to_intel_encoder(connector);

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct i2c_adapter *ddc_bus;

	struct drm_device *dev = connector->dev;
@@ -505,12 +503,16 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {

	.mode_valid = intel_crt_mode_valid,

	.get_modes = intel_crt_get_modes,

	.best_encoder = intel_best_encoder,

	.best_encoder = intel_attached_encoder,

};



static void intel_crt_enc_destroy(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);



	intel_i2c_destroy(intel_encoder->ddc_bus);

	drm_encoder_cleanup(encoder);

	kfree(intel_encoder);

}



static const struct drm_encoder_funcs intel_crt_enc_funcs = {
@@ -521,6 +523,7 @@ void intel_crt_init(struct drm_device *dev) 
{

	struct drm_connector *connector;

	struct intel_encoder *intel_encoder;

	struct intel_connector *intel_connector;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 i2c_reg;
@@ -528,14 +531,20 @@ void intel_crt_init(struct drm_device *dev) 
	if (!intel_encoder)

		return;



	connector = &intel_encoder->base;

	drm_connector_init(dev, &intel_encoder->base,

	intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);

	if (!intel_connector) {

		kfree(intel_encoder);

		return;

	}



	connector = &intel_connector->base;

	drm_connector_init(dev, &intel_connector->base,

			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);



	drm_encoder_init(dev, &intel_encoder->enc, &intel_crt_enc_funcs,

			 DRM_MODE_ENCODER_DAC);



	drm_mode_connector_attach_encoder(&intel_encoder->base,

	drm_mode_connector_attach_encoder(&intel_connector->base,

					  &intel_encoder->enc);



	/* Set up the DDC bus. */