Commit 641f832c 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:
 "Nothing too crazy.

  Radeon irq fixes, i915 regression fixes, exynos fixes, tda998x chip
  fixes, and a bunch of msm fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
  drm/i915: Pair va_copy with va_end in i915_error_vprintf
  drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS
  drm/i915: Disable dp aux irq on g4x
  drm/msm: bigger synchronization hammer
  drm/exynos: Convert to use the standard hdmi.h header
  drm/exynos: Fix trivial typo
  drm/exynos: Remove unnecessary semicolon
  drm/exynos: Fix multiplatform breakage for ipp/gsc
  drm/exynos: Fix freeing issues in exynos_drm_drv.c
  drm/radeon: add missing include in btc_dpm.c
  drm/radeon/dpm: fix uninitialized read from stack in kv_dpm_late_enable
  drm/radeon: remove useless return
  drm/radeon/dpm: use stored max_vddc rather than looking it up
  drm/radeon/dpm: use the driver state for dpm debugfs
  drm/radeon: fix UVD IRQ support on 7xx
  drm/radeon: fix UVD IRQ support on SI
  drm/msm: fix deadlock in bo create fail path
  drm/msm/mdp4: cursor fixes
  drm/msm/mdp4: pageflip fixes
  drm/msm/mdp5: fix ref leaks in error paths
  ...
parents 45f7fdc2 9b244b5d

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -2857,7 +2857,7 @@ M: Jani Nikula <jani.nikula@linux.intel.com> 
L:	intel-gfx@lists.freedesktop.org

L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://people.freedesktop.org/~danvet/drm-intel

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

S:	Supported

S:	Supported

F:	drivers/gpu/drm/i915/

F:	drivers/gpu/drm/i915/

F:	include/drm/i915*

F:	include/drm/i915*

drivers/gpu/drm/exynos/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ config DRM_EXYNOS_G2D 




config DRM_EXYNOS_IPP

config DRM_EXYNOS_IPP

	bool "Exynos DRM IPP"

	bool "Exynos DRM IPP"

	depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM

	depends on DRM_EXYNOS

	help

	help

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

	  Choose this option if you want to use IPP feature for DRM.
@@ -69,6 +69,6 @@ config DRM_EXYNOS_ROTATOR 




config DRM_EXYNOS_GSC

config DRM_EXYNOS_GSC

	bool "Exynos DRM GSC"

	bool "Exynos DRM GSC"

	depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5

	depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5 && !ARCH_MULTIPLATFORM

	help

	help

	  Choose this option if you want to use Exynos GSC for DRM.
 
	  Choose this option if you want to use Exynos GSC for DRM.

drivers/gpu/drm/exynos/exynos_drm_drv.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -171,21 +171,23 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) 
	file->driver_priv = file_priv;

	file->driver_priv = file_priv;





	ret = exynos_drm_subdrv_open(dev, file);

	ret = exynos_drm_subdrv_open(dev, file);

	if (ret) {

	if (ret)

		kfree(file_priv);

		goto out;

		file->driver_priv = NULL;

	}





	anon_filp = anon_inode_getfile("exynos_gem", &exynos_drm_gem_fops,

	anon_filp = anon_inode_getfile("exynos_gem", &exynos_drm_gem_fops,

					NULL, 0);

					NULL, 0);

	if (IS_ERR(anon_filp)) {

	if (IS_ERR(anon_filp)) {

		kfree(file_priv);

		ret = PTR_ERR(anon_filp);

		return PTR_ERR(anon_filp);

		goto out;

	}

	}





	anon_filp->f_mode = FMODE_READ | FMODE_WRITE;

	anon_filp->f_mode = FMODE_READ | FMODE_WRITE;

	file_priv->anon_filp = anon_filp;

	file_priv->anon_filp = anon_filp;





	return ret;

out:

	kfree(file_priv);

	file->driver_priv = NULL;

	return ret;

	return ret;

}

}

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -607,7 +607,7 @@ static enum g2d_reg_type g2d_get_reg_type(int reg_offset) 
		reg_type = REG_TYPE_NONE;

		reg_type = REG_TYPE_NONE;

		DRM_ERROR("Unknown register offset![%d]\n", reg_offset);

		DRM_ERROR("Unknown register offset![%d]\n", reg_offset);

		break;

		break;

	};

	}





	return reg_type;

	return reg_type;

}

}

drivers/gpu/drm/exynos/exynos_drm_ipp.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <plat/map-base.h>





#include <drm/drmP.h>

#include <drm/drmP.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>
@@ -826,7 +825,7 @@ static void ipp_put_event(struct drm_exynos_ipp_cmd_node *c_node, 
		DRM_DEBUG_KMS("count[%d]e[0x%x]\n", count++, (int)e);

		DRM_DEBUG_KMS("count[%d]e[0x%x]\n", count++, (int)e);





		/*

		/*

		 * quf == NULL condition means all event deletion.

		 * qbuf == NULL condition means all event deletion.

		 * stop operations want to delete all event list.

		 * stop operations want to delete all event list.

		 * another case delete only same buf id.

		 * another case delete only same buf id.

		 */

		 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE