From ad69f4cc0c70cb48bac6a7dbeffeb56bce90d91f Mon Sep 17 00:00:00 2001 From: Andhavarapu Karthik Date: Thu, 20 May 2021 12:59:43 +0530 Subject: [PATCH] disp: rotator: add rev checks for rotator for blair target Add revision checks required for rotator for blair target. Change-Id: I04b107b5c85a20585a473a0ace56be07b26a357f Signed-off-by: Andhavarapu Karthik --- rotator/sde_rotator_base.h | 3 ++- rotator/sde_rotator_r3.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rotator/sde_rotator_base.h b/rotator/sde_rotator_base.h index 620bf94ade4a..ece09b8edf06 100644 --- a/rotator/sde_rotator_base.h +++ b/rotator/sde_rotator_base.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */ #ifndef __SDE_ROTATOR_BASE_H__ @@ -48,6 +48,7 @@ #define SDE_MDP_HW_REV_600 SDE_MDP_REV(6, 0, 0) /* msmnile+ v1.0 */ #define SDE_MDP_HW_REV_630 SDE_MDP_REV(6, 3, 0) /* bengal v1.0 */ #define SDE_MDP_HW_REV_660 SDE_MDP_REV(6, 6, 0) /* holi */ +#define SDE_MDP_HW_REV_690 SDE_MDP_REV(6, 9, 0) /* blair */ #define SDE_MDP_VBIF_4_LEVEL_REMAPPER 4 #define SDE_MDP_VBIF_8_LEVEL_REMAPPER 8 diff --git a/rotator/sde_rotator_r3.c b/rotator/sde_rotator_r3.c index 5a1f4ebae7d4..19100a5bcd49 100644 --- a/rotator/sde_rotator_r3.c +++ b/rotator/sde_rotator_r3.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "%s:%d: " fmt, __func__, __LINE__ @@ -3501,7 +3501,8 @@ static int sde_rotator_hw_rev_init(struct sde_hw_rotator *rot) rot->downscale_caps = "LINEAR/1.5/2/4/8/16/32/64 TILE/1.5/2/4 TP10/1.5/2"; } else if (IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version, - SDE_MDP_HW_REV_660)) { + SDE_MDP_HW_REV_660) || IS_SDE_MAJOR_MINOR_SAME( + mdata->mdss_version, SDE_MDP_HW_REV_690)) { SDEROT_DBG("Sys cache inline rotation not supported\n"); set_bit(SDE_CAPS_PARTIALWR, mdata->sde_caps_map); set_bit(SDE_CAPS_HW_TIMESTAMP, mdata->sde_caps_map);