summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/imx/imx-tve.c
diff options
context:
space:
mode:
authorRich Felker <dalias@libc.org>2016-03-30 00:53:03 +0300
committerRich Felker <dalias@libc.org>2016-03-30 00:53:03 +0300
commit16b02d711f4059b8338ef967064195b47cae65ea (patch)
tree6d3e0b7629210b56f8d6cfa39184c878d8a15367 /drivers/gpu/drm/imx/imx-tve.c
parentb15d53d009558d14c4f394a6d1fa2039c7f45c43 (diff)
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
downloadlinux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'drivers/gpu/drm/imx/imx-tve.c')
-rw-r--r--drivers/gpu/drm/imx/imx-tve.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 292349f0b132..ae7a9fb3b8a2 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -286,13 +286,6 @@ static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode)
dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret);
}
-static bool imx_tve_encoder_mode_fixup(struct drm_encoder *encoder,
- const struct drm_display_mode *mode,
- struct drm_display_mode *adjusted_mode)
-{
- return true;
-}
-
static void imx_tve_encoder_prepare(struct drm_encoder *encoder)
{
struct imx_tve *tve = enc_to_tve(encoder);
@@ -379,7 +372,6 @@ static const struct drm_encoder_funcs imx_tve_encoder_funcs = {
static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {
.dpms = imx_tve_encoder_dpms,
- .mode_fixup = imx_tve_encoder_mode_fixup,
.prepare = imx_tve_encoder_prepare,
.mode_set = imx_tve_encoder_mode_set,
.commit = imx_tve_encoder_commit,