Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c57997bc authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: sor: Add Tegra186 support 



The SOR found on Tegra186 is very similar to the one found on Tegra210
and earlier. However, due to some changes in the display architecture,
some programming sequences have changed and some register have moved
around.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 880cee0b

drivers/gpu/drm/tegra/dc.c

+13 −0
Original line number Diff line number Diff line
@@ -54,6 +54,19 @@ static u32 tegra_dc_readl_active(struct tegra_dc *dc, unsigned long offset) 
	return value;

}



bool tegra_dc_has_output(struct tegra_dc *dc, struct device *dev)

{

	struct device_node *np = dc->dev->of_node;

	struct of_phandle_iterator it;

	int err;



	of_for_each_phandle(&it, err, np, "nvidia,outputs", NULL, 0)

		if (it.node == dev->of_node)

			return true;



	return false;

}



/*

 * Double-buffered registers have two copies: ASSEMBLY and ACTIVE. When the

 * *_ACT_REQ bits are set the ASSEMBLY copy is latched into the ACTIVE copy.

drivers/gpu/drm/tegra/dc.h

+3 −2
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct tegra_dc_window { 
};



/* from dc.c */

bool tegra_dc_has_output(struct tegra_dc *dc, struct device *dev);

void tegra_dc_commit(struct tegra_dc *dc);

int tegra_dc_state_setup_clock(struct tegra_dc *dc,

			       struct drm_crtc_state *crtc_state,
@@ -289,10 +290,10 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc); 
#define HDMI_ENABLE	(1 << 30)

#define DSI_ENABLE	(1 << 29)

#define SOR1_TIMING_CYA	(1 << 27)

#define SOR1_ENABLE	(1 << 26)

#define SOR_ENABLE	(1 << 25)

#define CURSOR_ENABLE	(1 << 16)



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



#define DC_DISP_DISP_MEM_HIGH_PRIORITY		0x403

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

#define WINDOW_A_THRESHOLD(x) (((x) & 0x7f) << 16)

drivers/gpu/drm/tegra/drm.c

+2 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,8 @@ static const struct of_device_id host1x_drm_subdevs[] = { 
	{ .compatible = "nvidia,tegra210-vic", },

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

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

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

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

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

	{ /* sentinel */ }

};

drivers/gpu/drm/tegra/drm.h

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ int tegra_output_probe(struct tegra_output *output); 
void tegra_output_remove(struct tegra_output *output);

int tegra_output_init(struct drm_device *drm, struct tegra_output *output);

void tegra_output_exit(struct tegra_output *output);

void tegra_output_find_possible_crtcs(struct tegra_output *output,

				      struct drm_device *drm);



int tegra_output_connector_get_modes(struct drm_connector *connector);

enum drm_connector_status

drivers/gpu/drm/tegra/output.c

+24 −0
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_panel.h>



#include "drm.h"

#include "dc.h"



#include <media/cec-notifier.h>
@@ -218,3 +220,25 @@ void tegra_output_exit(struct tegra_output *output) 
	if (output->panel)

		drm_panel_detach(output->panel);

}



void tegra_output_find_possible_crtcs(struct tegra_output *output,

				      struct drm_device *drm)

{

	struct device *dev = output->dev;

	struct drm_crtc *crtc;

	unsigned int mask = 0;



	drm_for_each_crtc(crtc, drm) {

		struct tegra_dc *dc = to_tegra_dc(crtc);



		if (tegra_dc_has_output(dc, dev))

			mask |= drm_crtc_mask(crtc);

	}



	if (mask == 0) {

		dev_warn(dev, "missing output definition for heads in DT\n");

		mask = 0x3;

	}



	output->encoder.possible_crtcs = mask;

}