Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276015
b: refs/heads/master
c: b0e0f85
h: refs/heads/master
i:
  276013: e8674b8
  276011: f1f5504
  276007: 769db65
  275999: d004455
v: v3
  • Loading branch information
Seung-Woo Kim authored and Inki Dae committed Nov 15, 2011
1 parent 32ad4ad commit 214d6e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2716c896d305fb5d3d0d7f58394c17841ed2967
refs/heads/master: b0e0f85631f9d905095d2896a952430f5eb0aba1
6 changes: 4 additions & 2 deletions trunk/drivers/gpu/drm/exynos/exynos_drm_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 214d6e8

Please sign in to comment.