diff options
author | Dave Airlie <airlied@redhat.com> | 2016-06-08 21:19:28 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-08 21:19:28 -0400 |
commit | 2cca45574007b4a77fa5f63ea45d664510cec22a (patch) | |
tree | dd32a0b2bea4f3cef900b15c6badc8dfde69ab69 /drivers/gpu/drm/drm_modes.c | |
parent | bb4cec0222f984d7ef282c06cc3644069db21bac (diff) | |
parent | e8395081636734da19778b0446d65588a06bc40d (diff) |
Merge tag 'topic/drm-misc-2016-06-07' of git://anongit.freedesktop.org/drm-intel into drm-next
As promised, piles of prep work all around:
- drm_atomic_state rework, prep for nonblocking commit helpers
- fence patches from Gustavo and Christian to prep for atomic fences and
some cool work in ttm/amdgpu from Christian
- drm event prep for both nonblocking commit and atomic fences
- Gustavo seems on a crusade against the non-kms-native version of the
vblank functions.
- prep work from Boris to nuke all the silly ->best_encoder
implementations we have (we really only need that for truly dynamic
cases like dvi-i vs dvi-d or dp mst selecting the right transcoder on
intel)
- prep work from Laurent to rework the format handling functions
- and few small things all over
* tag 'topic/drm-misc-2016-06-07' of git://anongit.freedesktop.org/drm-intel: (47 commits)
drm/dsi: Implement set tear scanline
drm/fb_cma_helper: Implement fb_mmap callback
drm/qxl: Remove useless drm_fb_get_bpp_depth() call
drm/ast: Remove useless drm_fb_get_bpp_depth() call
drm/atomic: Fix remaining places where !funcs->best_encoder is valid
drm/core: Change declaration for gamma_set.
Documentation: add fence-array to kernel DocBook
drm/shmobile: use drm_crtc_vblank_{get,put}()
drm/radeon: use drm_crtc_vblank_{get,put}()
drm/qxl: use drm_crtc_vblank_{get,put}()
drm/atmel: use drm_crtc_vblank_{get,put}()
drm/armada: use drm_crtc_vblank_{get,put}()
drm/amdgpu: use drm_crtc_vblank_{get,put}()
drm/virtio: use drm_crtc_send_vblank_event()
drm/udl: use drm_crtc_send_vblank_event()
drm/qxl: use drm_crtc_send_vblank_event()
drm/atmel: use drm_crtc_send_vblank_event()
drm/armada: use drm_crtc_send_vblank_event()
drm/doc: Switch to sphinx/rst fixed-width quoting
drm/doc: Drop kerneldoc for static functions in drm_irq.c
...
Diffstat (limited to 'drivers/gpu/drm/drm_modes.c')
-rw-r--r-- | drivers/gpu/drm/drm_modes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index e5e6f504d8cc..fc5040ae5f25 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -544,6 +544,7 @@ EXPORT_SYMBOL(drm_gtf_mode_complex); | |||
544 | * | 544 | * |
545 | * This function is to create the modeline based on the GTF algorithm. | 545 | * This function is to create the modeline based on the GTF algorithm. |
546 | * Generalized Timing Formula is derived from: | 546 | * Generalized Timing Formula is derived from: |
547 | * | ||
547 | * GTF Spreadsheet by Andy Morrish (1/5/97) | 548 | * GTF Spreadsheet by Andy Morrish (1/5/97) |
548 | * available at http://www.vesa.org | 549 | * available at http://www.vesa.org |
549 | * | 550 | * |
@@ -552,7 +553,8 @@ EXPORT_SYMBOL(drm_gtf_mode_complex); | |||
552 | * I also refer to the function of fb_get_mode in the file of | 553 | * I also refer to the function of fb_get_mode in the file of |
553 | * drivers/video/fbmon.c | 554 | * drivers/video/fbmon.c |
554 | * | 555 | * |
555 | * Standard GTF parameters: | 556 | * Standard GTF parameters:: |
557 | * | ||
556 | * M = 600 | 558 | * M = 600 |
557 | * C = 40 | 559 | * C = 40 |
558 | * K = 128 | 560 | * K = 128 |