diff options
| author | Inki Dae <inki.dae@samsung.com> | 2012-07-27 11:09:46 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2012-07-27 11:09:46 +0900 |
| commit | faa3d77749ad30d2e1c48e2e4363b9c4889aca27 (patch) | |
| tree | a3b61011d6861704470a821d5136d1479d7ee2a2 /drivers/gpu/drm/exynos/exynos_drm_encoder.c | |
| parent | e728519ea853a4f693577decfd2f5eb7e4a3a20d (diff) | |
| parent | 98c7b42375011ec37251e6fc85a0471cfe499eea (diff) | |
| download | talos-op-linux-faa3d77749ad30d2e1c48e2e4363b9c4889aca27.tar.gz talos-op-linux-faa3d77749ad30d2e1c48e2e4363b9c4889aca27.zip | |
Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_encoder.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_encoder.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 6e9ac7bd1dcf..4a13a747f5d4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -108,7 +108,7 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) static bool exynos_drm_encoder_mode_fixup(struct drm_encoder *encoder, - struct drm_display_mode *mode, + const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { struct drm_device *dev = encoder->dev; @@ -172,19 +172,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder) manager_ops->commit(manager->dev); } -static struct drm_crtc * -exynos_drm_encoder_get_crtc(struct drm_encoder *encoder) -{ - return encoder->crtc; -} - static struct drm_encoder_helper_funcs exynos_encoder_helper_funcs = { .dpms = exynos_drm_encoder_dpms, .mode_fixup = exynos_drm_encoder_mode_fixup, .mode_set = exynos_drm_encoder_mode_set, .prepare = exynos_drm_encoder_prepare, .commit = exynos_drm_encoder_commit, - .get_crtc = exynos_drm_encoder_get_crtc, }; static void exynos_drm_encoder_destroy(struct drm_encoder *encoder) |
