Commit c106c5e2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm/tegra: Changes for v5.12-rc1

Adds support for newer firmware image versions of the Video Image
Composer (VIC) and adds a comment clarifying the use of the STREAMID
registers. Fixes a couple of issues with display and gr2d on older
Tegra SoCs such as Tegra114, as well as a runtime PM reference leak.

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

From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210129193807.3653456-1-thierry.reding@gmail.com
parents af2922fa dcdfe271

drivers/gpu/drm/tegra/dc.c

+1 −1
Original line number Diff line number Diff line
@@ -2186,7 +2186,7 @@ static int tegra_dc_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/drm.c

+2 −0
Original line number Diff line number Diff line
@@ -1301,8 +1301,10 @@ static const struct of_device_id host1x_drm_subdevs[] = { 
	{ .compatible = "nvidia,tegra30-hdmi", },

	{ .compatible = "nvidia,tegra30-gr2d", },

	{ .compatible = "nvidia,tegra30-gr3d", },

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

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

	{ .compatible = "nvidia,tegra114-hdmi", },

	{ .compatible = "nvidia,tegra114-gr2d", },

	{ .compatible = "nvidia,tegra114-gr3d", },

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

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

drivers/gpu/drm/tegra/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static int tegra_dsi_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/falcon.c

+5 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int falcon_parse_firmware_image(struct falcon *falcon) 
	struct falcon_fw_os_header_v1 *os;



	/* endian problems would show up right here */

	if (bin->magic != PCI_VENDOR_ID_NVIDIA) {

	if (bin->magic != PCI_VENDOR_ID_NVIDIA && bin->magic != 0x10fe) {

		dev_err(falcon->dev, "incorrect firmware magic\n");

		return -EINVAL;

	}
@@ -178,9 +178,10 @@ int falcon_boot(struct falcon *falcon) 
				  falcon->firmware.data.offset + offset,

				  offset, FALCON_MEMORY_DATA);



	/* copy the first code segment into Falcon internal memory */

	falcon_copy_chunk(falcon, falcon->firmware.code.offset,

			  0, FALCON_MEMORY_IMEM);

	/* copy the code segment into Falcon internal memory */

	for (offset = 0; offset < falcon->firmware.code.size; offset += 256)

		falcon_copy_chunk(falcon, falcon->firmware.code.offset + offset,

				  offset, FALCON_MEMORY_IMEM);



	/* setup falcon interrupts */

	falcon_writel(falcon, FALCON_IRQMSET_EXT(0xff) |

drivers/gpu/drm/tegra/gr2d.c

+7 −2
Original line number Diff line number Diff line
@@ -161,9 +161,14 @@ static const struct gr2d_soc tegra30_gr2d_soc = { 
	.version = 0x30,

};



static const struct gr2d_soc tegra114_gr2d_soc = {

	.version = 0x35,

};



static const struct of_device_id gr2d_match[] = {

	{ .compatible = "nvidia,tegra30-gr2d", .data = &tegra20_gr2d_soc },

	{ .compatible = "nvidia,tegra20-gr2d", .data = &tegra30_gr2d_soc },

	{ .compatible = "nvidia,tegra114-gr2d", .data = &tegra114_gr2d_soc },

	{ .compatible = "nvidia,tegra30-gr2d", .data = &tegra30_gr2d_soc },

	{ .compatible = "nvidia,tegra20-gr2d", .data = &tegra20_gr2d_soc },

	{ },

};

MODULE_DEVICE_TABLE(of, gr2d_match);