diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-03 14:38:52 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-03 14:42:49 -0500 |
| commit | 2c1c55cb75a9c72f9726fabb8c3607947711a8df (patch) | |
| tree | fa835b954149545970eaa256107876d9a24bbf28 /drivers/gpu/drm/amd | |
| parent | ae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff) | |
| parent | 2f51be0945b9e0b9baafe47289c802be6d4c7980 (diff) | |
Merge tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Cross-subsystem Changes:
- device tree doc for the Mitsubishi AA070MC01 and Tianma TM070RVHG71
panels (Lukasz Majewski) and for a 2nd endpoint on stm32 (Philippe Cornu)
Core Changes:
The most important changes are:
- Add drm_driver .last_close and .output_poll_changed helpers to reduce
fbdev emulation footprint in drivers (Noralf)
- Fix plane clipping in core and for vmwgfx (Ville)
Then we have a bunch of of improvement for print and debug such as the
addition of a framebuffer debugfs file. ELD connector, HDMI and
improvements. And a bunch of misc improvements, clean ups and style
changes and doc updates
[airlied: drop eld bits from amdgpu_dm]
Driver Changes:
- sii8620: filter unsupported modes and add DVI mode support (Maciej Purski)
- rockchip: analogix_dp: Remove unnecessary init code (Jeffy Chen)
- virtio, cirrus: add fb create_handle support to enable screenshots(Lepton Wu)
- virtio: replace reference/unreference with get/put (Aastha Gupta)
- vc4, gma500: Convert timers to use timer_setup() (Kees Cook)
- vc4: Reject HDMI modes with too high of clocks (Eric)
- vc4: Add support for more pixel formats (Dave Stevenson)
- stm: dsi: Rename driver name to "stm32-display-dsi" (Philippe Cornu)
- stm: ltdc: add a 2nd endpoint (Philippe Cornu)
- via: use monotonic time for VIA_WAIT_IRQ (Arnd Bergmann)
* tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc: (96 commits)
drm/bridge: tc358767: add copyright lines
MAINTAINERS: change maintainer for Rockchip drm drivers
drm/vblank: Fix vblank timestamp debugs
drm/via: use monotonic time for VIA_WAIT_IRQ
dma-buf: Fix ifnullfree.cocci warnings
drm/printer: Add drm_vprintf()
drm/edid: Allow HDMI infoframe without VIC or S3D
video/hdmi: Allow "empty" HDMI infoframes
dma-buf/fence: Fix lock inversion within dma-fence-array
drm/sti: Handle return value of platform_get_irq_byname
drm/vc4: Add support for NV21 and NV61.
drm/vc4: Use .pixel_order instead of custom .flip_cbcr
drm/vc4: Add support for DRM_FORMAT_RGB888 and DRM_FORMAT_BGR888
drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c
drm: Check crtc_state->enable rather than crtc->enabled in drm_plane_helper_check_state()
drm/vmwgfx: Try to fix plane clipping
drm/vmwgfx: Use drm_plane_helper_check_state()
drm/vmwgfx: Remove bogus crtc coords vs fb size check
gpu: gma500: remove unneeded DRIVER_LICENSE #define
drm: don't link DP aux i2c adapter to the hardware device node
...
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index df9cbc78e168..8ca3783f2deb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
| @@ -358,7 +358,6 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) | |||
| 358 | if (amdgpu_connector->edid) { | 358 | if (amdgpu_connector->edid) { |
| 359 | drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid); | 359 | drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid); |
| 360 | ret = drm_add_edid_modes(connector, amdgpu_connector->edid); | 360 | ret = drm_add_edid_modes(connector, amdgpu_connector->edid); |
| 361 | drm_edid_to_eld(connector, amdgpu_connector->edid); | ||
| 362 | return ret; | 361 | return ret; |
| 363 | } | 362 | } |
| 364 | drm_mode_connector_update_edid_property(connector, NULL); | 363 | drm_mode_connector_update_edid_property(connector, NULL); |
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f71fe6d2ddda..c324c3b76fac 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |||
| @@ -3333,8 +3333,6 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector, | |||
| 3333 | amdgpu_dm_connector->num_modes = | 3333 | amdgpu_dm_connector->num_modes = |
| 3334 | drm_add_edid_modes(connector, edid); | 3334 | drm_add_edid_modes(connector, edid); |
| 3335 | 3335 | ||
| 3336 | drm_edid_to_eld(connector, edid); | ||
| 3337 | |||
| 3338 | amdgpu_dm_get_native_mode(connector); | 3336 | amdgpu_dm_get_native_mode(connector); |
| 3339 | } else { | 3337 | } else { |
| 3340 | amdgpu_dm_connector->num_modes = 0; | 3338 | amdgpu_dm_connector->num_modes = 0; |
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index f8efb98b1fa7..707928b88448 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | |||
| @@ -177,12 +177,7 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = { | |||
| 177 | static int dm_connector_update_modes(struct drm_connector *connector, | 177 | static int dm_connector_update_modes(struct drm_connector *connector, |
| 178 | struct edid *edid) | 178 | struct edid *edid) |
| 179 | { | 179 | { |
| 180 | int ret; | 180 | return drm_add_edid_modes(connector, edid); |
| 181 | |||
| 182 | ret = drm_add_edid_modes(connector, edid); | ||
| 183 | drm_edid_to_eld(connector, edid); | ||
| 184 | |||
| 185 | return ret; | ||
| 186 | } | 181 | } |
| 187 | 182 | ||
| 188 | static int dm_dp_mst_get_modes(struct drm_connector *connector) | 183 | static int dm_dp_mst_get_modes(struct drm_connector *connector) |
