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

Commit dd9b41f3 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: avoid drm_for_each_connector usage in encoder" into msm-4.9

parents 4f3c9031 05431f32
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 */

#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__
@@ -948,12 +947,7 @@ static void sde_encoder_phys_wb_enable(struct sde_encoder_phys *phys_enc)
	dev = wb_enc->base.parent->dev;

	/* find associated writeback connector */
	mutex_lock(&dev->mode_config.mutex);
	drm_for_each_connector(connector, phys_enc->parent->dev) {
		if (connector->encoder == phys_enc->parent)
			break;
	}
	mutex_unlock(&dev->mode_config.mutex);
	connector = phys_enc->connector;

	if (!connector || connector->encoder != phys_enc->parent) {
		SDE_ERROR("failed to find writeback connector\n");