Commit 2de0b0a1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/tegra/for-4.20-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next 



drm/tegra: Changes for v4.20-rc1

This contains initial Tegra194 support as well as a couple of fixes for
DMA/IOMMU integration.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927205051.30017-1-thierry.reding@gmail.com
parents db9825c9 5ac93f81

drivers/gpu/drm/tegra/dc.c

+73 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,28 @@ static int tegra_dc_init(struct host1x_client *client) 
	struct drm_plane *cursor = NULL;

	int err;



	/*

	 * XXX do not register DCs with no window groups because we cannot

	 * assign a primary plane to them, which in turn will cause KMS to

	 * crash.

	 */

	if (dc->soc->wgrps) {

		bool has_wgrps = false;

		unsigned int i;



		for (i = 0; i < dc->soc->num_wgrps; i++) {

			const struct tegra_windowgroup_soc *wgrp = &dc->soc->wgrps[i];



			if (wgrp->dc == dc->pipe && wgrp->num_windows > 0) {

				has_wgrps = true;

				break;

			}

		}



		if (!has_wgrps)

			return 0;

	}



	dc->syncpt = host1x_syncpt_request(client, flags);

	if (!dc->syncpt)

		dev_warn(dc->dev, "failed to allocate syncpoint\n");
@@ -2234,8 +2256,59 @@ static const struct tegra_dc_soc_info tegra186_dc_soc_info = { 
	.num_wgrps = ARRAY_SIZE(tegra186_dc_wgrps),

};



static const struct tegra_windowgroup_soc tegra194_dc_wgrps[] = {

	{

		.index = 0,

		.dc = 0,

		.windows = (const unsigned int[]) { 0 },

		.num_windows = 1,

	}, {

		.index = 1,

		.dc = 1,

		.windows = (const unsigned int[]) { 1 },

		.num_windows = 1,

	}, {

		.index = 2,

		.dc = 1,

		.windows = (const unsigned int[]) { 2 },

		.num_windows = 1,

	}, {

		.index = 3,

		.dc = 2,

		.windows = (const unsigned int[]) { 3 },

		.num_windows = 1,

	}, {

		.index = 4,

		.dc = 2,

		.windows = (const unsigned int[]) { 4 },

		.num_windows = 1,

	}, {

		.index = 5,

		.dc = 2,

		.windows = (const unsigned int[]) { 5 },

		.num_windows = 1,

	},

};



static const struct tegra_dc_soc_info tegra194_dc_soc_info = {

	.supports_background_color = true,

	.supports_interlacing = true,

	.supports_cursor = true,

	.supports_block_linear = true,

	.has_legacy_blending = false,

	.pitch_align = 64,

	.has_powergate = false,

	.coupled_pm = false,

	.has_nvdisplay = true,

	.wgrps = tegra194_dc_wgrps,

	.num_wgrps = ARRAY_SIZE(tegra194_dc_wgrps),

};



static const struct of_device_id tegra_dc_of_match[] = {

	{

		.compatible = "nvidia,tegra194-dc",

		.data = &tegra194_dc_soc_info,

	}, {

		.compatible = "nvidia,tegra186-dc",

		.data = &tegra186_dc_soc_info,

	}, {

drivers/gpu/drm/tegra/dc.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc); 
#define SOR1_TIMING_CYA	(1 << 27)

#define CURSOR_ENABLE	(1 << 16)



#define SOR_ENABLE(x)	(1 << (25 + (x)))

#define SOR_ENABLE(x)	(1 << (25 + (((x) > 1) ? ((x) + 1) : (x))))



#define DC_DISP_DISP_MEM_HIGH_PRIORITY		0x403

#define CURSOR_THRESHOLD(x)   (((x) & 0x03) << 24)

drivers/gpu/drm/tegra/dpaux.c

+2 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev) 
	 * is no possibility to perform the I2C mode configuration in the

	 * HDMI path.

	 */

	err = tegra_dpaux_pad_config(dpaux, DPAUX_HYBRID_PADCTL_MODE_I2C);

	err = tegra_dpaux_pad_config(dpaux, DPAUX_PADCTL_FUNC_I2C);

	if (err < 0)

		return err;
@@ -639,6 +639,7 @@ static const struct dev_pm_ops tegra_dpaux_pm_ops = { 
};



static const struct of_device_id tegra_dpaux_of_match[] = {

	{ .compatible = "nvidia,tegra194-dpaux", },

	{ .compatible = "nvidia,tegra186-dpaux", },

	{ .compatible = "nvidia,tegra210-dpaux", },

	{ .compatible = "nvidia,tegra124-dpaux", },

drivers/gpu/drm/tegra/drm.c

+17 −18
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>



#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)

#include <asm/dma-iommu.h>

#endif



#include "drm.h"

#include "gem.h"
@@ -1068,6 +1072,14 @@ struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client, 
		}



		if (!shared || (shared && (group != tegra->group))) {

#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)

			if (client->dev->archdata.mapping) {

				struct dma_iommu_mapping *mapping =

					to_dma_iommu_mapping(client->dev);

				arm_iommu_detach_device(client->dev);

				arm_iommu_release_mapping(mapping);

			}

#endif

			err = iommu_attach_group(tegra->domain, group);

			if (err < 0) {

				iommu_group_put(group);
@@ -1216,31 +1228,15 @@ static int host1x_drm_remove(struct host1x_device *dev) 
static int host1x_drm_suspend(struct device *dev)

{

	struct drm_device *drm = dev_get_drvdata(dev);

	struct tegra_drm *tegra = drm->dev_private;



	drm_kms_helper_poll_disable(drm);

	tegra_drm_fb_suspend(drm);



	tegra->state = drm_atomic_helper_suspend(drm);

	if (IS_ERR(tegra->state)) {

		tegra_drm_fb_resume(drm);

		drm_kms_helper_poll_enable(drm);

		return PTR_ERR(tegra->state);

	}



	return 0;

	return drm_mode_config_helper_suspend(drm);

}



static int host1x_drm_resume(struct device *dev)

{

	struct drm_device *drm = dev_get_drvdata(dev);

	struct tegra_drm *tegra = drm->dev_private;



	drm_atomic_helper_resume(drm, tegra->state);

	tegra_drm_fb_resume(drm);

	drm_kms_helper_poll_enable(drm);



	return 0;

	return drm_mode_config_helper_resume(drm);

}

#endif
@@ -1275,6 +1271,9 @@ static const struct of_device_id host1x_drm_subdevs[] = { 
	{ .compatible = "nvidia,tegra186-sor", },

	{ .compatible = "nvidia,tegra186-sor1", },

	{ .compatible = "nvidia,tegra186-vic", },

	{ .compatible = "nvidia,tegra194-display", },

	{ .compatible = "nvidia,tegra194-dc", },

	{ .compatible = "nvidia,tegra194-sor", },

	{ /* sentinel */ }

};

drivers/gpu/drm/tegra/drm.h

+0 −4
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ struct tegra_drm { 
	unsigned int pitch_align;



	struct tegra_display_hub *hub;



	struct drm_atomic_state *state;

};



struct tegra_drm_client;
@@ -186,8 +184,6 @@ int tegra_drm_fb_prepare(struct drm_device *drm); 
void tegra_drm_fb_free(struct drm_device *drm);

int tegra_drm_fb_init(struct drm_device *drm);

void tegra_drm_fb_exit(struct drm_device *drm);

void tegra_drm_fb_suspend(struct drm_device *drm);

void tegra_drm_fb_resume(struct drm_device *drm);



extern struct platform_driver tegra_display_hub_driver;

extern struct platform_driver tegra_dc_driver;

CRA Git | Maintained and supported by SUSTech CRA and CCSE