Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next

First -misc pull for 4.11:
- drm_mm rework + lots of selftests (Chris Wilson)
- new connector_list locking+iterators
- plenty of kerneldoc updates
- format handling rework from Ville
- atomic helper changes from Maarten for better plane corner-case handling
  in drivers, plus the i915 legacy cursor patch that needs this
- bridge cleanup from Laurent
- plus plenty of small stuff all over
- also contains a merge of the 4.10 docs tree so that we could apply the
  dma-buf kerneldoc patches

It's a lot more than usual, but due to the merge window blackout it also
covers about 4 weeks, so all in line again on a per-week basis. The more
annoying part with no pull request for 4 weeks is managing cross-tree
work. The -intel pull request I'll follow up with does conflict quite a
bit with -misc here. Longer-term (if drm-misc keeps growing) a
drm-next-queued to accept pull request for the next merge window during
this time might be useful.

I'd also like to backmerge -rc2+this into drm-intel next week, we have
quite a pile of patches waiting for the stuff in here.

* tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc: (126 commits)
  drm: Add kerneldoc markup for new @scan parameters in drm_mm
  drm/mm: Document locking rules
  drm: Use drm_mm_insert_node_in_range_generic() for everyone
  drm: Apply range restriction after color adjustment when allocation
  drm: Wrap drm_mm_node.hole_follows
  drm: Apply tight eviction scanning to color_adjust
  drm: Simplify drm_mm scan-list manipulation
  drm: Optimise power-of-two alignments in drm_mm_scan_add_block()
  drm: Compute tight evictions for drm_mm_scan
  drm: Fix application of color vs range restriction when scanning drm_mm
  drm: Unconditionally do the range check in drm_mm_scan_add_block()
  drm: Rename prev_node to hole in drm_mm_scan_add_block()
  drm: Fix O= out-of-tree builds for selftests
  drm: Extract struct drm_mm_scan from struct drm_mm
  drm: Add asserts to catch overflow in drm_mm_init() and drm_mm_init_scan()
  drm: Simplify drm_mm_clean()
  drm: Detect overflow in drm_mm_reserve_node()
  drm: Fix kerneldoc for drm_mm_scan_remove_block()
  drm: Promote drm_mm alignment to u64
  drm: kselftest for drm_mm and restricted color eviction
  ...

4 files changed, 15 insertions, 8 deletions

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 908011d2c8f5..6f3b6f50cf52 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -28,6 +28,7 @@
 #ifndef __AST_DRV_H__
 #define __AST_DRV_H__
 
+#include <drm/drm_encoder.h>
 #include <drm/drm_fb_helper.h>
 
 #include <drm/ttm/ttm_bo_api.h>
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index d6f5ec64c667..b085140fae95 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -49,7 +49,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
         struct drm_gem_object *obj;
         struct ast_bo *bo;
         int src_offset, dst_offset;
-        int bpp = (afbdev->afb.base.bits_per_pixel + 7)/8;
+        int bpp = afbdev->afb.base.format->cpp[0];
         int ret = -EBUSY;
         bool unmap = false;
         bool store_for_later = false;
@@ -237,7 +237,7 @@ static int astfb_create(struct drm_fb_helper *helper,
         info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
         info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
-        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
+        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
         drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height);
 
         info->screen_base = sysram;
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index f75c6421db62..dcdd59d505bd 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -314,7 +314,7 @@ int ast_framebuffer_init(struct drm_device *dev,
 {
         int ret;
 
-        drm_helper_mode_fill_fb_struct(&ast_fb->base, mode_cmd);
+        drm_helper_mode_fill_fb_struct(dev, &ast_fb->base, mode_cmd);
         ast_fb->obj = obj;
         ret = drm_framebuffer_init(dev, &ast_fb->base, &ast_fb_funcs);
         if (ret) {
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index e26c98f51eb4..606cb40f6c7c 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -79,12 +79,13 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
                                     struct ast_vbios_mode_info *vbios_mode)
 {
         struct ast_private *ast = crtc->dev->dev_private;
+        const struct drm_framebuffer *fb = crtc->primary->fb;
         u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;
         u32 hborder, vborder;
         bool check_sync;
         struct ast_vbios_enhtable *best = NULL;
 
-        switch (crtc->primary->fb->bits_per_pixel) {
+        switch (fb->format->cpp[0] * 8) {
         case 8:
                 vbios_mode->std_table = &vbios_stdtable[VGAModeIndex];
                 color_index = VGAModeIndex - 1;
@@ -207,7 +208,8 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
                 ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0x00);
                 if (vbios_mode->enh_table->flags & NewModeInfo) {
                         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x91, 0xa8);
-                        ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92, crtc->primary->fb->bits_per_pixel);
+                        ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x92,
+                                          fb->format->cpp[0] * 8);
                         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x93, adjusted_mode->clock / 1000);
                         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x94, adjusted_mode->crtc_hdisplay);
                         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x95, adjusted_mode->crtc_hdisplay >> 8);
@@ -369,10 +371,11 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
 static void ast_set_offset_reg(struct drm_crtc *crtc)
 {
         struct ast_private *ast = crtc->dev->dev_private;
+        const struct drm_framebuffer *fb = crtc->primary->fb;
 
         u16 offset;
 
-        offset = crtc->primary->fb->pitches[0] >> 3;
+        offset = fb->pitches[0] >> 3;
         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0x13, (offset & 0xff));
         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xb0, (offset >> 8) & 0x3f);
 }
@@ -395,9 +398,10 @@ static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
                              struct ast_vbios_mode_info *vbios_mode)
 {
         struct ast_private *ast = crtc->dev->dev_private;
+        const struct drm_framebuffer *fb = crtc->primary->fb;
         u8 jregA0 = 0, jregA3 = 0, jregA8 = 0;
 
-        switch (crtc->primary->fb->bits_per_pixel) {
+        switch (fb->format->cpp[0] * 8) {
         case 8:
                 jregA0 = 0x70;
                 jregA3 = 0x01;
@@ -452,7 +456,9 @@ static void ast_set_sync_reg(struct drm_device *dev, struct drm_display_mode *mo
 static bool ast_set_dac_reg(struct drm_crtc *crtc, struct drm_display_mode *mode,
                      struct ast_vbios_mode_info *vbios_mode)
 {
-        switch (crtc->primary->fb->bits_per_pixel) {
+        const struct drm_framebuffer *fb = crtc->primary->fb;
+
+        switch (fb->format->cpp[0] * 8) {
         case 8:
                 break;
         default: