drm/msm/dpu: simplify DPU_SSPP features checks

Add DPU_SSPP_CSC_ANY denoting any CSC block. As we are at it, rewrite
DPU_SSPP_SCALER (any scaler) to use BIT(x) instead of hand-coded
bitshifts.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20211201225140.2481577-4-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
index ad2002d75739475a454c0a677897bb55da28761d..3c53bd03bdeb3aeceb57e3ea3c097c368099465d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
@@ -25,11 +25,17 @@ struct dpu_hw_pipe;
 /**
  * Define all scaler feature bits in catalog
  */
-#define DPU_SSPP_SCALER ((1UL << DPU_SSPP_SCALER_RGB) | \
-       (1UL << DPU_SSPP_SCALER_QSEED2) | \
-        (1UL << DPU_SSPP_SCALER_QSEED3) | \
-        (1UL << DPU_SSPP_SCALER_QSEED3LITE) | \
-         (1UL << DPU_SSPP_SCALER_QSEED4))
+#define DPU_SSPP_SCALER (BIT(DPU_SSPP_SCALER_RGB) | \
+                        BIT(DPU_SSPP_SCALER_QSEED2) | \
+                        BIT(DPU_SSPP_SCALER_QSEED3) | \
+                        BIT(DPU_SSPP_SCALER_QSEED3LITE) | \
+                        BIT(DPU_SSPP_SCALER_QSEED4))
+
+/*
+ * Define all CSC feature bits in catalog
+ */
+#define DPU_SSPP_CSC_ANY (BIT(DPU_SSPP_CSC) | \
+                         BIT(DPU_SSPP_CSC_10BIT))
 
 /**
  * Component indices

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index efefcc0af27a39a7b93a32ea9105e354276fd5f5..3d8cafdd70169abc3c7c9f358e102637bc2a9694 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1010,8 +1010,7 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
 
        if (DPU_FORMAT_IS_YUV(fmt) &&
                (!(pdpu->pipe_hw->cap->features & DPU_SSPP_SCALER) ||
-                !(pdpu->pipe_hw->cap->features & (BIT(DPU_SSPP_CSC)
-                | BIT(DPU_SSPP_CSC_10BIT))))) {
+                !(pdpu->pipe_hw->cap->features & DPU_SSPP_CSC_ANY))) {
                DPU_DEBUG_PLANE(pdpu,
                                "plane doesn't have scaler/csc for yuv\n");
                return -EINVAL;