summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_output.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-05-15 15:24:41 +1000
committerDave Airlie <airlied@redhat.com>2015-05-15 15:24:41 +1000
commitdde10068e1a4798fa44e68a5d08b5dfe3602cbba (patch)
tree5afccf8d62b853ab8aa7b31641ebaf16fd8afe0c /drivers/gpu/drm/armada/armada_output.h
parent72a81683a8feac3c67bac24dfd88f81bac077be0 (diff)
parent38bf3aee3ec7b5b264b701da14114a618cddd1a1 (diff)
downloadlinux-dde10068e1a4798fa44e68a5d08b5dfe3602cbba.tar.gz
linux-dde10068e1a4798fa44e68a5d08b5dfe3602cbba.tar.xz
Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next
some minor cleanups * 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: drm/armada: armada_drv: Remove unused function drm/armada: armada_output: Remove some unused functions
Diffstat (limited to 'drivers/gpu/drm/armada/armada_output.h')
-rw-r--r--drivers/gpu/drm/armada/armada_output.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/armada/armada_output.h b/drivers/gpu/drm/armada/armada_output.h
index 3c4023e142d0..f448785753e8 100644
--- a/drivers/gpu/drm/armada/armada_output.h
+++ b/drivers/gpu/drm/armada/armada_output.h
@@ -21,12 +21,6 @@ struct armada_output_type {
struct drm_encoder *armada_drm_connector_encoder(struct drm_connector *conn);
-void armada_drm_encoder_prepare(struct drm_encoder *encoder);
-void armada_drm_encoder_commit(struct drm_encoder *encoder);
-
-bool armada_drm_encoder_mode_fixup(struct drm_encoder *encoder,
- const struct drm_display_mode *mode, struct drm_display_mode *adj);
-
int armada_drm_slave_encoder_mode_valid(struct drm_connector *conn,
struct drm_display_mode *mode);