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

Commit a3d5d75f authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Rename psb_intel_connector to gma_connector 



The psb_intel_connector is generic and should be named appropriately

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent 6306865d

drivers/gpu/drm/gma500/cdv_intel_crt.c

+7 −7
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ void cdv_intel_crt_init(struct drm_device *dev, 
			struct psb_intel_mode_device *mode_dev)

{



	struct psb_intel_connector *psb_intel_connector;

	struct gma_connector *gma_connector;

	struct psb_intel_encoder *psb_intel_encoder;

	struct drm_connector *connector;

	struct drm_encoder *encoder;
@@ -270,11 +270,11 @@ void cdv_intel_crt_init(struct drm_device *dev, 
	if (!psb_intel_encoder)

		return;



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

	if (!psb_intel_connector)

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

	if (!gma_connector)

		goto failed_connector;



	connector = &psb_intel_connector->base;

	connector = &gma_connector->base;

	connector->polled = DRM_CONNECTOR_POLL_HPD;

	drm_connector_init(dev, connector,

		&cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
@@ -283,7 +283,7 @@ void cdv_intel_crt_init(struct drm_device *dev, 
	drm_encoder_init(dev, encoder,

		&cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC);



	gma_connector_attach_encoder(psb_intel_connector, psb_intel_encoder);

	gma_connector_attach_encoder(gma_connector, psb_intel_encoder);



	/* Set up the DDC bus. */

	i2c_reg = GPIOA;
@@ -317,8 +317,8 @@ void cdv_intel_crt_init(struct drm_device *dev, 
	return;

failed_ddc:

	drm_encoder_cleanup(&psb_intel_encoder->base);

	drm_connector_cleanup(&psb_intel_connector->base);

	kfree(psb_intel_connector);

	drm_connector_cleanup(&gma_connector->base);

	kfree(gma_connector);

failed_connector:

	kfree(psb_intel_encoder);

	return;

drivers/gpu/drm/gma500/cdv_intel_dp.c

+8 −8
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ cdv_intel_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode, 
}



static int

cdv_intel_dp_i2c_init(struct psb_intel_connector *connector, struct psb_intel_encoder *encoder, const char *name)

cdv_intel_dp_i2c_init(struct gma_connector *connector, struct psb_intel_encoder *encoder, const char *name)

{

	struct cdv_intel_dp *intel_dp = encoder->dev_priv;

	int ret;
@@ -1803,7 +1803,7 @@ void 
cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev, int output_reg)

{

	struct psb_intel_encoder *psb_intel_encoder;

	struct psb_intel_connector *psb_intel_connector;

	struct gma_connector *gma_connector;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	struct cdv_intel_dp *intel_dp;
@@ -1813,8 +1813,8 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev 
	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);

	if (!psb_intel_encoder)

		return;

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

        if (!psb_intel_connector)

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

        if (!gma_connector)

                goto err_connector;

	intel_dp = kzalloc(sizeof(struct cdv_intel_dp), GFP_KERNEL);

	if (!intel_dp)
@@ -1823,13 +1823,13 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev 
	if ((output_reg == DP_C) && cdv_intel_dpc_is_edp(dev))

		type = DRM_MODE_CONNECTOR_eDP;



	connector = &psb_intel_connector->base;

	connector = &gma_connector->base;

	encoder = &psb_intel_encoder->base;



	drm_connector_init(dev, connector, &cdv_intel_dp_connector_funcs, type);

	drm_encoder_init(dev, encoder, &cdv_intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS);



	gma_connector_attach_encoder(psb_intel_connector, psb_intel_encoder);

	gma_connector_attach_encoder(gma_connector, psb_intel_encoder);



	if (type == DRM_MODE_CONNECTOR_DisplayPort)

        	psb_intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
@@ -1864,7 +1864,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev 


	cdv_disable_intel_clock_gating(dev);



	cdv_intel_dp_i2c_init(psb_intel_connector, psb_intel_encoder, name);

	cdv_intel_dp_i2c_init(gma_connector, psb_intel_encoder, name);

        /* FIXME:fail check */

	cdv_intel_dp_add_properties(connector);
@@ -1947,7 +1947,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev 
	return;



err_priv:

	kfree(psb_intel_connector);

	kfree(gma_connector);

err_connector:

	kfree(psb_intel_encoder);

}

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

+6 −6
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ void cdv_hdmi_init(struct drm_device *dev, 
			struct psb_intel_mode_device *mode_dev, int reg)

{

	struct psb_intel_encoder *psb_intel_encoder;

	struct psb_intel_connector *psb_intel_connector;

	struct gma_connector *gma_connector;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	struct mid_intel_hdmi_priv *hdmi_priv;
@@ -307,10 +307,10 @@ void cdv_hdmi_init(struct drm_device *dev, 
	if (!psb_intel_encoder)

		return;



	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),

	gma_connector = kzalloc(sizeof(struct gma_connector),

				      GFP_KERNEL);



	if (!psb_intel_connector)

	if (!gma_connector)

		goto err_connector;



	hdmi_priv = kzalloc(sizeof(struct mid_intel_hdmi_priv), GFP_KERNEL);
@@ -318,7 +318,7 @@ void cdv_hdmi_init(struct drm_device *dev, 
	if (!hdmi_priv)

		goto err_priv;



	connector = &psb_intel_connector->base;

	connector = &gma_connector->base;

	connector->polled = DRM_CONNECTOR_POLL_HPD;

	encoder = &psb_intel_encoder->base;

	drm_connector_init(dev, connector,
@@ -328,7 +328,7 @@ void cdv_hdmi_init(struct drm_device *dev, 
	drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs,

			 DRM_MODE_ENCODER_TMDS);



	gma_connector_attach_encoder(psb_intel_connector, psb_intel_encoder);

	gma_connector_attach_encoder(gma_connector, psb_intel_encoder);

	psb_intel_encoder->type = INTEL_OUTPUT_HDMI;

	hdmi_priv->hdmi_reg = reg;

	hdmi_priv->has_hdmi_sink = false;
@@ -378,7 +378,7 @@ void cdv_hdmi_init(struct drm_device *dev, 
	drm_encoder_cleanup(encoder);

	drm_connector_cleanup(connector);

err_priv:

	kfree(psb_intel_connector);

	kfree(gma_connector);

err_connector:

	kfree(psb_intel_encoder);

}

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+6 −6
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
		     struct psb_intel_mode_device *mode_dev)

{

	struct psb_intel_encoder *psb_intel_encoder;

	struct psb_intel_connector *psb_intel_connector;

	struct gma_connector *gma_connector;

	struct cdv_intel_lvds_priv *lvds_priv;

	struct drm_connector *connector;

	struct drm_encoder *encoder;
@@ -633,9 +633,9 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	if (!psb_intel_encoder)

		return;



	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),

	gma_connector = kzalloc(sizeof(struct gma_connector),

				      GFP_KERNEL);

	if (!psb_intel_connector)

	if (!gma_connector)

		goto failed_connector;



	lvds_priv = kzalloc(sizeof(struct cdv_intel_lvds_priv), GFP_KERNEL);
@@ -644,7 +644,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 


	psb_intel_encoder->dev_priv = lvds_priv;



	connector = &psb_intel_connector->base;

	connector = &gma_connector->base;

	encoder = &psb_intel_encoder->base;
@@ -657,7 +657,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
			 DRM_MODE_ENCODER_LVDS);





	gma_connector_attach_encoder(psb_intel_connector, psb_intel_encoder);

	gma_connector_attach_encoder(gma_connector, psb_intel_encoder);

	psb_intel_encoder->type = INTEL_OUTPUT_LVDS;



	drm_encoder_helper_add(encoder, &cdv_intel_lvds_helper_funcs);
@@ -791,7 +791,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	drm_connector_cleanup(connector);

	kfree(lvds_priv);

failed_lvds_priv:

	kfree(psb_intel_connector);

	kfree(gma_connector);

failed_connector:

	kfree(psb_intel_encoder);

}

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static void psb_setup_outputs(struct drm_device *dev) 
		}

		encoder->possible_crtcs = crtc_mask;

		encoder->possible_clones =

		    psb_intel_connector_clones(dev, clone_mask);

		    gma_connector_clones(dev, clone_mask);

	}

}