Merge tag 'drm/tegra/for-3.16-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next (6c8a02bb) · Commits · 戴 / test

Documentation/DocBook/drm.tmpl

+36 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,12 @@
		and then pass it to one of the <function>drm_*_init()</function> functions
		to register it with the DRM subsystem.
		</para>
		<para>
		Newer drivers that no longer require a <structname>drm_bus</structname>
		structure can alternatively use the low-level device initialization and
		registration functions such as <function>drm_dev_alloc()</function> and
		<function>drm_dev_register()</function> directly.
		</para>
		<para>
		The <structname>drm_driver</structname> structure contains static
		information that describes the driver and features it supports, and
		@@ -281,6 +287,36 @@ char *date;</synopsis>
		</para>
		</sect3>
		</sect2>
		<sect2>
		<title>Device Registration</title>
		<para>
		A number of functions are provided to help with device registration.
		The functions deal with PCI, USB and platform devices, respectively.
		</para>
		!Edrivers/gpu/drm/drm_pci.c
		!Edrivers/gpu/drm/drm_usb.c
		!Edrivers/gpu/drm/drm_platform.c
		<para>
		New drivers that no longer rely on the services provided by the
		<structname>drm_bus</structname> structure can call the low-level
		device registration functions directly. The
		<function>drm_dev_alloc()</function> function can be used to allocate
		and initialize a new <structname>drm_device</structname> structure.
		Drivers will typically want to perform some additional setup on this
		structure, such as allocating driver-specific data and storing a
		pointer to it in the DRM device's <structfield>dev_private</structfield>
		field. Drivers should also set the device's unique name using the
		<function>drm_dev_set_unique()</function> function. After it has been
		set up a device can be registered with the DRM subsystem by calling
		<function>drm_dev_register()</function>. This will cause the device to
		be exposed to userspace and will call the driver's
		<structfield>.load()</structfield> implementation. When a device is
		removed, the DRM device can safely be unregistered and freed by calling
		<function>drm_dev_unregister()</function> followed by a call to
		<function>drm_dev_unref()</function>.
		</para>
		!Edrivers/gpu/drm/drm_stub.c
		</sect2>
		<sect2>
		<title>Driver Load</title>
		<para>

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ of the following host1x client modules:
		- compatible: "nvidia,tegra<chip>-hdmi"
		- reg: Physical base address and length of the controller's registers.
		- interrupts: The interrupt outputs from the controller.
		- hdmi-supply: supply for the +5V HDMI connector pin
		- vdd-supply: regulator for supply voltage
		- pll-supply: regulator for PLL
		- clocks: Must contain an entry for each entry in clock-names.
		@@ -180,6 +181,7 @@ of the following host1x client modules:
		See ../reset/reset.txt for details.
		- reset-names: Must include the following entries:
		- dsi
		- avdd-dsi-supply: phandle of a supply that powers the DSI controller
		- nvidia,mipi-calibrate: Should contain a phandle and a specifier specifying
		which pads are used by this DSI output and need to be calibrated. See also
		../mipi/nvidia,tegra114-mipi.txt.

drivers/gpu/drm/drm_ioctl.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -131,14 +131,26 @@ static int drm_set_busid(struct drm_device dev, struct drm_file file_priv)
		if (master->unique != NULL)
		drm_unset_busid(dev, master);

		if (dev->driver->bus && dev->driver->bus->set_busid) {
		ret = dev->driver->bus->set_busid(dev, master);
		if (ret)
		goto err;
		return 0;
		err:
		if (ret) {
		drm_unset_busid(dev, master);
		return ret;
		}
		} else {
		if (WARN(dev->unique == NULL,
		"No drm_bus.set_busid() implementation provided by "
		"%ps. Use drm_dev_set_unique() to set the unique "
		"name explicitly.", dev->driver))
		return -EINVAL;

		master->unique = kstrdup(dev->unique, GFP_KERNEL);
		if (master->unique)
		master->unique_len = strlen(dev->unique);
		}

		return 0;
		}

		/**
		* Get a mapping information.

drivers/gpu/drm/drm_pci.c

+38 −42

Original line number	Diff line number	Diff line
		/* drm_pci.h -- PCI DMA memory management wrappers for DRM -- linux-c -- */
		/**
		* \file drm_pci.c
		* \brief Functions and ioctls to manage PCI memory
		*
		* \warning These interfaces aren't stable yet.
		*
		* \todo Implement the remaining ioctl's for the PCI pools.
		* \todo The wrappers here are so thin that they would be better off inlined..
		*
		* \author José Fonseca <jrfonseca@tungstengraphics.com>
		* \author Leif Delgass <ldelgass@retinalburn.net>
		*/

		/*
		* Copyright 2003 José Fonseca.
		* Copyright 2003 Leif Delgass.
		@@ -42,12 +28,14 @@
		#include <linux/export.h>
		#include <drm/drmP.h>

		/**********************************************************************/
		/** \name PCI memory */
		/@{/

		/**
		* \brief Allocate a PCI consistent memory block, for DMA.
		* drm_pci_alloc - Allocate a PCI consistent memory block, for DMA.
		* @dev: DRM device
		* @size: size of block to allocate
		* @align: alignment of block
		*
		* Return: A handle to the allocated memory block on success or NULL on
		* failure.
		*/
		drm_dma_handle_t drm_pci_alloc(struct drm_device dev, size_t size, size_t align)
		{
		@@ -88,8 +76,8 @@ drm_dma_handle_t drm_pci_alloc(struct drm_device dev, size_t size, size_t ali

		EXPORT_SYMBOL(drm_pci_alloc);

		/**
		* \brief Free a PCI consistent memory block without freeing its descriptor.
		/*
		* Free a PCI consistent memory block without freeing its descriptor.
		*
		* This function is for internal use in the Linux-specific DRM core code.
		*/
		@@ -111,7 +99,9 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
		}

		/**
		* \brief Free a PCI consistent memory block
		* drm_pci_free - Free a PCI consistent memory block
		* @dev: DRM device
		* @dmah: handle to memory block
		*/
		void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
		{
		@@ -226,17 +216,16 @@ static int drm_pci_irq_by_busid(struct drm_device dev, struct drm_irq_busid p)
		}

		/**
		* Get interrupt from bus id.
		*
		* \param inode device inode.
		* \param file_priv DRM file private.
		* \param cmd command.
		* \param arg user argument, pointing to a drm_irq_busid structure.
		* \return zero on success or a negative number on failure.
		* drm_irq_by_busid - Get interrupt from bus ID
		* @dev: DRM device
		* @data: IOCTL parameter pointing to a drm_irq_busid structure
		* @file_priv: DRM file private.
		*
		* Finds the PCI device with the specified bus id and gets its IRQ number.
		* This IOCTL is deprecated, and will now return EINVAL for any busid not equal
		* to that of the device that this DRM instance attached to.
		*
		* Return: 0 on success or a negative error code on failure.
		*/
		int drm_irq_by_busid(struct drm_device dev, void data,
		struct drm_file *file_priv)
		@@ -285,15 +274,16 @@ static struct drm_bus drm_pci_bus = {
		};

		/**
		* Register.
		*
		* \param pdev - PCI device structure
		* \param ent entry from the PCI ID table with device type flags
		* \return zero on success or a negative number on failure.
		* drm_get_pci_dev - Register a PCI device with the DRM subsystem
		* @pdev: PCI device
		* @ent: entry from the PCI ID table that matches @pdev
		* @driver: DRM device driver
		*
		* Attempt to gets inter module "drm" information. If we are first
		* then register the character device and inter module information.
		* Try and register, if we fail to register, backout previous work.
		*
		* Return: 0 on success or a negative error code on failure.
		*/
		int drm_get_pci_dev(struct pci_dev pdev, const struct pci_device_id ent,
		struct drm_driver *driver)
		@@ -346,15 +336,14 @@ err_free:
		EXPORT_SYMBOL(drm_get_pci_dev);

		/**
		* PCI device initialization. Called direct from modules at load time.
		* drm_pci_init - Register matching PCI devices with the DRM subsystem
		* @driver: DRM device driver
		* @pdriver: PCI device driver
		*
		* \return zero on success or a negative number on failure.
		* Initializes a drm_device structures, registering the stubs and initializing
		* the AGP device.
		*
		* Initializes a drm_device structures,registering the
		* stubs and initializing the AGP device.
		*
		* Expands the \c DRIVER_PREINIT and \c DRIVER_POST_INIT macros before and
		* after the initialization for driver customization.
		* Return: 0 on success or a negative error code on failure.
		*/
		int drm_pci_init(struct drm_driver driver, struct pci_driver pdriver)
		{
		@@ -458,7 +447,14 @@ int drm_pci_set_unique(struct drm_device *dev,

		EXPORT_SYMBOL(drm_pci_init);

		/@}/
		/**
		* drm_pci_exit - Unregister matching PCI devices from the DRM subsystem
		* @driver: DRM device driver
		* @pdriver: PCI device driver
		*
		* Unregisters one or more devices matched by a PCI driver from the DRM
		* subsystem.
		*/
		void drm_pci_exit(struct drm_driver driver, struct pci_driver pdriver)
		{
		struct drm_device dev, tmp;

drivers/gpu/drm/drm_platform.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -106,17 +106,16 @@ static struct drm_bus drm_platform_bus = {
		};

		/**
		* Platform device initialization. Called direct from modules.
		* drm_platform_init - Register a platform device with the DRM subsystem
		* @driver: DRM device driver
		* @platform_device: platform device to register
		*
		* \return zero on success or a negative number on failure.
		*
		* Initializes a drm_device structures,registering the
		* stubs
		* Registers the specified DRM device driver and platform device with the DRM
		* subsystem, initializing a drm_device structure and calling the driver's
		* .load() function.
		*
		* Expands the \c DRIVER_PREINIT and \c DRIVER_POST_INIT macros before and
		* after the initialization for driver customization.
		* Return: 0 on success or a negative error code on failure.
		*/

		int drm_platform_init(struct drm_driver driver, struct platform_device platform_device)
		{
		DRM_DEBUG("\n");

Admin message