Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next (a4521654) · Commits · 戴 / test

Documentation/gpu/drm-internals.rst

+0 −3

Original line number	Diff line number	Diff line
		@@ -240,9 +240,6 @@ drivers.
		.. kernel-doc:: drivers/gpu/drm/drm_pci.c
		:export:

		.. kernel-doc:: drivers/gpu/drm/drm_platform.c
		:export:

		Open/Close, File Operations and IOCTLs
		======================================

drivers/gpu/drm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
		drm_file.o drm_gem.o drm_ioctl.o drm_irq.o \
		drm_lock.o drm_memory.o drm_drv.o \
		drm_scatter.o drm_pci.o \
		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
		drm_sysfs.o drm_hashtab.o drm_mm.o \
		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
		drm_info.o drm_encoder_slave.o \
		drm_trace_points.o drm_global.o drm_prime.o \

drivers/gpu/drm/armada/armada_drv.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -137,10 +137,9 @@ static int armada_drm_bind(struct device *dev)
		return ret;
		}

		priv->drm.platformdev = to_platform_device(dev);
		priv->drm.dev_private = priv;

		platform_set_drvdata(priv->drm.platformdev, &priv->drm);
		dev_set_drvdata(dev, &priv->drm);

		INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work);
		INIT_KFIFO(priv->fb_unref);

drivers/gpu/drm/drm_platform.c

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* Derived from drm_pci.c
		*
		* Copyright 2003 José Fonseca.
		* Copyright 2003 Leif Delgass.
		* Copyright (c) 2009, Code Aurora Forum.
		* All Rights Reserved.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
		* AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
		* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
		*/

		#include <linux/export.h>
		#include <drm/drmP.h>

		/*
		* Register.
		*
		* \param platdev - Platform device struture
		* \return zero on success or a negative number on failure.
		*
		* 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.
		*/

		static int drm_get_platform_dev(struct platform_device *platdev,
		struct drm_driver *driver)
		{
		struct drm_device *dev;
		int ret;

		DRM_DEBUG("\n");

		dev = drm_dev_alloc(driver, &platdev->dev);
		if (IS_ERR(dev))
		return PTR_ERR(dev);

		dev->platformdev = platdev;

		ret = drm_dev_register(dev, 0);
		if (ret)
		goto err_free;

		return 0;

		err_free:
		drm_dev_unref(dev);
		return ret;
		}

		/**
		* drm_platform_init - Register a platform device with the DRM subsystem
		* @driver: DRM device driver
		* @platform_device: platform device to register
		*
		* 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.
		*
		* NOTE: This function is deprecated, please use drm_dev_alloc() and
		* drm_dev_register() instead and remove your &drm_driver.load callback.
		*
		* 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");

		return drm_get_platform_dev(platform_device, driver);
		}
		EXPORT_SYMBOL(drm_platform_init);

drivers/gpu/drm/exynos/exynos_dp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data,
		struct exynos_dp_device *dp = to_dp(plat_data);
		int ret;

		drm_connector_register(connector);
		dp->connector = connector;

		/* Pre-empt DP connector creation if there's a bridge */

Admin message