Merge "disp: msm: sde: check correct field for XIN idle status" into display-kernel.lnx.5.4

This commit is contained in:
Linux Build Service Account
2020-01-23 14:18:29 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*/ */
#include "sde_hwio.h" #include "sde_hwio.h"
@@ -178,7 +178,7 @@ static bool sde_hw_get_halt_ctrl(struct sde_hw_vbif *vbif,
reg_val = SDE_REG_READ(c, VBIF_XIN_HALT_CTRL1); reg_val = SDE_REG_READ(c, VBIF_XIN_HALT_CTRL1);
return (reg_val & BIT(xin_id)) ? true : false; return ((reg_val >> 16) & BIT(xin_id)) ? true : false;
} }
static void sde_hw_set_qos_remap(struct sde_hw_vbif *vbif, static void sde_hw_set_qos_remap(struct sde_hw_vbif *vbif,