diff options
author | Dave Airlie <airlied@redhat.com> | 2015-01-08 18:13:41 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-01-08 18:13:41 -0500 |
commit | e5202a2289d746a94703ad937157d398fb2607cf (patch) | |
tree | b0b8869adfa0e4c0dc05f7a11588e5e21a580755 /drivers/gpu/drm/tegra | |
parent | b1940cd21c0f4abdce101253e860feff547291b0 (diff) | |
parent | 7552e7dd9527c41f891c87854418896eaf309c20 (diff) |
Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next
Misc drm patches with mostly polish patches from Thierry, with a bit of
generic mode validation from Ville and a few other oddball things.
* tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel: (25 commits)
drm: Include drm_crtc_helper.h in DocBook
drm: Make drm_crtc_helper.h standalone includible
drm: Move IRQ related fields to proper section
drm: Remove stale comment
drm: Do basic sanity checks for user modes
drm: Perform basic sanity checks on probed modes
drm: Reorganize probed mode validation
drm/doc: Remove duplicate "by"
drm/info: Remove unused code
drm/cache: Use wbinvd helpers
drm/plane-helper: Test for plane disable earlier
drm/doc: Document drm_add_modes_noedid() usage
drm: bit of spell-check / editorializing.
drm: Prefer sizeof(type) over sizeof type
drm: Remove useless else block
drm: Remove unneeded braces for single statement blocks
drm: Do not assign in if condition
drm: Prefer kmalloc_array() over kmalloc() with multiply
drm: Prefer kcalloc() over kzalloc() with multiply
drm: Miscellaneous checkpatch whitespace cleanups
...
Diffstat (limited to 'drivers/gpu/drm/tegra')
-rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 978993fa3a36..ae26cc054fff 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c | |||
@@ -1119,10 +1119,6 @@ static void tegra_crtc_commit(struct drm_crtc *crtc) | |||
1119 | tegra_dc_commit(dc); | 1119 | tegra_dc_commit(dc); |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | static void tegra_crtc_load_lut(struct drm_crtc *crtc) | ||
1123 | { | ||
1124 | } | ||
1125 | |||
1126 | static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = { | 1122 | static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = { |
1127 | .disable = tegra_crtc_disable, | 1123 | .disable = tegra_crtc_disable, |
1128 | .mode_fixup = tegra_crtc_mode_fixup, | 1124 | .mode_fixup = tegra_crtc_mode_fixup, |
@@ -1130,7 +1126,6 @@ static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = { | |||
1130 | .mode_set_base = tegra_crtc_mode_set_base, | 1126 | .mode_set_base = tegra_crtc_mode_set_base, |
1131 | .prepare = tegra_crtc_prepare, | 1127 | .prepare = tegra_crtc_prepare, |
1132 | .commit = tegra_crtc_commit, | 1128 | .commit = tegra_crtc_commit, |
1133 | .load_lut = tegra_crtc_load_lut, | ||
1134 | }; | 1129 | }; |
1135 | 1130 | ||
1136 | static irqreturn_t tegra_dc_irq(int irq, void *data) | 1131 | static irqreturn_t tegra_dc_irq(int irq, void *data) |