Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2debab97 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: omapdrm: Rename omap_plane_dpms() to omap_plane_set_enable() 



The planes don't care about DPMS states, don't propagate it
unnecessarily to the plane functions.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent ef6b0e02

drivers/gpu/drm/omapdrm/omap_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void omap_crtc_dpms(struct drm_crtc *crtc, int mode) 
		for (i = 0; i < priv->num_planes; i++) {

			struct drm_plane *plane = priv->planes[i];

			if (plane->crtc == crtc)

				WARN_ON(omap_plane_dpms(plane, mode));

				WARN_ON(omap_plane_set_enable(plane, enabled));

		}

	}

}

drivers/gpu/drm/omapdrm/omap_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void omap_crtc_flush(struct drm_crtc *crtc); 


struct drm_plane *omap_plane_init(struct drm_device *dev,

		int id, enum drm_plane_type type);

int omap_plane_dpms(struct drm_plane *plane, int mode);

int omap_plane_set_enable(struct drm_plane *plane, bool enable);

int omap_plane_mode_set(struct drm_plane *plane,

		struct drm_crtc *crtc, struct drm_framebuffer *fb,

		int crtc_x, int crtc_y,

drivers/gpu/drm/omapdrm/omap_plane.c

+7 −9
Original line number Diff line number Diff line
@@ -257,8 +257,9 @@ static int omap_plane_update(struct drm_plane *plane, 
static int omap_plane_disable(struct drm_plane *plane)

{

	struct omap_plane *omap_plane = to_omap_plane(plane);



	omap_plane->win.rotation = BIT(DRM_ROTATE_0);

	return omap_plane_dpms(plane, DRM_MODE_DPMS_OFF);

	return omap_plane_set_enable(plane, false);

}



static void omap_plane_destroy(struct drm_plane *plane)
@@ -277,18 +278,15 @@ static void omap_plane_destroy(struct drm_plane *plane) 
	kfree(omap_plane);

}



int omap_plane_dpms(struct drm_plane *plane, int mode)

int omap_plane_set_enable(struct drm_plane *plane, bool enable)

{

	struct omap_plane *omap_plane = to_omap_plane(plane);

	bool enabled = (mode == DRM_MODE_DPMS_ON);

	int ret = 0;



	if (enabled != omap_plane->enabled) {

		omap_plane->enabled = enabled;

		ret = apply(plane);

	}

	if (enable == omap_plane->enabled)

		return 0;



	return ret;

	omap_plane->enabled = enable;

	return apply(plane);

}



/* helper to install properties which are common to planes and crtcs */