Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260068
b: refs/heads/master
c: 3a970ac
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 15, 2011
1 parent 85bbe14 commit 1d9e3f8
Show file tree
Hide file tree
Showing 11 changed files with 846 additions and 79 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3caa89e933646263cb4efedd5660dba00a107b51
refs/heads/master: 3a970ac1b14cf1a49076d69369aa75a23d4ad2db
1 change: 1 addition & 0 deletions trunk/drivers/staging/gma500/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ psb_gfx-$(CONFIG_DRM_PSB_MFLD) += mdfld_device.o \
mdfld_dsi_dpi.o \
mdfld_dsi_output.o \
mdfld_dsi_dbi.o \
mdfld_dsi_dbi_dpu.o \
mdfld_intel_display.o

obj-$(CONFIG_DRM_PSB) += psb_gfx.o
19 changes: 4 additions & 15 deletions trunk/drivers/staging/gma500/mdfld_dsi_dbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ void mdfld_dsi_dbi_enter_dsr(struct mdfld_dsi_dbi_output *dbi_output, int pipe)
}
}

#ifndef CONFIG_MDFLD_DSI_DPU
static void mdfld_dbi_output_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,
int pipe)
{
Expand Down Expand Up @@ -562,7 +561,6 @@ void mdfld_dbi_dsr_exit(struct drm_device *dev)
dev_priv->dbi_dsr_info = NULL;
}
}
#endif

void mdfld_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config,
int pipe)
Expand Down Expand Up @@ -648,12 +646,8 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev,
struct drm_encoder *encoder = NULL;
struct drm_display_mode *fixed_mode = NULL;
struct psb_gtt *pg = dev_priv ? (&dev_priv->gtt) : NULL;

#ifdef CONFIG_MDFLD_DSI_DPU
struct mdfld_dbi_dpu_info *dpu_info = dev_priv ? (dev_priv->dbi_dpu_info) : NULL;
#else
struct mdfld_dbi_dsr_info *dsr_info = dev_priv ? (dev_priv->dbi_dsr_info) : NULL;
#endif
u32 data = 0;
int pipe;
int ret;
Expand Down Expand Up @@ -742,28 +736,23 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev,
dbi_output->first_boot = true;
dbi_output->mode_flags = MODE_SETTING_IN_ENCODER;

#ifdef CONFIG_MDFLD_DSI_DPU
/* Add this output to dpu_info */
if (dsi_connector->status == connector_status_connected) {
/* Add this output to dpu_info if in DPU mode */
if (dpu_info && dsi_connector->status == connector_status_connected) {
if (dsi_connector->pipe == 0)
dpu_info->dbi_outputs[0] = dbi_output;
else
dpu_info->dbi_outputs[1] = dbi_output;

dpu_info->dbi_output_num++;
}

#else /*CONFIG_MDFLD_DSI_DPU*/
if (dsi_connector->status == connector_status_connected) {
/* Add this output to dsr_info */
} else if (dsi_connector->status == connector_status_connected) {
/* Add this output to dsr_info if not */
if (dsi_connector->pipe == 0)
dsr_info->dbi_outputs[0] = dbi_output;
else
dsr_info->dbi_outputs[1] = dbi_output;

dsr_info->dbi_output_num++;
}
#endif
return &dbi_output->base;
out_err1:
kfree(dbi_output);
Expand Down
Loading

0 comments on commit 1d9e3f8

Please sign in to comment.