diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-03-22 05:36:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-22 05:36:14 +1000 |
| commit | 0c5286a8222e1d178f57115401673ac34126a510 (patch) | |
| tree | 498f529809b9c0a3c75c8b8bb1098ed4f71233db /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | 78230c46ec0a91dd4256c9e54934b3c7095a7ee3 (diff) | |
| parent | 1c7095d2836baafd84e596dd34ba1a1293a4faa9 (diff) | |
Merge tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.17:
Cross-subsystem Changes:
dt-bindings: Add emtrion vendor prefix (Jan)
Core Changes:
drm_print: More object size reductions (Joe)
Driver Changes:
vc4: Fix alpha blending on bottom plane (Stefan)
panel: Add Raydium RM68200 panel support (Phillipe)
panel: Add AUO G104SN02 V2 panel support (Christoph)
panel: Add KEO TX31D200VM0BAA panel support (Jagan)
vga_switcheroo: Use device link to bookkeep HDA runtime pm (Lukas)
rockchip: More CrOS kevin patches trickling in (various
sun4i: Add A80 support (Chen-Yu)
sun4i: Add YUV plane support (Maxime)
meson: Multiple (mostly error-path) fixups (Christophe/Wei)
Cc: Stefan Schake <stschake@gmail.com>
Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: jan.tuerk@emtrion.com
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: Jagan Teki <jagannadh.teki@gmail.com>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Joe Perches <joe@perches.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Wei Yongjun <weiyongjun1@huawei.com>
* tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc: (70 commits)
drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put()
drm/meson: Fix potential NULL dereference in meson_drv_bind_master()
drm/sun4i: backend: Support YUV planes
drm/sun4i: backend: Check that we only have a single YUV plane
drm/sun4i: Add driver support for A80 display pipeline
drm/sun4i: Add compatible strings for the A80 display pipeline
drm/sun4i: Add support for A80 TCONs
drm/sun4i: Add DT binding for Detail Enhancement Unit in Allwinner A80 SoC
drm/sun4i: Add compatible strings for A80 TCONs
drm: Reduce object size of DRM_DEV_<LEVEL> uses
drm/doc: Put all driver docs into a separate chapter
drm: dma_bufs: Fixed checkpatch issues
drm: remove drm_mode_object_{un/reference} aliases
drm: Add PSR version 3 macro
drm/vc4_validate: Remove VLA usage
drm: Make drm_mode_vrefresh() a bit more accurate
drm: Nuke the useless 'ret' variable from drm_mode_convert_umode()
drm/i915: Use drm_color_lut_size()
drm/i915: Remove the blob->data casts
drm: Introduce drm_color_lut_size()
...
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index e6709362994a..2337d4bfd85c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -738,7 +738,6 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; drm_kms_helper_poll_disable(drm_dev); - vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_OFF); ret = amdgpu_device_suspend(drm_dev, false, false); pci_save_state(pdev); @@ -775,7 +774,6 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) ret = amdgpu_device_resume(drm_dev, false, false); drm_kms_helper_poll_enable(drm_dev); - vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_ON); drm_dev->switch_power_state = DRM_SWITCH_POWER_ON; return 0; } |