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

Commit 459cc2c6 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: sor: Add HDMI support 



The SOR1 introduced on Tegra210 supports HDMI 2.0 and DisplayPort. Add
HDMI support and name the debugfs node after the type of SOR. The SOR
introduced with Tegra124 is known simply as "sor", whereas the
additional SOR found on Tegra210 is known as "sor1".

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

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ of the following host1x client modules: 
    - "nvidia,tegra124-sor": for Tegra124 and Tegra132

    - "nvidia,tegra132-sor": for Tegra132

    - "nvidia,tegra210-sor": for Tegra210

    - "nvidia,tegra210-sor1": for Tegra210

  - reg: Physical base address and length of the controller's registers.

  - interrupts: The interrupt outputs from the controller.

  - clocks: Must contain an entry for each entry in clock-names.

drivers/gpu/drm/tegra/dc.h

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ 
#define DC_DISP_DISP_WIN_OPTIONS		0x402

#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)
@@ -247,9 +249,11 @@ 
#define BASE_COLOR_SIZE565     (6 << 0)

#define BASE_COLOR_SIZE332     (7 << 0)

#define BASE_COLOR_SIZE888     (8 << 0)

#define DITHER_CONTROL_MASK    (3 << 8)

#define DITHER_CONTROL_DISABLE (0 << 8)

#define DITHER_CONTROL_ORDERED (2 << 8)

#define DITHER_CONTROL_ERRDIFF (3 << 8)

#define BASE_COLOR_SIZE_MASK   (0xf << 0)

#define BASE_COLOR_SIZE_666    (0 << 0)

#define BASE_COLOR_SIZE_111    (1 << 0)

#define BASE_COLOR_SIZE_222    (2 << 0)

drivers/gpu/drm/tegra/drm.c

+1 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { 
	{ .compatible = "nvidia,tegra210-dc", },

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

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

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

	{ /* sentinel */ }

};