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

Commit a37cd25c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "drm/msm/sde: output black frame during resume operation""

parents 505d3dc6 74609d25
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@
#include "sde_plane.h"
#include "sde_color_processing.h"

static bool suspend_blank = true;
module_param(suspend_blank, bool, 0400);
MODULE_PARM_DESC(suspend_blank,
		"If set, active planes will force their outputs to black,\n"
		"by temporarily enabling the color fill, when recovering\n"
		"from a system resume instead of attempting to display the\n"
		"last provided frame buffer.");

#define SDE_DEBUG_PLANE(pl, fmt, ...) SDE_DEBUG("plane%d " fmt,\
		(pl) ? (pl)->base.base.id : -1, ##__VA_ARGS__)

@@ -1753,10 +1745,6 @@ void sde_plane_flush(struct drm_plane *plane)
			pp->pipe_hw->ops.setup_csc(pp->pipe_hw, pp->csc_ptr);
	}

	/* force black color fill during suspend */
	if (msm_is_suspend_state(plane->dev) && suspend_blank)
		_sde_plane_color_fill(pp, 0x0, 0x0);

	/* flag h/w flush complete */
	if (plane->state)
		to_sde_plane_state(plane->state)->pending = false;