diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | |
| parent | 8dd0eb3566711d81bfbe2b4421b33f0dd723cec4 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
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 01afeafe17b1..c4bb1f9f95c6 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | |||
| @@ -313,8 +313,6 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) | |||
| 313 | 313 | ||
| 314 | pm_runtime_enable(dev->dev); | 314 | pm_runtime_enable(dev->dev); |
| 315 | 315 | ||
| 316 | pm_runtime_put_sync(dev->dev); | ||
| 317 | |||
| 318 | ret = atmel_hlcdc_dc_modeset_init(dev); | 316 | ret = atmel_hlcdc_dc_modeset_init(dev); |
| 319 | if (ret < 0) { | 317 | if (ret < 0) { |
| 320 | dev_err(dev->dev, "failed to initialize mode setting\n"); | 318 | dev_err(dev->dev, "failed to initialize mode setting\n"); |