]> git.baikalelectronics.ru Git - kernel.git/commit
drm: Drop drm_helper_probe_single_connector_modes_nomerge()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 3 Dec 2015 21:14:14 +0000 (23:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 11 Dec 2015 08:32:53 +0000 (09:32 +0100)
commitf31236e1261f77c9ffad4a29674da417976e53ce
treeeaeb52f1411ee8e789064dd0637cc175a205eb35
parent98ba0dffb7167bfb9a18a596099b4cf8f5667386
drm: Drop drm_helper_probe_single_connector_modes_nomerge()

Now that the mode type bit merge logic is fixed to only merge
between new probed modes, hopefully we can eliminat the special
case for qxl and virtio. That is make the merge the mode type
bits from all matching new probed modes, just like every other
driver.

qxl and virtio got excluded from the merging in
commit 02564bdd8981 ("drm: copy mode type in drm_mode_connector_list_update()")
commit 16bafec27180 ("Revert "drm: copy mode type in drm_mode_connector_list_update()"")
commit c5105b95cf57 ("drm: try harder to avoid regression when merging mode bits")

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Resolve conflicts with doc updates.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_modes.c
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/qxl/qxl_display.c
drivers/gpu/drm/virtio/virtgpu_display.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
include/drm/drm_crtc_helper.h
include/drm/drm_modes.h