From 214d6e822254d9684f028c22e832cd1135dc598d Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 4 Nov 2011 17:31:41 +0900 Subject: [PATCH] --- yaml --- r: 276015 b: refs/heads/master c: b0e0f85631f9d905095d2896a952430f5eb0aba1 h: refs/heads/master i: 276013: e8674b87848be62f57a8dc274573ae3f5158129e 276011: f1f55045a4aaed221accc7537a693b097e30cdff 276007: 769db6560d9b9d22f67f183221e4c2fecc279214 275999: d004455ee60f340a64212ded225efcdddf845ac2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 403eb7b271e3..f2b1716bbd77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2716c896d305fb5d3d0d7f58394c17841ed2967 +refs/heads/master: b0e0f85631f9d905095d2896a952430f5eb0aba1 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c index f15da9581a1e..866f419f485b 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -283,7 +283,8 @@ void exynos_drm_encoder_crtc_mode_set(struct drm_encoder *encoder, void *data) struct exynos_drm_overlay_ops *overlay_ops = manager->overlay_ops; struct exynos_drm_overlay *overlay = data; - overlay_ops->mode_set(manager->dev, overlay); + if (overlay_ops && overlay_ops->mode_set) + overlay_ops->mode_set(manager->dev, overlay); } void exynos_drm_encoder_crtc_disable(struct drm_encoder *encoder, void *data) @@ -294,7 +295,8 @@ void exynos_drm_encoder_crtc_disable(struct drm_encoder *encoder, void *data) DRM_DEBUG_KMS("\n"); - overlay_ops->disable(manager->dev); + if (overlay_ops && overlay_ops->disable) + overlay_ops->disable(manager->dev); /* * crtc is already detached from encoder and last