diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-02-27 10:31:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-02-27 10:31:40 +1000 |
| commit | 21689a440bdc90650b7ee3803ec11cfabd21409e (patch) | |
| tree | afbb8ea213daee6d19134f5c2ba52a13ebba82e4 /drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | |
| parent | Merge tag 'drm-intel-fixes-2015-02-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes (diff) | |
| parent | drm: atmel-hlcdc: remove clock polarity from crtc driver (diff) | |
| download | linux-dev-21689a440bdc90650b7ee3803ec11cfabd21409e.tar.xz linux-dev-21689a440bdc90650b7ee3803ec11cfabd21409e.zip | |
Merge branch 'drm-atmel-hlcdc-fixes' of git://github.com/bbrezillon/linux-at91 into drm-fixes
minor atmel hclcdc fixes.
* 'drm-atmel-hlcdc-fixes' of git://github.com/bbrezillon/linux-at91:
drm: atmel-hlcdc: remove clock polarity from crtc driver
drm: atmel-hlcdc: remove useless pm_runtime_put_sync in probe
drm: atmel-hlcdc: reset layer A2Q and UPDATE bits when disabling it
Diffstat (limited to 'drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c')
| -rw-r--r-- | drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 7320a6c6613f..c1cb17493e0d 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -311,8 +311,6 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) pm_runtime_enable(dev->dev); - pm_runtime_put_sync(dev->dev); - ret = atmel_hlcdc_dc_modeset_init(dev); if (ret < 0) { dev_err(dev->dev, "failed to initialize mode setting\n"); |