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

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

Merge tag 'drm/tegra/for-4.16-fixes' of git://anongit.freedesktop.org/tegra/linux into drm-fixes 

drm/tegra: Fixes for v4.16

This contains two small fixes, one which fixes a typo that causes a
crash with the new framebuffer modifier query support and another that
fixes a build warning.

* tag 'drm/tegra/for-4.16-fixes' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: dc: Using NULL instead of plain integer
  drm/tegra: dc: Use correct format array for Tegra124
parents 97130968 ef1b204a

drivers/gpu/drm/tegra/dc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2009,9 +2009,9 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { 
	.coupled_pm = false,

	.coupled_pm = false,

	.has_nvdisplay = false,

	.has_nvdisplay = false,

	.num_primary_formats = ARRAY_SIZE(tegra124_primary_formats),

	.num_primary_formats = ARRAY_SIZE(tegra124_primary_formats),

	.primary_formats = tegra114_primary_formats,

	.primary_formats = tegra124_primary_formats,

	.num_overlay_formats = ARRAY_SIZE(tegra124_overlay_formats),

	.num_overlay_formats = ARRAY_SIZE(tegra124_overlay_formats),

	.overlay_formats = tegra114_overlay_formats,

	.overlay_formats = tegra124_overlay_formats,

};

};





static const struct tegra_dc_soc_info tegra210_dc_soc_info = {

static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
@@ -2160,7 +2160,7 @@ static int tegra_dc_couple(struct tegra_dc *dc) 
		struct device_link *link;

		struct device_link *link;

		struct device *partner;

		struct device *partner;





		partner = driver_find_device(dc->dev->driver, NULL, 0,

		partner = driver_find_device(dc->dev->driver, NULL, NULL,

					     tegra_dc_match_by_pipe);

					     tegra_dc_match_by_pipe);

		if (!partner)

		if (!partner)

			return -EPROBE_DEFER;

			return -EPROBE_DEFER;