Merge branch 'at91-4.14-trunk/lcd' into linux-4.14-at91

Author: cristibirsan

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

@@ -26,6 +26,7 @@
 #include <linux/pm_runtime.h>
 
 #include "atmel_hlcdc_dc.h"
+#include <drm/atmel_drm.h>
 
 #define ATMEL_HLCDC_LAYER_IRQS_OFFSET		8
 
@@ -740,6 +741,41 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev)
 
 DEFINE_DRM_GEM_CMA_FOPS(fops);
 
+/*
+ioctl to export the physical address of GEM to user space for
+video decoder
+*/
+int atmel_drm_gem_get_ioctl(struct drm_device *drm, void *data,
+				      struct drm_file *file_priv)
+{
+	struct drm_gem_object *gem_obj;
+	struct drm_gem_cma_object *cma_obj;
+	struct drm_mode_map_dumb *args = data;
+
+	mutex_lock(&drm->struct_mutex);
+
+	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
+	if (!gem_obj) {
+		dev_err(drm->dev, "failed to lookup gem object\n");
+		mutex_unlock(&drm->struct_mutex);
+		return -EINVAL;
+	}
+
+	cma_obj = to_drm_gem_cma_obj(gem_obj);
+	args->offset = (__u64)cma_obj->paddr;
+
+	drm_gem_object_unreference(gem_obj);
+
+	mutex_unlock(&drm->struct_mutex);
+
+	return 0;
+}
+static const struct drm_ioctl_desc atmel_ioctls[] = {
+	DRM_IOCTL_DEF_DRV(ATMEL_GEM_GET, atmel_drm_gem_get_ioctl,
+			DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+};
+
+
 static struct drm_driver atmel_hlcdc_dc_driver = {
 	.driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |
 			   DRIVER_MODESET | DRIVER_PRIME |
@@ -761,6 +797,8 @@ static struct drm_driver atmel_hlcdc_dc_driver = {
 	.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
 	.gem_prime_mmap = drm_gem_cma_prime_mmap,
 	.dumb_create = drm_gem_cma_dumb_create,
+	.ioctls	= atmel_ioctls,
+	.num_ioctls= ARRAY_SIZE(atmel_ioctls),
 	.fops = &fops,
 	.name = "atmel-hlcdc",
 	.desc = "Atmel HLCD Controller DRM",
@@ -786,6 +824,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_unload;
 
+	dev_info(ddev->dev, "DRM device successfully registered\n");
 	return 0;
 
 err_unload:

drivers/gpu/drm/drm_edid.c

@@ -1483,6 +1483,7 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len)
 		 * DDC monitors.
 		 */
 		ret = i2c_transfer(adapter, &msgs[3 - xfers], xfers);
+		udelay(100);
 
 		if (ret == -ENXIO) {
 			DRM_DEBUG_KMS("drm: skipping non-existent adapter %s\n",

drivers/gpu/drm/drm_probe_helper.c

@@ -206,7 +206,7 @@ enum drm_mode_status drm_connector_mode_valid(struct drm_connector *connector,
 	return connector_funcs->mode_valid(connector, mode);
 }
 
-#define DRM_OUTPUT_POLL_PERIOD (10*HZ)
+#define DRM_OUTPUT_POLL_PERIOD (4*HZ)
 /**
  * drm_kms_helper_poll_enable - re-enable output polling.
  * @dev: drm_device

include/uapi/drm/atmel_drm.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Atmel
+ *
+ * Author: Mohamed Jamsheeth <mohamedjamsheeth.hajanajubudeen@atmel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UAPI_ATMEL_DRM_H_
+#define _UAPI_ATMEL_DRM_H_
+
+#include <drm/drm.h>
+
+#define DRM_ATMEL_GEM_GET		0x00
+
+#define DRM_IOCTL_ATMEL_GEM_GET		DRM_IOWR(DRM_COMMAND_BASE + \
+					DRM_ATMEL_GEM_GET, struct drm_mode_map_dumb)
+
+#endif /* _UAPI_ATMEL_DRM_H_ */