Commit 8824c751 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next 

omapdrm changes for v4.14

* HDMI hot plug IRQ support (instead of polling)
* Big driver cleanup from Laurent (no functional changes)
* OMAP5 DSI support (only the pinmuxing was missing)

* tag 'omapdrm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (60 commits)
  drm/omap: Potential NULL deref in omap_crtc_duplicate_state()
  drm/omap: remove no-op cleanup code
  drm/omap: rename omapdrm device back
  drm: omapdrm: Remove omapdrm platform data
  ARM: OMAP2+: Don't register omapdss device for omapdrm
  ARM: OMAP2+: Remove unused omapdrm platform device
  drm: omapdrm: Remove the omapdss driver
  drm: omapdrm: Register omapdrm platform device in omapdss driver
  drm: omapdrm: hdmi: Don't allocate PHY features dynamically
  drm: omapdrm: hdmi: Configure the PHY from the HDMI core version
  drm: omapdrm: hdmi: Configure the PLL from the HDMI core version
  drm: omapdrm: hdmi: Pass HDMI core version as integer to HDMI audio
  drm: omapdrm: hdmi: Replace OMAP SoC model check with HDMI xmit version
  drm: omapdrm: hdmi: Rename functions and structures to use hdmi_ prefix
  drm/omap: add OMAP5 DSIPHY lane-enable support
  drm/omap: use regmap_update_bit() when muxing DSI pads
  drm: omapdrm: Remove dss_features.h
  drm: omapdrm: Move supported outputs feature to dss driver
  drm: omapdrm: Move DSS_FCK feature to dss driver
  drm: omapdrm: Move PCD, LINEWIDTH and DOWNSCALE features to dispc driver
  ...
parents 2040c473 2419672f

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ 
# Common support

obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \

	 common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o omap-headsmp.o sram.o drm.o

	 omap_device.o omap-headsmp.o sram.o



hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

arch/arm/mach-omap2/board-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static void __init __maybe_unused omap_generic_init(void) 
	pdata_quirks_init(omap_dt_match_table);



	omapdss_init_of();

	omap_soc_device_init();

}



#ifdef CONFIG_SOC_OMAP2420

arch/arm/mach-omap2/display.c

+60 −58
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
 */

#define FRAMEDONE_IRQ_TIMEOUT		100



#if defined(CONFIG_FB_OMAP2)

static struct platform_device omap_display_device = {

	.name          = "omapdss",

	.id            = -1,
@@ -163,6 +164,64 @@ static enum omapdss_version __init omap_display_get_version(void) 
		return OMAPDSS_VER_UNKNOWN;

}



static int __init omapdss_init_fbdev(void)

{

	static struct omap_dss_board_info board_data = {

		.dsi_enable_pads = omap_dsi_enable_pads,

		.dsi_disable_pads = omap_dsi_disable_pads,

		.set_min_bus_tput = omap_dss_set_min_bus_tput,

	};

	struct device_node *node;



	board_data.version = omap_display_get_version();

	if (board_data.version == OMAPDSS_VER_UNKNOWN) {

		pr_err("DSS not supported on this SoC\n");

		return -ENODEV;

	}



	omap_display_device.dev.platform_data = &board_data;



	r = platform_device_register(&omap_display_device);

	if (r < 0) {

		pr_err("Unable to register omapdss device\n");

		return r;

	}



	/* create vrfb device */

	r = omap_init_vrfb();

	if (r < 0) {

		pr_err("Unable to register omapvrfb device\n");

		return r;

	}



	/* create FB device */

	r = omap_init_fb();

	if (r < 0) {

		pr_err("Unable to register omapfb device\n");

		return r;

	}



	/* create V4L2 display device */

	r = omap_init_vout();

	if (r < 0) {

		pr_err("Unable to register omap_vout device\n");

		return r;

	}



	/* add DSI info for omap4 */

	node = of_find_node_by_name(NULL, "omap4_padconf_global");

	if (node)

		omap4_dsi_mux_syscon = syscon_node_to_regmap(node);



	return 0;

}

#else

static inline int omapdss_init_fbdev(void)

{

	return 0;

}

#endif /* CONFIG_FB_OMAP2 */



static void dispc_disable_outputs(void)

{

	u32 v, irq_mask = 0;
@@ -335,16 +394,9 @@ static struct device_node * __init omapdss_find_dss_of_node(void) 
int __init omapdss_init_of(void)

{

	int r;

	enum omapdss_version ver;

	struct device_node *node;

	struct platform_device *pdev;



	static struct omap_dss_board_info board_data = {

		.dsi_enable_pads = omap_dsi_enable_pads,

		.dsi_disable_pads = omap_dsi_disable_pads,

		.set_min_bus_tput = omap_dss_set_min_bus_tput,

	};



	/* only create dss helper devices if dss is enabled in the .dts */



	node = omapdss_find_dss_of_node();
@@ -354,13 +406,6 @@ int __init omapdss_init_of(void) 
	if (!of_device_is_available(node))

		return 0;



	ver = omap_display_get_version();



	if (ver == OMAPDSS_VER_UNKNOWN) {

		pr_err("DSS not supported on this SoC\n");

		return -ENODEV;

	}



	pdev = of_find_device_by_node(node);



	if (!pdev) {
@@ -374,48 +419,5 @@ int __init omapdss_init_of(void) 
		return r;

	}



	board_data.version = ver;



	omap_display_device.dev.platform_data = &board_data;



	r = platform_device_register(&omap_display_device);

	if (r < 0) {

		pr_err("Unable to register omapdss device\n");

		return r;

	}



	/* create DRM device */

	r = omap_init_drm();

	if (r < 0) {

		pr_err("Unable to register omapdrm device\n");

		return r;

	}



	/* create vrfb device */

	r = omap_init_vrfb();

	if (r < 0) {

		pr_err("Unable to register omapvrfb device\n");

		return r;

	}



	/* create FB device */

	r = omap_init_fb();

	if (r < 0) {

		pr_err("Unable to register omapfb device\n");

		return r;

	}



	/* create V4L2 display device */

	r = omap_init_vout();

	if (r < 0) {

		pr_err("Unable to register omap_vout device\n");

		return r;

	}



	/* add DSI info for omap4 */

	node = of_find_node_by_name(NULL, "omap4_padconf_global");

	if (node)

		omap4_dsi_mux_syscon = syscon_node_to_regmap(node);



	return 0;

	return omapdss_init_fbdev();

}

arch/arm/mach-omap2/display.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct omap_dss_dispc_dev_attr { 
	bool	has_framedonetv_irq;

};



int omap_init_drm(void);

int omap_init_vrfb(void);

int omap_init_fb(void);

int omap_init_vout(void);

arch/arm/mach-omap2/drm.c

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * DRM/KMS device registration for TI OMAP platforms

 *

 * Copyright (C) 2012 Texas Instruments

 * Author: Rob Clark <rob.clark@linaro.org>

 *

 * 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/>.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/platform_data/omap_drm.h>



#include "soc.h"

#include "display.h"



#if IS_ENABLED(CONFIG_DRM_OMAP)



static struct omap_drm_platform_data platform_data;



static struct platform_device omap_drm_device = {

	.dev = {

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &platform_data,

	},

	.name = "omapdrm",

	.id = 0,

};



int __init omap_init_drm(void)

{

	platform_data.omaprev = GET_OMAP_TYPE;



	return platform_device_register(&omap_drm_device);



}

#else

int __init omap_init_drm(void) { return 0; }

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE