Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b146270 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2017-04-20' of... 

Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next

drm-misc-next-fixes-2017-04-20

Core changes:
- Maintain sti via drm-misc (Vincent)
- Rename dma_buf_ops->kmap_* to avoid naming collision (Logan)

Driver changes:
- Fix UHD displays on stih407 (Vincent)
- Fix uninitialized var return in atmel-hlcdc (Dan)

* tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc:
  dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
  drm: atmel-hlcdc: Uninitialized return in atmel_hlcdc_create_outputs()
  drm/sti: fix GDP size to support up to UHD resolution
  MAINTAINERS: add drm/sti driver into drm-misc
parents cb2e77c1 f9b67f00

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4418,7 +4418,7 @@ DRM DRIVERS FOR STI 
M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>

M:	Vincent Abriou <vincent.abriou@st.com>

L:	dri-devel@lists.freedesktop.org

T:	git http://git.linaro.org/people/benjamin.gaignard/kernel.git

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

S:	Maintained

F:	drivers/gpu/drm/sti

F:	Documentation/devicetree/bindings/display/st,stih4xx.txt

drivers/dma-buf/dma-buf.c

+8 −8
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) 
			  || !exp_info->ops->map_dma_buf

			  || !exp_info->ops->unmap_dma_buf

			  || !exp_info->ops->release

			  || !exp_info->ops->kmap_atomic

			  || !exp_info->ops->kmap

			  || !exp_info->ops->map_atomic

			  || !exp_info->ops->map

			  || !exp_info->ops->mmap)) {

		return ERR_PTR(-EINVAL);

	}
@@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	return dmabuf->ops->kmap_atomic(dmabuf, page_num);

	return dmabuf->ops->map_atomic(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
@@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num, 
{

	WARN_ON(!dmabuf);



	if (dmabuf->ops->kunmap_atomic)

		dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);

	if (dmabuf->ops->unmap_atomic)

		dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);

}

EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
@@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	return dmabuf->ops->kmap(dmabuf, page_num);

	return dmabuf->ops->map(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap);
@@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num, 
{

	WARN_ON(!dmabuf);



	if (dmabuf->ops->kunmap)

		dmabuf->ops->kunmap(dmabuf, page_num, vaddr);

	if (dmabuf->ops->unmap)

		dmabuf->ops->unmap(dmabuf, page_num, vaddr);

}

EXPORT_SYMBOL_GPL(dma_buf_kunmap);

drivers/gpu/drm/armada/armada_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { 
	.map_dma_buf	= armada_gem_prime_map_dma_buf,

	.unmap_dma_buf	= armada_gem_prime_unmap_dma_buf,

	.release	= drm_gem_dmabuf_release,

	.kmap_atomic	= armada_gem_dmabuf_no_kmap,

	.kunmap_atomic	= armada_gem_dmabuf_no_kunmap,

	.kmap		= armada_gem_dmabuf_no_kmap,

	.kunmap		= armada_gem_dmabuf_no_kunmap,

	.map_atomic	= armada_gem_dmabuf_no_kmap,

	.unmap_atomic	= armada_gem_dmabuf_no_kunmap,

	.map		= armada_gem_dmabuf_no_kmap,

	.unmap		= armada_gem_dmabuf_no_kunmap,

	.mmap		= armada_gem_dmabuf_mmap,

};

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

+2 −3
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, 
int atmel_hlcdc_create_outputs(struct drm_device *dev)

{

	struct device_node *remote;

	int ret, endpoint = 0;

	int ret = -ENODEV;

	int endpoint = 0;



	while (true) {

		/* Loop thru possible multiple connections to the output */
@@ -236,7 +237,5 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev) 
			return ret;

	}



	if (!endpoint)

		return -ENODEV;

	return ret;

}

drivers/gpu/drm/drm_prime.c

+4 −4
Original line number Diff line number Diff line
@@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { 
	.map_dma_buf = drm_gem_map_dma_buf,

	.unmap_dma_buf = drm_gem_unmap_dma_buf,

	.release = drm_gem_dmabuf_release,

	.kmap = drm_gem_dmabuf_kmap,

	.kmap_atomic = drm_gem_dmabuf_kmap_atomic,

	.kunmap = drm_gem_dmabuf_kunmap,

	.kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,

	.map = drm_gem_dmabuf_kmap,

	.map_atomic = drm_gem_dmabuf_kmap_atomic,

	.unmap = drm_gem_dmabuf_kunmap,

	.unmap_atomic = drm_gem_dmabuf_kunmap_atomic,

	.mmap = drm_gem_dmabuf_mmap,

	.vmap = drm_gem_dmabuf_vmap,

	.vunmap = drm_gem_dmabuf_vunmap,