gma500: Initial support for our encoder and connector structs
Subsystems (3)
PATCH 1/9 gma500: Initial support for our encoder and connector structs
From: Patrik Jakobsson <[email protected]>
First step towards adding i915 alike encoder and connector abstractions. This will make life easier when adding i915 output code into our driver. It also removes the old psb_intel_output struct.
---
drivers/gpu/drm/gma500/psb_intel_display.c | 7 +++++ drivers/gpu/drm/gma500/psb_intel_drv.h | 40 ++++++++++++++++++---------- 2 files changed, 32 insertions(+), 15 deletions(-)
drivers/gpu/drm/gma500/psb_intel_display.c +7 -0
@@ -1429,3 +1429,10 @@ struct drm_encoder *psb_intel_best_encoder(struct drm_connector *connector)return &psb_intel_output->enc; } +void psb_intel_connector_attach_encoder (struct psb_intel_connector *connector, +struct psb_intel_encoder *encoder) +{ + connector->encoder = encoder; +drm_mode_connector_attach_encoder (&connector->base, + &encoder->base); +}
drivers/gpu/drm/gma500/psb_intel_drv.h +25 -15
@@ -93,19 +93,19 @@ struct psb_intel_i2c_chan {u8 slave_addr; }; -struct psb_intel_output { -struct drm_connector base; - -struct drm_encoder enc; +struct psb_intel_encoder { +struct drm_encoder base;int type; +bool needs_tv_clock; +void (*hot_plug)(struct psb_intel_encoder *); +int crtc_mask; +int clone_mask; +void *dev_priv;/* For sdvo_priv, lvds_priv, etc... */ +}; -struct psb_intel_i2c_chan *i2c_bus;/* for control functions */ -struct psb_intel_i2c_chan *ddc_bus;/* for DDC only stuff */ -bool load_detect_temp; -void *dev_priv; - -struct psb_intel_mode_device *mode_dev; -struct i2c_adapter *hdmi_i2c_adapter;/* for control functions */ +struct psb_intel_connector { +struct drm_connector base; +struct psb_intel_encoder *encoder; };struct psb_intel_crtc_state {
@@ -156,10 +156,10 @@ struct psb_intel_crtc {#define to_psb_intel_crtc (x) \ container_of(x, struct psb_intel_crtc, base) -#define to_psb_intel_output (x) \ - container_of(x, struct psb_intel_output, base) -#define enc_to_psb_intel_output (x) \ - container_of(x, struct psb_intel_output, enc) +#define to_psb_intel_connector (x) \ + container_of(x, struct psb_intel_connector, base) +#define to_psb_intel_encoder (x) \ + container_of(x, struct psb_intel_encoder, base)#define to_psb_intel_framebuffer (x) \ container_of(x, struct psb_intel_framebuffer, base)
@@ -190,6 +190,16 @@ extern void psb_intel_crtc_load_lut(struct drm_crtc *crtc);extern void psb_intel_encoder_prepare (struct drm_encoder *encoder);extern void psb_intel_encoder_commit (struct drm_encoder *encoder); +static inline struct psb_intel_encoder *psb_intel_attached_encoder ( +struct drm_connector *connector) +{ +return to_psb_intel_connector (connector)->encoder; +} + +extern void psb_intel_connector_attach_encoder ( +struct psb_intel_connector *connector, +struct psb_intel_encoder *encoder); +extern struct drm_encoder *psb_intel_best_encoder (struct drm_connector *connector);
PATCH 2/9 gma500: Remove psb_intel_output from ddc_probe and ddc_get_modes
From: Patrik Jakobsson <[email protected]>
---
drivers/gpu/drm/gma500/psb_intel_drv.h | 5 +++-- drivers/gpu/drm/gma500/psb_intel_modes.c | 16 +++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/gma500/psb_intel_drv.h +3 -2
@@ -166,8 +166,9 @@ struct psb_intel_crtc {struct psb_intel_i2c_chan *psb_intel_i2c_create (struct drm_device *dev,const u32 reg,const char *name);void psb_intel_i2c_destroy (struct psb_intel_i2c_chan *chan); -int psb_intel_ddc_get_modes (struct psb_intel_output *psb_intel_output); -extern bool psb_intel_ddc_probe (struct psb_intel_output *psb_intel_output); +int psb_intel_ddc_get_modes (struct drm_connector *connector, +struct i2c_adapter *adapter); +extern bool psb_intel_ddc_probe (struct i2c_adapter *adapter);extern void psb_intel_crtc_init (struct drm_device *dev,int pipe,struct psb_intel_mode_device *mode_dev);
drivers/gpu/drm/gma500/psb_intel_modes.c +7 -9
@@ -26,7 +26,7 @@* psb_intel_ddc_probe * */ -bool psb_intel_ddc_probe (struct psb_intel_output *psb_intel_output) +bool psb_intel_ddc_probe (struct i2c_adapter *adapter) {u8 out_buf[] = {0x0 ,0x0 };u8 buf[2 ];
@@ -46,7 +46,7 @@ bool psb_intel_ddc_probe(struct psb_intel_output *psb_intel_output) } }; - ret =i2c_transfer (&psb_intel_output->ddc_bus->adapter, msgs,2 ); + ret =i2c_transfer (adapter, msgs,2 );if (ret ==2 )return true;
@@ -59,18 +59,16 @@ bool psb_intel_ddc_probe(struct psb_intel_output *psb_intel_output)* * Fetch the EDID information from @connector using the DDC bus. */ -int psb_intel_ddc_get_modes (struct psb_intel_output *psb_intel_output) +int psb_intel_ddc_get_modes (struct drm_connector *connector, +struct i2c_adapter *adapter) {struct edid *edid;int ret =0 ; - edid = -drm_get_edid (&psb_intel_output->base, - &psb_intel_output->ddc_bus->adapter); + edid =drm_get_edid (connector, adapter);if (edid) { -drm_mode_connector_update_edid_property (&psb_intel_output-> - base, edid); - ret =drm_add_edid_modes (&psb_intel_output->base, edid); +drm_mode_connector_update_edid_property (connector, edid); + ret =drm_add_edid_modes (connector, edid);kfree (edid); }return ret;
PATCH 3/9 gma500: Fix encoder type checking for connectors
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
Fix cases where we need to know what encoder type is behind a given connector.
---
drivers/gpu/drm/gma500/framebuffer.c | 8 ++++---- drivers/gpu/drm/gma500/psb_drv.c | 6 +++--- drivers/gpu/drm/gma500/psb_intel_display.c | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/gma500/framebuffer.c +4 -4
@@ -747,13 +747,13 @@ static void psb_setup_outputs(struct drm_device *dev)list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); -struct drm_encoder *encoder = &psb_intel_output->enc; +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); +struct drm_encoder *encoder = &psb_intel_encoder->base;int crtc_mask =0 , clone_mask =0 ;/* valid crtcs */ -switch (psb_intel_output->type) { +switch (psb_intel_encoder->type) {case INTEL_OUTPUT_ANALOG : crtc_mask = (1 <<0 ); clone_mask = (1 <<INTEL_OUTPUT_ANALOG );
drivers/gpu/drm/gma500/psb_drv.c +3 -3
@@ -276,7 +276,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)int ret = -ENOMEM ;uint32_t tt_pages;struct drm_connector *connector; -struct psb_intel_output *psb_intel_output; +struct psb_intel_encoder *psb_intel_encoder; dev_priv =kzalloc (sizeof (*dev_priv),GFP_KERNEL );if (dev_priv ==NULL )
@@ -390,9 +390,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)/* Only add backlight support if we have LVDS output */ list_for_each_entry (connector, &dev->mode_config.connector_list, head) { - psb_intel_output =to_psb_intel_output (connector); + psb_intel_encoder =psb_intel_attached_encoder (connector); -switch (psb_intel_output->type) { +switch (psb_intel_encoder->type) {case INTEL_OUTPUT_LVDS :case INTEL_OUTPUT_MIPI : ret =gma_backlight_init (dev);
drivers/gpu/drm/gma500/psb_intel_display.c +12 -12
@@ -214,9 +214,9 @@ bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type)list_for_each_entry (l_entry, &mode_config->connector_list, head) {if (l_entry->encoder && l_entry->encoder->crtc == crtc) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (l_entry); -if (psb_intel_output->type == type) +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (l_entry); +if (psb_intel_encoder->type == type)return true; } }
@@ -615,14 +615,14 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, }list_for_each_entry (connector, &mode_config->connector_list, head) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector);if (!connector->encoder || connector->encoder->crtc != crtc)continue ; -switch (psb_intel_output->type) { +switch (psb_intel_encoder->type) {case INTEL_OUTPUT_LVDS : is_lvds = true;break ;
@@ -1402,9 +1402,9 @@ int psb_intel_connector_clones(struct drm_device *dev, int type_mask)list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); -if (type_mask & (1 << psb_intel_output->type)) +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); +if (type_mask & (1 << psb_intel_encoder->type)) index_mask |= (1 << entry); entry++; }
@@ -1423,10 +1423,10 @@ void psb_intel_modeset_cleanup(struct drm_device *dev)*/ struct drm_encoder *psb_intel_best_encoder (struct drm_connector *connector) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); -return &psb_intel_output->enc; +return &psb_intel_encoder->base; } void psb_intel_connector_attach_encoder(struct psb_intel_connector *connector,
PATCH 4/9 gma500: Convert PSB LVDS to new output handling
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
LVDS for PSB now uses psb_intel_encoder and psb_intel_connectors instead of psb_intel_output. i2c_bus and ddc_bus are moved to lvds_priv. There was also a pointer to mode_dev (for no obvious reason) that we now get directly from dev_priv.
---
drivers/gpu/drm/gma500/psb_intel_lvds.c | 152 +++++++++++++++++-------------- 1 files changed, 83 insertions(+), 69 deletions(-)
drivers/gpu/drm/gma500/psb_intel_lvds.c +83 -69
@@ -59,6 +59,9 @@ struct psb_intel_lvds_priv {uint32_t savePFIT_CONTROL;uint32_t savePFIT_PGM_RATIOS;uint32_t saveBLC_PWM_CTL; + +struct psb_intel_i2c_chan *i2c_bus; +struct psb_intel_i2c_chan *ddc_bus; };
@@ -214,9 +217,10 @@ static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level)/* * Sets the power state for the panel. */ -static void psb_intel_lvds_set_power (struct drm_device *dev, -struct psb_intel_output *output,bool on) +static void psb_intel_lvds_set_power (struct drm_device *dev,bool on) { +struct drm_psb_private *dev_priv = dev->dev_private; +struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;u32 pp_status;if (!gma_power_begin (dev, true)) {
@@ -232,8 +236,7 @@ static void psb_intel_lvds_set_power(struct drm_device *dev, }while ((pp_status &PP_ON ) ==0 );psb_intel_lvds_set_backlight (dev, - output-> - mode_dev->backlight_duty_cycle); + mode_dev->backlight_duty_cycle); }else {psb_intel_lvds_set_backlight (dev,0 );
@@ -250,12 +253,11 @@ static void psb_intel_lvds_set_power(struct drm_device *dev,static void psb_intel_lvds_encoder_dpms (struct drm_encoder *encoder,int mode) {struct drm_device *dev = encoder->dev; -struct psb_intel_output *output =enc_to_psb_intel_output (encoder);if (mode ==DRM_MODE_DPMS_ON ) -psb_intel_lvds_set_power (dev, output, true); +psb_intel_lvds_set_power (dev, true);else -psb_intel_lvds_set_power (dev, output, false); +psb_intel_lvds_set_power (dev, false);/* XXX: We never power down the LVDS pairs. */ }
@@ -265,10 +267,10 @@ static void psb_intel_lvds_save(struct drm_connector *connector)struct drm_device *dev = connector->dev;struct drm_psb_private *dev_priv = (struct drm_psb_private *)dev->dev_private; -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector);struct psb_intel_lvds_priv *lvds_priv = - (struct psb_intel_lvds_priv *)psb_intel_output->dev_priv; + (struct psb_intel_lvds_priv *)psb_intel_encoder->dev_priv; lvds_priv->savePP_ON =REG_READ (LVDSPP_ON ); lvds_priv->savePP_OFF =REG_READ (LVDSPP_OFF );
@@ -305,10 +307,10 @@ static void psb_intel_lvds_restore(struct drm_connector *connector) {struct drm_device *dev = connector->dev;u32 pp_status; -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector);struct psb_intel_lvds_priv *lvds_priv = - (struct psb_intel_lvds_priv *)psb_intel_output->dev_priv; + (struct psb_intel_lvds_priv *)psb_intel_encoder->dev_priv; dev_dbg(dev->dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n", lvds_priv->savePP_ON,
@@ -346,13 +348,14 @@ static void psb_intel_lvds_restore(struct drm_connector *connector)int psb_intel_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct drm_psb_private *dev_priv = connector->dev->dev_private; +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector);struct drm_display_mode *fixed_mode = - psb_intel_output->mode_dev->panel_fixed_mode; + dev_priv->mode_dev.panel_fixed_mode; -if (psb_intel_output->type ==INTEL_OUTPUT_MIPI2 ) - fixed_mode = psb_intel_output->mode_dev->panel_fixed_mode2; +if (psb_intel_encoder->type ==INTEL_OUTPUT_MIPI2 ) + fixed_mode = dev_priv->mode_dev.panel_fixed_mode2;/* just in case */ if (mode->flags &DRM_MODE_FLAG_DBLSCAN )
@@ -375,17 +378,17 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct psb_intel_mode_device *mode_dev = -enc_to_psb_intel_output (encoder)->mode_dev; struct drm_device *dev = encoder->dev; +struct drm_psb_private *dev_priv = dev->dev_private; +struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;struct psb_intel_crtc *psb_intel_crtc =to_psb_intel_crtc (encoder->crtc);struct drm_encoder *tmp_encoder;struct drm_display_mode *panel_fixed_mode = mode_dev->panel_fixed_mode; -struct psb_intel_output *psb_intel_output = -enc_to_psb_intel_output (encoder); +struct psb_intel_encoder *psb_intel_encoder = +to_psb_intel_encoder (encoder); -if (psb_intel_output->type ==INTEL_OUTPUT_MIPI2 ) +if (psb_intel_encoder->type ==INTEL_OUTPUT_MIPI2 ) panel_fixed_mode = mode_dev->panel_fixed_mode2;/* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */
@@ -440,8 +443,8 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,static void psb_intel_lvds_prepare (struct drm_encoder *encoder) {struct drm_device *dev = encoder->dev; -struct psb_intel_output *output =enc_to_psb_intel_output (encoder); -struct psb_intel_mode_device *mode_dev = output->mode_dev; +struct drm_psb_private *dev_priv = dev->dev_private; +struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;if (!gma_power_begin (dev, true))return ;
@@ -450,7 +453,7 @@ static void psb_intel_lvds_prepare(struct drm_encoder *encoder) mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &BACKLIGHT_DUTY_CYCLE_MASK ); -psb_intel_lvds_set_power (dev, output, false); +psb_intel_lvds_set_power (dev, false);gma_power_end (dev); }
@@ -458,14 +461,14 @@ static void psb_intel_lvds_prepare(struct drm_encoder *encoder)static void psb_intel_lvds_commit (struct drm_encoder *encoder) {struct drm_device *dev = encoder->dev; -struct psb_intel_output *output =enc_to_psb_intel_output (encoder); -struct psb_intel_mode_device *mode_dev = output->mode_dev; +struct drm_psb_private *dev_priv = dev->dev_private; +struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;if (mode_dev->backlight_duty_cycle ==0 ) mode_dev->backlight_duty_cycle =psb_intel_lvds_get_max_backlight (dev); -psb_intel_lvds_set_power (dev, output, true); +psb_intel_lvds_set_power (dev, true); } static void psb_intel_lvds_mode_set(struct drm_encoder *encoder,
@@ -520,14 +523,15 @@ static enum drm_connector_status psb_intel_lvds_detect(struct drm_connectorstatic int psb_intel_lvds_get_modes (struct drm_connector *connector) {struct drm_device *dev = connector->dev; -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); -struct psb_intel_mode_device *mode_dev = - psb_intel_output->mode_dev; +struct drm_psb_private *dev_priv = dev->dev_private; +struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev; +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); +struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder->dev_priv;int ret =0 ;if (!IS_MRST (dev)) - ret =psb_intel_ddc_get_modes (psb_intel_output); + ret =psb_intel_ddc_get_modes (connector, &lvds_priv->i2c_bus->adapter);if (ret)return ret;
@@ -560,11 +564,12 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector)*/ void psb_intel_lvds_destroy (struct drm_connector *connector) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); +struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder->dev_priv; -if (psb_intel_output->ddc_bus) -psb_intel_i2c_destroy (psb_intel_output->ddc_bus); +if (lvds_priv->ddc_bus) +psb_intel_i2c_destroy (lvds_priv->ddc_bus);drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (connector);
@@ -693,9 +698,10 @@ const struct drm_encoder_funcs psb_intel_lvds_enc_funcs = {* modes we can display on the LVDS panel (if present). */ void psb_intel_lvds_init (struct drm_device *dev, -struct psb_intel_mode_device *mode_dev) +struct psb_intel_mode_device *mode_dev) { -struct psb_intel_output *psb_intel_output; +struct psb_intel_encoder *psb_intel_encoder; +struct psb_intel_connector *psb_intel_connector;struct psb_intel_lvds_priv *lvds_priv;struct drm_connector *connector;struct drm_encoder *encoder;
@@ -705,33 +711,43 @@ void psb_intel_lvds_init(struct drm_device *dev,u32 lvds;int pipe; - psb_intel_output =kzalloc (sizeof (struct psb_intel_output ),GFP_KERNEL ); -if (!psb_intel_output) + psb_intel_encoder = +kzalloc (sizeof (struct psb_intel_encoder ),GFP_KERNEL ); + +if (!psb_intel_encoder) { +dev_err (dev->dev,"psb_intel_encoder allocation error\n" );return ; + } + + psb_intel_connector = +kzalloc (sizeof (struct psb_intel_connector ),GFP_KERNEL ); + +if (!psb_intel_connector) { +kfree (psb_intel_encoder); +dev_err (dev->dev,"psb_intel_connector allocation error\n" ); + } lvds_priv =kzalloc (sizeof (struct psb_intel_lvds_priv ),GFP_KERNEL );if (!lvds_priv) { -kfree (psb_intel_output);dev_err (dev->dev,"LVDS private allocation error\n" ); -return ; + goto failed_connector; } - psb_intel_output->dev_priv = lvds_priv; - psb_intel_output->mode_dev = mode_dev; + psb_intel_encoder->dev_priv = lvds_priv; - connector = &psb_intel_output->base; - encoder = &psb_intel_output->enc; -drm_connector_init (dev, &psb_intel_output->base, + connector = &psb_intel_connector->base; + encoder = &psb_intel_encoder->base; +drm_connector_init (dev, connector, &psb_intel_lvds_connector_funcs,DRM_MODE_CONNECTOR_LVDS ); -drm_encoder_init (dev, &psb_intel_output->enc, +drm_encoder_init (dev, encoder, &psb_intel_lvds_enc_funcs,DRM_MODE_ENCODER_LVDS ); -drm_mode_connector_attach_encoder (&psb_intel_output->base, - &psb_intel_output->enc); - psb_intel_output->type =INTEL_OUTPUT_LVDS ; +psb_intel_connector_attach_encoder (psb_intel_connector, + psb_intel_encoder); + psb_intel_encoder->type =INTEL_OUTPUT_LVDS ;drm_encoder_helper_add (encoder, &psb_intel_lvds_helper_funcs); drm_connector_helper_add(connector,
@@ -752,16 +768,14 @@ void psb_intel_lvds_init(struct drm_device *dev,* Set up I2C bus * FIXME: distroy i2c_bus when exit */ - psb_intel_output->i2c_bus =psb_intel_i2c_create (dev, -GPIOB , -"LVDSBLC_B" ); -if (!psb_intel_output->i2c_bus) { + lvds_priv->i2c_bus =psb_intel_i2c_create (dev,GPIOB ,"LVDSBLC_B" ); +if (!lvds_priv->i2c_bus) {dev_printk (KERN_ERR , &dev->pdev->dev,"I2C bus registration failed.\n" ); goto failed_blc_i2c; } - psb_intel_output->i2c_bus->slave_addr =0x2C ; - dev_priv->lvds_i2c_bus = psb_intel_output->i2c_bus; + lvds_priv->i2c_bus->slave_addr =0x2C ; + dev_priv->lvds_i2c_bus = lvds_priv->i2c_bus;/* * LVDS discovery:
@@ -774,10 +788,8 @@ void psb_intel_lvds_init(struct drm_device *dev,*/ /* Set up the DDC bus. */ - psb_intel_output->ddc_bus =psb_intel_i2c_create (dev, -GPIOC , -"LVDSDDC_C" ); -if (!psb_intel_output->ddc_bus) { + lvds_priv->ddc_bus =psb_intel_i2c_create (dev,GPIOC ,"LVDSDDC_C" ); +if (!lvds_priv->ddc_bus) {dev_printk (KERN_ERR , &dev->pdev->dev,"DDC bus registration " "failed.\n" ); goto failed_ddc;
@@ -787,7 +799,7 @@ void psb_intel_lvds_init(struct drm_device *dev,* Attempt to get the fixed panel mode from DDC. Assume that the * preferred mode is the right one. */ -psb_intel_ddc_get_modes (psb_intel_output); +psb_intel_ddc_get_modes (connector, &lvds_priv->ddc_bus->adapter);list_for_each_entry (scan, &connector->probed_modes, head) {if (scan->type &DRM_MODE_TYPE_PREFERRED ) { mode_dev->panel_fixed_mode =
@@ -841,14 +853,16 @@ out:return ; failed_find: -if (psb_intel_output->ddc_bus) -psb_intel_i2c_destroy (psb_intel_output->ddc_bus); +if (lvds_priv->ddc_bus) +psb_intel_i2c_destroy (lvds_priv->ddc_bus); failed_ddc: -if (psb_intel_output->i2c_bus) -psb_intel_i2c_destroy (psb_intel_output->i2c_bus); +if (lvds_priv->i2c_bus) +psb_intel_i2c_destroy (lvds_priv->i2c_bus); failed_blc_i2c:drm_encoder_cleanup (encoder);drm_connector_cleanup (connector); -kfree (connector); +failed_connector: +if (psb_intel_connector) +kfree (psb_intel_connector); }
PATCH 5/9 gma500: Add support for Intel GMBUS
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
Before we integrate the new SDVO code we need GMBUS support
---
drivers/gpu/drm/gma500/Makefile | 1 drivers/gpu/drm/gma500/intel_gmbus.c | 493 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/gma500/psb_device.c | 7 drivers/gpu/drm/gma500/psb_drv.h | 9 + drivers/gpu/drm/gma500/psb_intel_drv.h | 6 drivers/gpu/drm/gma500/psb_intel_reg.h | 72 +++++ 6 files changed, 588 insertions(+), 0 deletions(-) create mode 100644 drivers/gpu/drm/gma500/intel_gmbus.c
drivers/gpu/drm/gma500/Makefile +1 -0
@@ -11,6 +11,7 @@ gma500_gfx-y += gem_glue.o \ gtt.o \ intel_bios.o \ intel_i2c.o \ + intel_gmbus.o \ intel_opregion.o \ mmu.o \ power.o \
drivers/gpu/drm/gma500/intel_gmbus.c new file +493 -0
493 lines not on this page · raw message
drivers/gpu/drm/gma500/psb_device.c +7 -0
@@ -290,11 +290,17 @@ static void psb_get_core_freq(struct drm_device *dev)static int psb_chip_setup (struct drm_device *dev) {psb_get_core_freq (dev); +gma_intel_setup_gmbus (dev);gma_intel_opregion_init (dev);psb_intel_init_bios (dev);return 0 ; } +static void psb_chip_teardown (struct drm_device *dev) +{ +gma_intel_teardown_gmbus (dev); +} +const struct psb_ops psb_chip_ops = { .name ="Poulsbo" , .accel_2d =1 ,
@@ -302,6 +308,7 @@ const struct psb_ops psb_chip_ops = { .crtcs = 2, .sgx_offset = PSB_SGX_OFFSET, .chip_setup = psb_chip_setup, + .chip_teardown = psb_chip_teardown, .crtc_helper = &psb_intel_helper_funcs, .crtc_funcs = &psb_intel_crtc_funcs,
drivers/gpu/drm/gma500/psb_drv.h +9 -0
@@ -260,6 +260,12 @@ struct psb_intel_opregion {int enabled; }; +struct intel_gmbus { +struct i2c_adapter adapter; +struct i2c_adapter *force_bit; +u32 reg0; +}; +struct psb_ops ;#define PSB_NUM_PIPE 3
@@ -336,6 +342,9 @@ struct drm_psb_private {/* PCI revision ID for B0:D2:F0 */ uint8_t platform_rev_id; +/* gmbus */ +struct intel_gmbus *gmbus; +/* * LVDS info */
drivers/gpu/drm/gma500/psb_intel_drv.h +6 -0
@@ -235,5 +235,11 @@ extern int psb_intel_lvds_set_property(struct drm_connector *connector,extern void psb_intel_lvds_destroy (struct drm_connector *connector);extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs; +/* intel_gmbus.c */ +extern void gma_intel_i2c_reset (struct drm_device *dev); +extern int gma_intel_setup_gmbus (struct drm_device *dev); +extern void gma_intel_gmbus_set_speed (struct i2c_adapter *adapter,int speed); +extern void gma_intel_gmbus_force_bit (struct i2c_adapter *adapter,bool force_bit); +extern void gma_intel_teardown_gmbus (struct drm_device *dev);#endif /* __INTEL_DRV_H__ */
drivers/gpu/drm/gma500/psb_intel_reg.h +72 -0
78 lines not on this page · raw message
PATCH 6/9 gma500: Replace SDVO code with slightly modified version from i915
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
Our current SDVO implementation is not working properly, so replace it with a modified version of the i915. Further testing and debugging is needed to make sure we can handle the different SDVO setups and wiring.
---
drivers/gpu/drm/gma500/psb_drv.h | 19 drivers/gpu/drm/gma500/psb_intel_display.c | 8 drivers/gpu/drm/gma500/psb_intel_drv.h | 41 drivers/gpu/drm/gma500/psb_intel_reg.h | 2 drivers/gpu/drm/gma500/psb_intel_sdvo.c | 3060 +++++++++++++++++++------- drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h | 591 ++++- 6 files changed, 2745 insertions(+), 976 deletions(-)
drivers/gpu/drm/gma500/psb_drv.h +19 -0
@@ -260,6 +260,16 @@ struct psb_intel_opregion {int enabled; }; +struct sdvo_device_mapping { +u8 initialized; +u8 dvo_port; +u8 slave_addr; +u8 dvo_wiring; +u8 i2c_pin; +u8 i2c_speed; +u8 ddc_pin; +}; +struct intel_gmbus {struct i2c_adapter adapter;struct i2c_adapter *force_bit;
@@ -345,6 +355,15 @@ struct drm_psb_private {/* gmbus */ struct intel_gmbus *gmbus; +/* Used by SDVO */ +int crt_ddc_pin; +/* FIXME: The mappings should be parsed from bios but for now we can +pretend there are no mappings available */ +struct sdvo_device_mapping sdvo_mappings[2 ]; +u32 hotplug_supported_mask; +struct drm_property *broadcast_rgb_property; +struct drm_property *force_audio_property; +/* * LVDS info */
drivers/gpu/drm/gma500/psb_intel_display.c +8 -0
@@ -552,6 +552,14 @@ void psb_intel_encoder_commit(struct drm_encoder *encoder) encoder_funcs->dpms (encoder,DRM_MODE_DPMS_ON ); } +void psb_intel_encoder_destroy (struct drm_encoder *encoder) +{ +struct psb_intel_encoder *intel_encoder =to_psb_intel_encoder (encoder); + +drm_encoder_cleanup (encoder); +kfree (intel_encoder); +} +static bool psb_intel_crtc_mode_fixup (struct drm_crtc *crtc,struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode)
drivers/gpu/drm/gma500/psb_intel_drv.h +40 -1
65 lines not on this page · raw message
drivers/gpu/drm/gma500/psb_intel_reg.h +2 -0
@@ -376,6 +376,8 @@#define SDVO_PIPE_B_SELECT (1 << 30)#define SDVO_STALL_SELECT (1 << 29)#define SDVO_INTERRUPT_ENABLE (1 << 26) +#define SDVO_COLOR_RANGE_16_235 (1 << 8) +#define SDVO_AUDIO_ENABLE (1 << 6)/** * 915G/GM SDVO pixel multiplier.
drivers/gpu/drm/gma500/psb_intel_sdvo.c +2188 -872
2,882 lines not on this page · raw message
drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h +488 -103
591 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 7/9 gma500: Convert Cedarview to work with new output handling
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
Replace psb_intel_output with psb_intel_encoder and psb_intel_connector. Things will need to be cleaned up and tested so consider this an initial patch for Cedarview.
---
drivers/gpu/drm/gma500/cdv_intel_crt.c | 47 ++++++----- drivers/gpu/drm/gma500/cdv_intel_display.c | 14 ++- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 112 ++++++++++++++++----------- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 117 +++++++++++++++------------- drivers/gpu/drm/gma500/psb_drv.h | 2 drivers/gpu/drm/gma500/psb_intel_drv.h | 5 + 6 files changed, 169 insertions(+), 128 deletions(-)
drivers/gpu/drm/gma500/cdv_intel_crt.c +27 -20
@@ -204,9 +204,10 @@ static enum drm_connector_status cdv_intel_crt_detect(static void cdv_intel_crt_destroy (struct drm_connector *connector) { -struct psb_intel_output *intel_output =to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); -psb_intel_i2c_destroy (intel_output->ddc_bus); +psb_intel_i2c_destroy (psb_intel_encoder->ddc_bus);drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (connector);
@@ -214,9 +215,9 @@ static void cdv_intel_crt_destroy(struct drm_connector *connector)static int cdv_intel_crt_get_modes (struct drm_connector *connector) { -struct psb_intel_output *intel_output = -to_psb_intel_output (connector); -return psb_intel_ddc_get_modes (intel_output); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector); +return psb_intel_ddc_get_modes (connector, &psb_intel_encoder->ddc_bus->adapter); } static int cdv_intel_crt_set_property(struct drm_connector *connector,
@@ -266,27 +267,31 @@ void cdv_intel_crt_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev) { -struct psb_intel_output *psb_intel_output; +struct psb_intel_connector *psb_intel_connector; +struct psb_intel_encoder *psb_intel_encoder;struct drm_connector *connector;struct drm_encoder *encoder;u32 i2c_reg; - psb_intel_output =kzalloc (sizeof (struct psb_intel_output ),GFP_KERNEL ); -if (!psb_intel_output) + psb_intel_encoder =kzalloc (sizeof (struct psb_intel_encoder ),GFP_KERNEL ); +if (!psb_intel_encoder)return ; - psb_intel_output->mode_dev = mode_dev; - connector = &psb_intel_output->base; + psb_intel_connector =kzalloc (sizeof (struct psb_intel_connector ),GFP_KERNEL ); +if (!psb_intel_connector) + goto failed_connector; + + connector = &psb_intel_connector->base;drm_connector_init (dev, connector, &cdv_intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA ); - encoder = &psb_intel_output->enc; + encoder = &psb_intel_encoder->base;drm_encoder_init (dev, encoder, &cdv_intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ); -drm_mode_connector_attach_encoder (&psb_intel_output->base, - &psb_intel_output->enc); +psb_intel_connector_attach_encoder (psb_intel_connector, + psb_intel_encoder);/* Set up the DDC bus. */ i2c_reg =GPIOA ;
@@ -295,15 +300,15 @@ void cdv_intel_crt_init(struct drm_device *dev,if (dev_priv->crt_ddc_bus != 0) i2c_reg = dev_priv->crt_ddc_bus; }*/ - psb_intel_output->ddc_bus =psb_intel_i2c_create (dev, - i2c_reg,"CRTDDC_A" ); -if (!psb_intel_output->ddc_bus) { + psb_intel_encoder->ddc_bus =psb_intel_i2c_create (dev, + i2c_reg,"CRTDDC_A" ); +if (!psb_intel_encoder->ddc_bus) {dev_printk (KERN_ERR , &dev->pdev->dev,"DDC bus registration " "failed.\n" ); goto failed_ddc; } - psb_intel_output->type =INTEL_OUTPUT_ANALOG ; + psb_intel_encoder->type =INTEL_OUTPUT_ANALOG ;/* psb_intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT); psb_intel_output->crtc_mask = (1 << 0) | (1 << 1);
@@ -319,8 +324,10 @@ void cdv_intel_crt_init(struct drm_device *dev,return ; failed_ddc: -drm_encoder_cleanup (&psb_intel_output->enc); -drm_connector_cleanup (&psb_intel_output->base); -kfree (psb_intel_output); +drm_encoder_cleanup (&psb_intel_encoder->base); +drm_connector_cleanup (&psb_intel_connector->base); +kfree (psb_intel_connector); +failed_connector: +kfree (psb_intel_encoder);return ; }
drivers/gpu/drm/gma500/cdv_intel_display.c +7 -7
@@ -342,7 +342,7 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc, }/* -* Returns whether any output on the specified pipe is of the specified type +* Returns whether any encoder on the specified pipe is of the specified type */ bool cdv_intel_pipe_has_type (struct drm_crtc *crtc,int type) {
@@ -352,9 +352,9 @@ bool cdv_intel_pipe_has_type(struct drm_crtc *crtc, int type)list_for_each_entry (l_entry, &mode_config->connector_list, head) {if (l_entry->encoder && l_entry->encoder->crtc == crtc) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (l_entry); -if (psb_intel_output->type == type) +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (l_entry); +if (psb_intel_encoder->type == type)return true; } }
@@ -752,14 +752,14 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,struct drm_connector *connector;list_for_each_entry (connector, &mode_config->connector_list, head) { -struct psb_intel_output *psb_intel_output = -to_psb_intel_output (connector); +struct psb_intel_encoder *psb_intel_encoder = +psb_intel_attached_encoder (connector);if (!connector->encoder || connector->encoder->crtc != crtc)continue ; -switch (psb_intel_output->type) { +switch (psb_intel_encoder->type) {case INTEL_OUTPUT_LVDS : is_lvds = true;break ;
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +65 -47
208 lines not on this page · raw message
drivers/gpu/drm/gma500/cdv_intel_lvds.c +64 -53
252 lines not on this page · raw message
drivers/gpu/drm/gma500/psb_drv.h +1 -1
@@ -374,7 +374,7 @@ struct drm_psb_private {struct drm_display_mode *sdvo_lvds_vbt_mode;struct bdb_lvds_backlight *lvds_bl;/* LVDS backlight info from VBT */ -struct psb_intel_i2c_chan *lvds_i2c_bus; +struct psb_intel_i2c_chan *lvds_i2c_bus;/* FIXME: Remove this? */ /* Feature bits from the VBIOS */ unsigned int int_tv_support:1;
drivers/gpu/drm/gma500/psb_intel_drv.h +5 -0
@@ -139,6 +139,11 @@ struct psb_intel_encoder {int crtc_mask;int clone_mask;void *dev_priv;/* For sdvo_priv, lvds_priv, etc... */ + +/* FIXME: Either make SDVO and LVDS store it's i2c here or give CDV it's +own set of output privates */ +struct psb_intel_i2c_chan *i2c_bus; +struct psb_intel_i2c_chan *ddc_bus; };struct psb_intel_connector {
PATCH 8/9 gma500: Convert Oaktrail to work with new output handling
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
Replace psb_intel_output with psb_intel_encoder and psb_intel_connector
---
drivers/gpu/drm/gma500/oaktrail_crtc.c | 18 ++++--- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 29 +++++++----- drivers/gpu/drm/gma500/oaktrail_lvds.c | 79 +++++++++++++++++++++----------- 3 files changed, 79 insertions(+), 47 deletions(-)
drivers/gpu/drm/gma500/oaktrail_crtc.c +9 -9
@@ -313,9 +313,9 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,bool is_crt = false, is_lvds = false, is_tv = false;bool is_mipi = false;struct drm_mode_config *mode_config = &dev->mode_config; -struct psb_intel_output *psb_intel_output =NULL ; +struct psb_intel_encoder *psb_intel_encoder =NULL ;uint64_t scalingType =DRM_MODE_SCALE_FULLSCREEN ; -struct drm_encoder *encoder; +struct drm_connector *connector;if (!gma_power_begin (dev, true))return 0 ;
@@ -327,13 +327,13 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc, adjusted_mode, sizeof(struct drm_display_mode)); -list_for_each_entry (encoder, &mode_config->encoder_list, head) { - -if (encoder->crtc != crtc) +list_for_each_entry (connector, &mode_config->connector_list, head) { +if (!connector->encoder || connector->encoder->crtc != crtc)continue ; - psb_intel_output =enc_to_psb_intel_output (encoder); -switch (psb_intel_output->type) { + psb_intel_encoder =psb_intel_attached_encoder (connector); + +switch (psb_intel_encoder->type) {case INTEL_OUTPUT_LVDS : is_lvds = true;break ;
@@ -363,8 +363,8 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc, ((mode->crtc_hdisplay -1 ) <<16 ) | (mode->crtc_vdisplay - 1)); -if (psb_intel_output) -drm_connector_property_get_value (&psb_intel_output->base, +if (psb_intel_encoder) +drm_connector_property_get_value (connector, dev->mode_config.scaling_mode_property, &scalingType);if (scalingType ==DRM_MODE_SCALE_NO_SCALE ) {
drivers/gpu/drm/gma500/oaktrail_hdmi.c +18 -11
@@ -643,29 +643,33 @@ static const struct drm_encoder_funcs oaktrail_hdmi_enc_funcs = {void oaktrail_hdmi_init (struct drm_device *dev,struct psb_intel_mode_device *mode_dev) { -struct psb_intel_output *psb_intel_output; +struct psb_intel_encoder *psb_intel_encoder; +struct psb_intel_connector *psb_intel_connector;struct drm_connector *connector;struct drm_encoder *encoder; - psb_intel_output =kzalloc (sizeof (struct psb_intel_output ),GFP_KERNEL ); -if (!psb_intel_output) + psb_intel_encoder =kzalloc (sizeof (struct psb_intel_encoder ),GFP_KERNEL ); +if (!psb_intel_encoder)return ; - psb_intel_output->mode_dev = mode_dev; - connector = &psb_intel_output->base; - encoder = &psb_intel_output->enc; -drm_connector_init (dev, &psb_intel_output->base, + psb_intel_connector =kzalloc (sizeof (struct psb_intel_connector ),GFP_KERNEL ); +if (!psb_intel_connector) + goto failed_connector; + + connector = &psb_intel_connector->base; + encoder = &psb_intel_encoder->base; +drm_connector_init (dev, connector, &oaktrail_hdmi_connector_funcs,DRM_MODE_CONNECTOR_DVID ); -drm_encoder_init (dev, &psb_intel_output->enc, +drm_encoder_init (dev, encoder, &oaktrail_hdmi_enc_funcs,DRM_MODE_ENCODER_TMDS ); -drm_mode_connector_attach_encoder (&psb_intel_output->base, - &psb_intel_output->enc); +psb_intel_connector_attach_encoder (psb_intel_connector, + psb_intel_encoder); - psb_intel_output->type =INTEL_OUTPUT_HDMI ; + psb_intel_encoder->type =INTEL_OUTPUT_HDMI ;drm_encoder_helper_add (encoder, &oaktrail_hdmi_helper_funcs);drm_connector_helper_add (connector, &oaktrail_hdmi_connector_helper_funcs);
@@ -675,6 +679,9 @@ void oaktrail_hdmi_init(struct drm_device *dev,drm_sysfs_connector_add (connector);return ; + +failed_connector: +kfree (psb_intel_encoder); }static DEFINE_PCI_DEVICE_TABLE (hdmi_ids) = {
drivers/gpu/drm/gma500/oaktrail_lvds.c +52 -27
161 lines not on this page · raw message
PATCH 9/9 gma500: SDVO DDC bus guessing isn't working so hardcode it instead
In reply to Alan CoxFrom: Patrik Jakobsson <[email protected]>
We currently don't have support for parsing SDVO mappings from BIOS so we're guessing the bus switch parameter. This isn't working so hardcode it to a configuration known to work on most poulsbo hardware.
---
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/gpu/drm/gma500/psb_intel_sdvo.c +8 -0
@@ -1876,6 +1876,13 @@ static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {static void psb_intel_sdvo_guess_ddc_bus (struct psb_intel_sdvo *sdvo) { +/* FIXME: At the moment, ddc_bus = 2 is the only thing that works. +* We need to figure out if this is true for all available poulsbo +* hardware, or if we need to fiddle with the guessing code above. +* The problem might go away if we can parse sdvo mappings from bios */ + sdvo->ddc_bus =2 ; + +#if 0 uint16_t mask =0 ;unsigned int num_bits;
@@ -1907,6 +1914,7 @@ psb_intel_sdvo_guess_ddc_bus(struct psb_intel_sdvo *sdvo)/* Corresponds to SDVO_CONTROL_BUS_DDCx */ sdvo->ddc_bus =1 << num_bits; +#endif }/**
Quoted 3 lines
Signed-off-by Patrik Jakobsson <[email protected]>Signed-off-by Alan Cox <[email protected]>
Series applied to drm-next.
Dave.