gma500: Fix DPU build
PATCH 1/2 gma500: Fix DPU build
From: Alan Cox <[email protected]>
Fix up the merge build
Signed-off-by Alan Cox <[email protected]>
---
drivers/staging/gma500/mdfld_dsi_dbi.h | 6 ++++++ drivers/staging/gma500/mdfld_dsi_dbi_dpu.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/staging/gma500/mdfld_dsi_dbi.h +6 -0
@@ -69,6 +69,12 @@ struct mdfld_dsi_dbi_output {bool dbi_panel_on;bool first_boot;struct panel_funcs *p_funcs; + +/* DPU */ +u32 *dbi_cb_addr; +u32 dbi_cb_phy; +spinlock_t cb_lock; +u32 cb_write; };#define MDFLD_DSI_DBI_OUTPUT (dsi_encoder) \
drivers/staging/gma500/mdfld_dsi_dbi_dpu.c +5 -5
@@ -418,7 +418,7 @@ static int mdfld_dpu_update_pipe(struct mdfld_dsi_dbi_output *dbi_output,* added it so that text console could boot smoothly */ /* Clean pending flags on this pipe */ -if (!ret && dev_priv->b_dsr_enable) { +if (!ret && dev_priv->dsr_enable) { dpu_info->pending &= ~plane_mask;/* Reset overlay pipe damage rect */ mdfld_dpu_init_damage (dpu_info, pipe);
@@ -527,7 +527,7 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,if (!dbi_output)return 0 ; -/*if mode setting on-going, back off*/ +/* If mode setting on-going, back off */ if ((dbi_output->mode_flags &MODE_SETTING_ON_GOING ) || (psb_crtc && psb_crtc->mode_flags &MODE_SETTING_ON_GOING ))return -EAGAIN ;
@@ -542,7 +542,7 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output, reg_offset =MIPIC_REG_OFFSET ; } -if (!ospm_power_using_hw_begin (OSPM_DISPLAY_ISLAND , true)) +if (!gma_power_begin (dev, true))return -EAGAIN ;/* Enable DPLL */
@@ -585,9 +585,9 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,udelay (500 ); } -ospm_power_using_hw_end (OSPM_DISPLAY_ISLAND ); +gma_power_end (dev); -/*clean IN_DSR flag*/ +/* Clean IN_DSR flag */ dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR ;return 0 ;
PATCH 2/2 gma500: wire up the mrst i2c bus from chip_info
From: Alan Cox <[email protected]>
We did the groundwork earlier now we can use it
Signed-off-by Alan Cox <[email protected]>
---
drivers/staging/gma500/mrst_lvds.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-)
drivers/staging/gma500/mrst_lvds.c +3 -11
@@ -347,16 +347,10 @@ void mrst_lvds_init(struct drm_device *dev,* if closed, act like it's not there for now */ -/* This ifdef can go once the cpu ident stuff is cleaned up in arch */ -#if defined(CONFIG_X86_MRST ) -if (mrst_identify_cpu ()) - i2c_adap =i2c_get_adapter (2 ); - else /* Oaktrail uses I2C 1 */ -#endif - i2c_adap =i2c_get_adapter (1 ); + i2c_adap =i2c_get_adapter (dev_priv->ops->i2c_bus);if (i2c_adap ==NULL ) -printk (KERN_ALERT "No ddc adapter available!\n" ); +dev_err (dev->dev,"No ddc adapter available!\n" );/* * Attempt to get the fixed panel mode from DDC. Assume that the * preferred mode is the right one.
@@ -378,7 +372,6 @@ void mrst_lvds_init(struct drm_device *dev, } } } -/* * If we didn't get EDID, try geting panel timing * from configuration data
@@ -386,8 +379,7 @@ void mrst_lvds_init(struct drm_device *dev, mode_dev->panel_fixed_mode =mrst_lvds_get_configuration_mode (dev);if (mode_dev->panel_fixed_mode) { - mode_dev->panel_fixed_mode->type |= -DRM_MODE_TYPE_PREFERRED ; + mode_dev->panel_fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; goto out;/* FIXME: check for quirks */ }