mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
drm/gma500: Rename psb_intel_connector to gma_connector
The psb_intel_connector is generic and should be named appropriately Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
parent
6306865daf
commit
a3d5d75f69
14 changed files with 64 additions and 65 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ struct psb_fbdev {
|
|||
|
||||
#define to_psb_fb(x) container_of(x, struct psb_framebuffer, base)
|
||||
|
||||
extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);
|
||||
extern int gma_connector_clones(struct drm_device *dev, int type_mask);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -672,7 +672,7 @@ struct drm_encoder *gma_best_encoder(struct drm_connector *connector)
|
|||
return &psb_intel_encoder->base;
|
||||
}
|
||||
|
||||
void gma_connector_attach_encoder(struct psb_intel_connector *connector,
|
||||
void gma_connector_attach_encoder(struct gma_connector *connector,
|
||||
struct psb_intel_encoder *encoder)
|
||||
{
|
||||
connector->encoder = encoder;
|
||||
|
|
|
@ -227,7 +227,7 @@ enum {
|
|||
#define DSI_DPI_DISABLE_BTA BIT(3)
|
||||
|
||||
struct mdfld_dsi_connector {
|
||||
struct psb_intel_connector base;
|
||||
struct gma_connector base;
|
||||
|
||||
int pipe;
|
||||
void *private;
|
||||
|
@ -269,11 +269,11 @@ struct mdfld_dsi_config {
|
|||
static inline struct mdfld_dsi_connector *mdfld_dsi_connector(
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
struct psb_intel_connector *psb_connector;
|
||||
struct gma_connector *gma_connector;
|
||||
|
||||
psb_connector = to_psb_intel_connector(connector);
|
||||
gma_connector = to_gma_connector(connector);
|
||||
|
||||
return container_of(psb_connector, struct mdfld_dsi_connector, base);
|
||||
return container_of(gma_connector, struct mdfld_dsi_connector, base);
|
||||
}
|
||||
|
||||
static inline struct mdfld_dsi_encoder *mdfld_dsi_encoder(
|
||||
|
|
|
@ -641,7 +641,7 @@ void oaktrail_hdmi_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 drm_connector *connector;
|
||||
struct drm_encoder *encoder;
|
||||
|
||||
|
@ -649,11 +649,11 @@ void oaktrail_hdmi_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;
|
||||
encoder = &psb_intel_encoder->base;
|
||||
drm_connector_init(dev, connector,
|
||||
&oaktrail_hdmi_connector_funcs,
|
||||
|
@ -663,7 +663,7 @@ void oaktrail_hdmi_init(struct drm_device *dev,
|
|||
&oaktrail_hdmi_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;
|
||||
drm_encoder_helper_add(encoder, &oaktrail_hdmi_helper_funcs);
|
||||
|
|
|
@ -326,7 +326,7 @@ void oaktrail_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 drm_connector *connector;
|
||||
struct drm_encoder *encoder;
|
||||
struct drm_psb_private *dev_priv = dev->dev_private;
|
||||
|
@ -338,11 +338,11 @@ void oaktrail_lvds_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;
|
||||
encoder = &psb_intel_encoder->base;
|
||||
dev_priv->is_lvds_on = true;
|
||||
drm_connector_init(dev, connector,
|
||||
|
@ -352,7 +352,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
|
|||
drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs,
|
||||
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, &oaktrail_lvds_helper_funcs);
|
||||
|
@ -440,7 +440,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
|
|||
|
||||
drm_encoder_cleanup(encoder);
|
||||
drm_connector_cleanup(connector);
|
||||
kfree(psb_intel_connector);
|
||||
kfree(gma_connector);
|
||||
failed_connector:
|
||||
kfree(psb_intel_encoder);
|
||||
}
|
||||
|
|
|
@ -594,7 +594,7 @@ struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
|
|||
return crtc;
|
||||
}
|
||||
|
||||
int psb_intel_connector_clones(struct drm_device *dev, int type_mask)
|
||||
int gma_connector_clones(struct drm_device *dev, int type_mask)
|
||||
{
|
||||
int index_mask = 0;
|
||||
struct drm_connector *connector;
|
||||
|
|
|
@ -137,7 +137,7 @@ struct psb_intel_encoder {
|
|||
struct psb_intel_i2c_chan *ddc_bus;
|
||||
};
|
||||
|
||||
struct psb_intel_connector {
|
||||
struct gma_connector {
|
||||
struct drm_connector base;
|
||||
struct psb_intel_encoder *encoder;
|
||||
};
|
||||
|
@ -195,8 +195,8 @@ struct gma_crtc {
|
|||
|
||||
#define to_gma_crtc(x) \
|
||||
container_of(x, struct gma_crtc, base)
|
||||
#define to_psb_intel_connector(x) \
|
||||
container_of(x, struct psb_intel_connector, base)
|
||||
#define to_gma_connector(x) \
|
||||
container_of(x, struct gma_connector, base)
|
||||
#define to_psb_intel_encoder(x) \
|
||||
container_of(x, struct psb_intel_encoder, base)
|
||||
#define to_psb_intel_framebuffer(x) \
|
||||
|
@ -227,13 +227,13 @@ extern void mid_dsi_init(struct drm_device *dev,
|
|||
struct psb_intel_mode_device *mode_dev, int dsi_num);
|
||||
|
||||
extern struct drm_encoder *gma_best_encoder(struct drm_connector *connector);
|
||||
extern void gma_connector_attach_encoder(struct psb_intel_connector *connector,
|
||||
extern void gma_connector_attach_encoder(struct gma_connector *connector,
|
||||
struct psb_intel_encoder *encoder);
|
||||
|
||||
static inline struct psb_intel_encoder *gma_attached_encoder(
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
return to_psb_intel_connector(connector)->encoder;
|
||||
return to_gma_connector(connector)->encoder;
|
||||
}
|
||||
|
||||
extern struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
|
||||
|
|
|
@ -690,7 +690,7 @@ void psb_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 psb_intel_lvds_priv *lvds_priv;
|
||||
struct drm_connector *connector;
|
||||
struct drm_encoder *encoder;
|
||||
|
@ -707,10 +707,9 @@ void psb_intel_lvds_init(struct drm_device *dev,
|
|||
return;
|
||||
}
|
||||
|
||||
psb_intel_connector =
|
||||
kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
|
||||
if (!psb_intel_connector) {
|
||||
dev_err(dev->dev, "psb_intel_connector allocation error\n");
|
||||
gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
|
||||
if (!gma_connector) {
|
||||
dev_err(dev->dev, "gma_connector allocation error\n");
|
||||
goto failed_encoder;
|
||||
}
|
||||
|
||||
|
@ -722,7 +721,7 @@ void psb_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;
|
||||
drm_connector_init(dev, connector,
|
||||
&psb_intel_lvds_connector_funcs,
|
||||
|
@ -732,7 +731,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
|
|||
&psb_intel_lvds_enc_funcs,
|
||||
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, &psb_intel_lvds_helper_funcs);
|
||||
|
@ -848,7 +847,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
|
|||
drm_encoder_cleanup(encoder);
|
||||
drm_connector_cleanup(connector);
|
||||
failed_connector:
|
||||
kfree(psb_intel_connector);
|
||||
kfree(gma_connector);
|
||||
failed_encoder:
|
||||
kfree(psb_intel_encoder);
|
||||
}
|
||||
|
|
|
@ -140,7 +140,7 @@ struct psb_intel_sdvo {
|
|||
};
|
||||
|
||||
struct psb_intel_sdvo_connector {
|
||||
struct psb_intel_connector base;
|
||||
struct gma_connector base;
|
||||
|
||||
/* Mark the type of connector */
|
||||
uint16_t output_flag;
|
||||
|
@ -206,7 +206,7 @@ static struct psb_intel_sdvo *intel_attached_sdvo(struct drm_connector *connecto
|
|||
|
||||
static struct psb_intel_sdvo_connector *to_psb_intel_sdvo_connector(struct drm_connector *connector)
|
||||
{
|
||||
return container_of(to_psb_intel_connector(connector), struct psb_intel_sdvo_connector, base);
|
||||
return container_of(to_gma_connector(connector), struct psb_intel_sdvo_connector, base);
|
||||
}
|
||||
|
||||
static bool
|
||||
|
@ -2074,7 +2074,7 @@ psb_intel_sdvo_dvi_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
|
|||
{
|
||||
struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
|
||||
struct drm_connector *connector;
|
||||
struct psb_intel_connector *intel_connector;
|
||||
struct gma_connector *intel_connector;
|
||||
struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
|
||||
|
||||
psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
|
||||
|
@ -2114,7 +2114,7 @@ psb_intel_sdvo_tv_init(struct psb_intel_sdvo *psb_intel_sdvo, int type)
|
|||
{
|
||||
struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
|
||||
struct drm_connector *connector;
|
||||
struct psb_intel_connector *intel_connector;
|
||||
struct gma_connector *intel_connector;
|
||||
struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
|
||||
|
||||
psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
|
||||
|
@ -2153,7 +2153,7 @@ psb_intel_sdvo_analog_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
|
|||
{
|
||||
struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
|
||||
struct drm_connector *connector;
|
||||
struct psb_intel_connector *intel_connector;
|
||||
struct gma_connector *intel_connector;
|
||||
struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
|
||||
|
||||
psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
|
||||
|
@ -2187,7 +2187,7 @@ psb_intel_sdvo_lvds_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
|
|||
{
|
||||
struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
|
||||
struct drm_connector *connector;
|
||||
struct psb_intel_connector *intel_connector;
|
||||
struct gma_connector *intel_connector;
|
||||
struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
|
||||
|
||||
psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
|
||||
|
|
Loading…
Reference in a new issue