diff options
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_device.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_device.c | 12 | 
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c index eff039bf92d4..5971bc82b765 100644 --- a/drivers/gpu/drm/gma500/psb_device.c +++ b/drivers/gpu/drm/gma500/psb_device.c @@ -144,6 +144,10 @@ static int psb_backlight_init(struct drm_device *dev)  	psb_backlight_device->props.max_brightness = 100;  	backlight_update_status(psb_backlight_device);  	dev_priv->backlight_device = psb_backlight_device; + +	/* This must occur after the backlight is properly initialised */ +	psb_lid_timer_init(dev_priv); +  	return 0;  } @@ -354,13 +358,6 @@ static int psb_chip_setup(struct drm_device *dev)  	return 0;  } -/* Not exactly an erratum more an irritation */ -static void psb_chip_errata(struct drm_device *dev) -{ -	struct drm_psb_private *dev_priv = dev->dev_private; -	psb_lid_timer_init(dev_priv); -} -  static void psb_chip_teardown(struct drm_device *dev)  {  	struct drm_psb_private *dev_priv = dev->dev_private; @@ -379,7 +376,6 @@ const struct psb_ops psb_chip_ops = {  	.sgx_offset = PSB_SGX_OFFSET,  	.chip_setup = psb_chip_setup,  	.chip_teardown = psb_chip_teardown, -	.errata = psb_chip_errata,  	.crtc_helper = &psb_intel_helper_funcs,  	.crtc_funcs = &psb_intel_crtc_funcs,  | 
