Commit ef55d153 authored by Dave Airlie's avatar Dave Airlie

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
...@@ -2009,9 +2009,9 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment