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

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

Merge "drm: msm: Do not check for 0 mixer count" into dev/msm-4.14-display

parents e998bba9 b5a43306

drivers/gpu/drm/msm/sde/sde_color_processing.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by
@@ -1063,8 +1063,7 @@ int sde_cp_crtc_set_property(struct drm_crtc *crtc, 
	 * crtc. Check LM and dspp counts based on whether feature is a

	 * dspp/lm feature.

	 */

	if (!sde_crtc->num_mixers ||

	    sde_crtc->num_mixers > ARRAY_SIZE(sde_crtc->mixers)) {

	if (sde_crtc->num_mixers > ARRAY_SIZE(sde_crtc->mixers)) {

		DRM_INFO("Invalid mixer config act cnt %d max cnt %ld\n",

			sde_crtc->num_mixers,

				(long int)ARRAY_SIZE(sde_crtc->mixers));