Commit 8c1a765b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.1:

UAPI Changes:

Cross-subsystem Changes:
  - Turn dma-buf fence sequence numbers into 64 bit numbers

Core Changes:
  - Move to a common helper for the DP MST hotplug for radeon, i915 and
    amdgpu
  - i2c improvements for drm_dp_mst
  - Removal of drm_syncobj_cb
  - Introduction of an helper to create and attach the TV margin properties

Driver Changes:
  - Improve cache flushes for v3d
  - Reflection support for vc4
  - HDMI overscan support for vc4
  - Add implicit fencing support for rockchip and sun4i
  - Switch to generic fbdev emulation for virtio

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

[airlied: applied amdgpu merge fixup]
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190107180333.amklwycudbsub3s5@flea
parents bfeffd15 1c95f662

Documentation/gpu/todo.rst

+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ KMS cleanups 


Some of these date from the very introduction of KMS in 2008 ...



- drm_mode_config.crtc_idr is misnamed, since it contains all KMS object. Should

  be renamed to drm_mode_config.object_idr.



- drm_display_mode doesn't need to be derived from drm_mode_object. That's

  leftovers from older (never merged into upstream) KMS designs where modes

  where set using their ID, including support to add/remove modes.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4873,6 +4873,7 @@ DRM DRIVER FOR QXL VIRTUAL GPU 
M:	Dave Airlie <airlied@redhat.com>

M:	Gerd Hoffmann <kraxel@redhat.com>

L:	virtualization@lists.linux-foundation.org

L:	spice-devel@lists.freedesktop.org

T:	git git://anongit.freedesktop.org/drm/drm-misc

S:	Maintained

F:	drivers/gpu/drm/qxl/
@@ -4986,7 +4987,6 @@ F: Documentation/devicetree/bindings/display/atmel/ 
T:	git git://anongit.freedesktop.org/drm/drm-misc



DRM DRIVERS FOR BRIDGE CHIPS

M:	Archit Taneja <architt@codeaurora.org>

M:	Andrzej Hajda <a.hajda@samsung.com>

R:	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>

S:	Maintained

drivers/dma-buf/dma-buf.c

+1 −11
Original line number Diff line number Diff line
@@ -1093,17 +1093,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) 
	return 0;

}



static int dma_buf_debug_open(struct inode *inode, struct file *file)

{

	return single_open(file, dma_buf_debug_show, NULL);

}



static const struct file_operations dma_buf_debug_fops = {

	.open           = dma_buf_debug_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

	.release        = single_release,

};

DEFINE_SHOW_ATTRIBUTE(dma_buf_debug);



static struct dentry *dma_buf_debugfs_dir;

drivers/dma-buf/dma-fence.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ EXPORT_SYMBOL(dma_fence_wait_any_timeout); 
 */

void

dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops,

	       spinlock_t *lock, u64 context, unsigned seqno)

	       spinlock_t *lock, u64 context, u64 seqno)

{

	BUG_ON(!lock);

	BUG_ON(!ops || !ops->get_driver_name || !ops->get_timeline_name);

drivers/dma-buf/sw_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static bool timeline_fence_enable_signaling(struct dma_fence *fence) 
static void timeline_fence_value_str(struct dma_fence *fence,

				    char *str, int size)

{

	snprintf(str, size, "%d", fence->seqno);

	snprintf(str, size, "%lld", fence->seqno);

}



static void timeline_fence_timeline_value_str(struct dma_fence *fence,

CRA Git | Maintained and supported by SUSTech CRA and CCSE