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

Commit 2e51b231 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Intel, radeon and exynos fixes.  Nothing too major or wierd: one dmar
  fix and a radeon cursor corruption, along with misc exynos fixes."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (21 commits)
  drm/exynos: add check for the device power status
  drm/exynos: Make 'drm_hdmi_get_edid' static
  drm/exynos: fimd and ipp are broken on multiplatform
  drm/exynos: don't include plat/gpio-cfg.h
  drm/exynos: Remove "internal" interrupt handling
  drm/exynos: Add missing static specifiers in exynos_drm_rotator.c
  drm/exynos: Replace mdelay with usleep_range
  drm/exynos: Make ipp_handle_cmd_work static
  drm/exynos: Make g2d_userptr_get_dma_addr static
  drm/exynos: consider DMA_NONE flag to dmabuf import
  drm/exynos: free sg object if dma_map_sg is failed
  drm/exynos: added validation of edid for vidi connection
  drm/exynos: let drm handle edid allocations
  drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts.
  drm/radeon: fix a rare case of double kfree
  radeon_display: Use pointer return error codes
  drm/radeon: fix cursor corruption on DCE6 and newer
  drm/i915: dump UTS_RELEASE into the error_state
  iommu/intel: disable DMAR for g4x integrated gfx
  drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits
  ...
parents f96736e1 48367432

drivers/gpu/drm/exynos/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config DRM_EXYNOS_DMABUF 


config DRM_EXYNOS_FIMD

	bool "Exynos DRM FIMD"

	depends on DRM_EXYNOS && !FB_S3C

	depends on DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM

	help

	  Choose this option if you want to use Exynos FIMD for DRM.
@@ -48,7 +48,7 @@ config DRM_EXYNOS_G2D 


config DRM_EXYNOS_IPP

	bool "Exynos DRM IPP"

	depends on DRM_EXYNOS

	depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM

	help

	  Choose this option if you want to use IPP feature for DRM.

drivers/gpu/drm/exynos/exynos_drm_connector.c

+15 −18
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "exynos_drm_drv.h"

#include "exynos_drm_encoder.h"



#define MAX_EDID 256

#define to_exynos_connector(x)	container_of(x, struct exynos_drm_connector,\

				drm_connector)
@@ -96,7 +95,9 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) 
					to_exynos_connector(connector);

	struct exynos_drm_manager *manager = exynos_connector->manager;

	struct exynos_drm_display_ops *display_ops = manager->display_ops;

	unsigned int count;

	struct edid *edid = NULL;

	unsigned int count = 0;

	int ret;



	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -114,27 +115,21 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) 
	 * because lcd panel has only one mode.

	 */

	if (display_ops->get_edid) {

		int ret;

		void *edid;



		edid = kzalloc(MAX_EDID, GFP_KERNEL);

		if (!edid) {

			DRM_ERROR("failed to allocate edid\n");

			return 0;

		edid = display_ops->get_edid(manager->dev, connector);

		if (IS_ERR_OR_NULL(edid)) {

			ret = PTR_ERR(edid);

			edid = NULL;

			DRM_ERROR("Panel operation get_edid failed %d\n", ret);

			goto out;

		}



		ret = display_ops->get_edid(manager->dev, connector,

						edid, MAX_EDID);

		if (ret < 0) {

			DRM_ERROR("failed to get edid data.\n");

			kfree(edid);

			edid = NULL;

			return 0;

		count = drm_add_edid_modes(connector, edid);

		if (count < 0) {

			DRM_ERROR("Add edid modes failed %d\n", count);

			goto out;

		}



		drm_mode_connector_update_edid_property(connector, edid);

		count = drm_add_edid_modes(connector, edid);

		kfree(edid);

	} else {

		struct exynos_drm_panel_info *panel;

		struct drm_display_mode *mode = drm_mode_create(connector->dev);
@@ -161,6 +156,8 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) 
		count = 1;

	}



out:

	kfree(edid);

	return count;

}

drivers/gpu/drm/exynos/exynos_drm_dmabuf.c

+11 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
struct exynos_drm_dmabuf_attachment {

	struct sg_table sgt;

	enum dma_data_direction dir;

	bool is_mapped;

};



static int exynos_gem_attach_dma_buf(struct dma_buf *dmabuf,
@@ -72,17 +73,10 @@ static struct sg_table * 


	DRM_DEBUG_PRIME("%s\n", __FILE__);



	if (WARN_ON(dir == DMA_NONE))

		return ERR_PTR(-EINVAL);



	/* just return current sgt if already requested. */

	if (exynos_attach->dir == dir)

	if (exynos_attach->dir == dir && exynos_attach->is_mapped)

		return &exynos_attach->sgt;



	/* reattaching is not allowed. */

	if (WARN_ON(exynos_attach->dir != DMA_NONE))

		return ERR_PTR(-EBUSY);



	buf = gem_obj->buffer;

	if (!buf) {

		DRM_ERROR("buffer is null.\n");
@@ -107,13 +101,17 @@ static struct sg_table * 
		wr = sg_next(wr);

	}



	if (dir != DMA_NONE) {

		nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir);

		if (!nents) {

			DRM_ERROR("failed to map sgl with iommu.\n");

			sg_free_table(sgt);

			sgt = ERR_PTR(-EIO);

			goto err_unlock;

		}

	}



	exynos_attach->is_mapped = true;

	exynos_attach->dir = dir;

	attach->priv = exynos_attach;

drivers/gpu/drm/exynos/exynos_drm_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ struct exynos_drm_overlay { 
struct exynos_drm_display_ops {

	enum exynos_drm_output_type type;

	bool (*is_connected)(struct device *dev);

	int (*get_edid)(struct device *dev, struct drm_connector *connector,

				u8 *edid, int len);

	struct edid *(*get_edid)(struct device *dev,

			struct drm_connector *connector);

	void *(*get_panel)(struct device *dev);

	int (*check_timing)(struct device *dev, void *timing);

	int (*power_on)(struct device *dev, int mode);

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void g2d_userptr_put_dma_addr(struct drm_device *drm_dev, 
	g2d_userptr = NULL;

}



dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,

static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,

					unsigned long userptr,

					unsigned long size,

					struct drm_file *filp,