Commit 15438ab0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-10-05' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

More drm-misc for 4.15:

Cross-subsystem Changes:
- bunch more simple outreachy patches (Meghana Madhyastha, Aishwarya
  Pant, Haneen Mohammed)
- Quite a pile of static checker/cocci/spelling fixups all over.
- Final driver patches+core cleanup of Noralf's new drm_gem_fb_create
  helper.

Core Changes:
- legacy DPMS docs improved
- add dri-devel m-l to fbdev to catch people who try to fix
  fbcon-on-kms bugs in the wrong place

Driver Changes:
- vc4: prep for dsi panels (Eric)

* tag 'drm-misc-next-2017-10-05' of git://anongit.freedesktop.org/git/drm-misc: (34 commits)
  drm: fix typo in drm_gem_get_pages() comment
  MAINTAINERS: Add dri-devel as a mailing list for anything fbdev
  drm/virtio: Replace instances of reference/unreference with get/put
  drm/fb-cma-helper: Remove unused functions
  drm/tve200: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb()
  drm/sun4i: Use drm_gem_fb_create()
  drm/shmobile: Use drm_gem_fb_create()
  drm/rcar-du: Use drm_gem_fb_create()
  drm/mxsfb: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb()
  drm/meson: Use drm_gem_fb_create()
  drm/hisilicon/kirin: Use drm_gem_fb_create()
  drm/fsl-dcu: Use drm_gem_fb_create()
  drm/tinydrm: Use drm_gem_framebuffer_helper
  drm: of: always initialize panel in drm_of_find_panel_or_bridge()
  drm/tve200: Check for IS_ERR instead of NULL in probe
  drm/tve200: make two functions static
  drm/armada: Remove unused #include <drmP.h>
  drm/rockchip: Rely on the default best_encoder() behavior
  drm/vc4: Set up the DSI host at pdev probe time, not component bind.
  drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math.
  ...
parents ebec44a2 5b9fbfff

Documentation/gpu/todo.rst

+10 −7
Original line number Diff line number Diff line
@@ -184,12 +184,6 @@ Contact: Sean Paul, Maintainer of the driver you plan to convert 
Core refactorings

=================



Use new IDR deletion interface to clean up drm_gem_handle_delete()

------------------------------------------------------------------



See the "This is gross" comment -- apparently the IDR system now can return an

error code instead of oopsing.



Clean up the DRM header mess

----------------------------
@@ -357,7 +351,16 @@ those drivers as simple as possible, so lots of room for refactoring: 
- backlight helpers, probably best to put them into a new drm_backlight.c.

  This is because drivers/video is de-facto unmaintained. We could also

  move drivers/video/backlight to drivers/gpu/backlight and take it all

  over within drm-misc, but that's more work.

  over within drm-misc, but that's more work. Backlight helpers require a fair

  bit of reworking and refactoring. A simple example is the enabling of a backlight.

  Tinydrm has helpers for this. It would be good if other drivers can also use the

  helper. However, there are various cases we need to consider i.e different

  drivers seem to have different ways of enabling/disabling a backlight.

  We also need to consider the backlight drivers (like gpio_backlight). The situation

  is further complicated by the fact that the backlight is tied to fbdev

  via fb_notifier_callback() which has complicated logic. For further details, refer

  to the following discussion thread:

  https://groups.google.com/forum/#!topic/outreachy-kernel/8rBe30lwtdA



- spi helpers, probably best put into spi core/helper code. Thierry said

  the spi maintainer is fast&reactive, so shouldn't be a big issue.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5461,6 +5461,7 @@ F: drivers/net/wan/sdla.c 


FRAMEBUFFER LAYER

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	dri-devel@lists.freedesktop.org

L:	linux-fbdev@vger.kernel.org

T:	git git://github.com/bzolnier/linux.git

Q:	http://patchwork.kernel.org/project/linux-fbdev/list/

drivers/dma-buf/dma-buf.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ EXPORT_SYMBOL_GPL(dma_buf_detach); 
struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,

					enum dma_data_direction direction)

{

	struct sg_table *sg_table = ERR_PTR(-EINVAL);

	struct sg_table *sg_table;



	might_sleep();

drivers/gpu/drm/armada/armada_510.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */

#include <linux/clk.h>

#include <linux/io.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include "armada_crtc.h"

#include "armada_drm.h"

drivers/gpu/drm/armada/armada_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/component.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_of.h>

#include "armada_crtc.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE