diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-15 17:35:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 19:05:08 +0200 |
| commit | f75c7538c5ee3bfd0ac50d20457e773c43858a75 (patch) | |
| tree | 09ab6972ed5511c967d7a7d970bd88be94d2fcb8 /drivers/staging/gma500 | |
| parent | 83c871ee2b60619d74d03eaf6f75a7d9c3cb0e45 (diff) | |
gma500: Use the mrst helpers and power control for mode commit
We want to hit the MM panel backlight when appropriate
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
| -rw-r--r-- | drivers/staging/gma500/mrst_lvds.c | 29 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_drv.h | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_lvds.c | 4 |
3 files changed, 29 insertions, 6 deletions
diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index 108f245553e6..25fde4cc910e 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -147,13 +147,38 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder, gma_power_end(dev); } +static void mrst_lvds_prepare(struct drm_encoder *encoder) +{ + struct drm_device *dev = encoder->dev; + struct psb_intel_output *output = enc_to_psb_intel_output(encoder); + + if (!gma_power_begin(dev, true)) + return; + + mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL); + mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL & + BACKLIGHT_DUTY_CYCLE_MASK); + mrst_lvds_set_power(dev, output, false); + gma_power_end(dev); +} + +static void mrst_lvds_commit(struct drm_encoder *encoder) +{ + struct drm_device *dev = encoder->dev; + struct psb_intel_output *output = enc_to_psb_intel_output(encoder); + + if (mode_dev->backlight_duty_cycle == 0) + mode_dev->backlight_duty_cycle = + psb_intel_lvds_get_max_backlight(dev); + mrst_lvds_set_power(dev, output, true); +} static const struct drm_encoder_helper_funcs mrst_lvds_helper_funcs = { .dpms = mrst_lvds_dpms, .mode_fixup = psb_intel_lvds_mode_fixup, - .prepare = psb_intel_lvds_prepare, + .prepare = mrst_intel_lvds_prepare, .mode_set = mrst_lvds_mode_set, - .commit = psb_intel_lvds_commit, + .commit = mrst_intel_lvds_commit, }; static struct drm_display_mode lvds_configuration_modes[] = { diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h index 829657b52ecb..194c64fb6c68 100644 --- a/drivers/staging/gma500/psb_drv.h +++ b/drivers/staging/gma500/psb_drv.h @@ -792,8 +792,6 @@ extern const struct drm_crtc_helper_funcs psb_intel_helper_funcs; extern const struct drm_crtc_funcs psb_intel_crtc_funcs; /* psb_intel_lvds.c */ -extern void psb_intel_lvds_prepare(struct drm_encoder *encoder); -extern void psb_intel_lvds_commit(struct drm_encoder *encoder); extern const struct drm_connector_helper_funcs psb_intel_lvds_connector_helper_funcs; extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs; diff --git a/drivers/staging/gma500/psb_intel_lvds.c b/drivers/staging/gma500/psb_intel_lvds.c index 53803b25cadb..c6436da60732 100644 --- a/drivers/staging/gma500/psb_intel_lvds.c +++ b/drivers/staging/gma500/psb_intel_lvds.c @@ -432,7 +432,7 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, return true; } -void psb_intel_lvds_prepare(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); @@ -450,7 +450,7 @@ void psb_intel_lvds_prepare(struct drm_encoder *encoder) gma_power_end(dev); } -void psb_intel_lvds_commit(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); |