Commit 90c37067 authored Nov 05, 2013 by Dave Airlie

linux into drm-next

drm/tegra: Changes for v3.13-rc1

The biggest part of the changes is the decoupling of the host1x and DRM
drivers followed by the move of Tegra DRM back to drivers/gpu/drm/tegra
from whence it came. There is a lot of cleanup as well, and the drivers
can now be properly unloaded and reloaded.

HDMI support for the Tegra114 SoC was contributed by Mikko Perttunen.

gr2d support was extended to Tegra114 and the gr3d driver that has been
in the works for quite some time finally made it in. All pieces to run
an OpenGL driver on top of an upstream kernel are now available.

Support for syncpoint bases was added by Arto Merilainen. This is useful
for synchronizing between command streams from different engines such as
gr2d and gr3d.

Erik Faye-Lund and Wei Yongjun contributed various small fixes. Thanks!

* tag 'drm/for-3.13-rc1' of git://anongit.freedesktop.org/tegra/linux: (45 commits)
  drm/tegra: Reserve syncpoint base for gr3d
  drm/tegra: Reserve base for gr2d
  drm/tegra: Deliver syncpoint base to user space
  gpu: host1x: Add syncpoint base support
  gpu: host1x: Add 'flags' field to syncpt request
  drm/tegra: Disable clock on probe failure
  gpu: host1x: Disable clock on probe failure
  drm/tegra: Support bottom-up buffer objects
  drm/tegra: Add support for tiled buffer objects
  drm/tegra: Add 3D support
  drm/tegra: Introduce tegra_drm_submit()
  drm/tegra: Use symbolic names for gr2d registers
  drm/tegra: Start connectors with correct DPMS mode
  drm/tegra: hdmi: Enable VDD earlier for hotplug/DDC
  drm/tegra: hdmi: Fix build warnings
  drm/tegra: hdmi: Detect DVI-only displays
  drm/tegra: Add Tegra114 HDMI support
  drm/tegra: hdmi: Parameterize based on compatible property
  drm/tegra: hdmi: Rename tegra{2,3} to tegra{20,30}
  gpu: host1x: Add support for Tegra114
  ...

parents cc87509d 977386a0

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -2816,7 +2816,9 @@ L: dri-devel@lists.freedesktop.org
		L: linux-tegra@vger.kernel.org
		T: git git://anongit.freedesktop.org/tegra/linux.git
		S: Maintained
		F: drivers/gpu/drm/tegra/
		F: drivers/gpu/host1x/
		F: include/linux/host1x.h
		F: include/uapi/drm/tegra_drm.h
		F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

drivers/gpu/drm/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -189,3 +189,5 @@ source "drivers/gpu/drm/tilcdc/Kconfig"
		source "drivers/gpu/drm/qxl/Kconfig"

		source "drivers/gpu/drm/msm/Kconfig"

		source "drivers/gpu/drm/tegra/Kconfig"

drivers/gpu/drm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,5 @@ obj-$(CONFIG_DRM_OMAP) += omapdrm/
		obj-$(CONFIG_DRM_TILCDC) += tilcdc/
		obj-$(CONFIG_DRM_QXL) += qxl/
		obj-$(CONFIG_DRM_MSM) += msm/
		obj-$(CONFIG_DRM_TEGRA) += tegra/
		obj-y += i2c/

drivers/gpu/drm/drm_crtc_helper.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -567,6 +567,14 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
		continue;

		connector->encoder = NULL;

		/*
		* drm_helper_disable_unused_functions() ought to be
		* doing this, but since we've decoupled the encoder
		* from the connector above, the required connection
		* between them is henceforth no longer available.
		*/
		connector->dpms = DRM_MODE_DPMS_OFF;
		}
		}

drivers/gpu/drm/drm_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,7 @@ long drm_ioctl(struct file *filp,

		err_i1:
		if (!ioctl)
		DRM_DEBUG("invalid iotcl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",
		DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",
		task_pid_nr(current),
		(long)old_encode_dev(file_priv->minor->device),
		file_priv->authenticated, cmd, nr);

Admin message