Skip to content

Commit 7cac945

Browse files
mlankhorstdanvet
authored andcommitted
drm/i915: Rename intel_crtc_dpms_overlay.
To make it clear that it isn't called during crtc enable. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1 parent 87d4300 commit 7cac945

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4716,9 +4716,9 @@ static void intel_crtc_load_lut(struct drm_crtc *crtc)
47164716
hsw_enable_ips(intel_crtc);
47174717
}
47184718

4719-
static void intel_crtc_dpms_overlay(struct intel_crtc *intel_crtc, bool enable)
4719+
static void intel_crtc_dpms_overlay_disable(struct intel_crtc *intel_crtc)
47204720
{
4721-
if (!enable && intel_crtc->overlay) {
4721+
if (intel_crtc->overlay) {
47224722
struct drm_device *dev = intel_crtc->base.dev;
47234723
struct drm_i915_private *dev_priv = dev->dev_private;
47244724

@@ -4847,7 +4847,6 @@ static void intel_crtc_enable_planes(struct drm_crtc *crtc)
48474847
intel_enable_primary_hw_plane(crtc->primary, crtc);
48484848
intel_enable_sprite_planes(crtc);
48494849
intel_crtc_update_cursor(crtc, true);
4850-
intel_crtc_dpms_overlay(intel_crtc, true);
48514850

48524851
intel_post_enable_primary(crtc);
48534852
}
@@ -4863,7 +4862,7 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc)
48634862

48644863
intel_pre_disable_primary(crtc);
48654864

4866-
intel_crtc_dpms_overlay(intel_crtc, false);
4865+
intel_crtc_dpms_overlay_disable(intel_crtc);
48674866
for_each_intel_plane(dev, intel_plane) {
48684867
if (intel_plane->pipe == pipe) {
48694868
struct drm_crtc *from = intel_plane->base.crtc;

0 commit comments

Comments
 (0)