Commit b1665047 authored by Jessica Zhang's avatar Jessica Zhang Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: Add interface support for CRC debugfs 



Add support for writing CRC values for the interface block to
the debugfs by calling the necessary MISR setup/collect methods.

Changes since V1:
- Set values_cnt to only include phys with backing hw_intf
- Loop over all drm_encs connected to crtc

Changes since V2:
- Remove vblank.h inclusion
- Change `pos + i` to `pos + entries`
- Initialize values_cnt to 0 for encoder
- Change DPU_CRTC_CRC_SOURCE_INTF to DPU_CRTC_CRC_SOURCE_ENCODER (and
  "intf" to "enc")
- Change dpu_encoder_get_num_phys to dpu_encoder_get_num_hw_intfs
- Add checks for setup_misr and collect_misr in
  dpu_encoder_get_num_hw_intfs

Changes since V3:
- Remove extra whitespace
- Change "enc" to "encoder"
- Move crcs array to dpu_crtc_get_encoder_crc
- Rename dpu_encoder_get_num_hw_intfs to dpu_encoder_get_crc_values_cnt

Signed-off-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/490736/
Link: https://lore.kernel.org/r/20220622171835.7558-5-quic_jesszhan@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 91143873

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+45 −1
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ static enum dpu_crtc_crc_source dpu_crtc_parse_crc_source(const char *src_name) 
	if (!strcmp(src_name, "auto") ||

	    !strcmp(src_name, "lm"))

		return DPU_CRTC_CRC_SOURCE_LAYER_MIXER;

	if (!strcmp(src_name, "encoder"))

		return DPU_CRTC_CRC_SOURCE_ENCODER;



	return DPU_CRTC_CRC_SOURCE_INVALID;

}
@@ -94,8 +96,16 @@ static int dpu_crtc_verify_crc_source(struct drm_crtc *crtc, 
		return -EINVAL;

	}



	if (source == DPU_CRTC_CRC_SOURCE_LAYER_MIXER)

	if (source == DPU_CRTC_CRC_SOURCE_LAYER_MIXER) {

		*values_cnt = crtc_state->num_mixers;

	} else if (source == DPU_CRTC_CRC_SOURCE_ENCODER) {

		struct drm_encoder *drm_enc;



		*values_cnt = 0;



		drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc->state->encoder_mask)

			*values_cnt += dpu_encoder_get_crc_values_cnt(drm_enc);

	}



	return 0;

}
@@ -116,6 +126,14 @@ static void dpu_crtc_setup_lm_misr(struct dpu_crtc_state *crtc_state) 
	}

}



static void dpu_crtc_setup_encoder_misr(struct drm_crtc *crtc)

{

	struct drm_encoder *drm_enc;



	drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc->state->encoder_mask)

		dpu_encoder_setup_misr(drm_enc);

}



static int dpu_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)

{

	enum dpu_crtc_crc_source source = dpu_crtc_parse_crc_source(src_name);
@@ -164,6 +182,8 @@ static int dpu_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name) 


	if (source == DPU_CRTC_CRC_SOURCE_LAYER_MIXER)

		dpu_crtc_setup_lm_misr(crtc_state);

	else if (source == DPU_CRTC_CRC_SOURCE_ENCODER)

		dpu_crtc_setup_encoder_misr(crtc);

	else

		ret = -EINVAL;
@@ -215,6 +235,28 @@ static int dpu_crtc_get_lm_crc(struct drm_crtc *crtc, 
			drm_crtc_accurate_vblank_count(crtc), crcs);

}



static int dpu_crtc_get_encoder_crc(struct drm_crtc *crtc)

{

	struct drm_encoder *drm_enc;

	int rc, pos = 0;

	u32 crcs[INTF_MAX];



	drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc->state->encoder_mask) {

		rc = dpu_encoder_get_crc(drm_enc, crcs, pos);

		if (rc < 0) {

			if (rc != -ENODATA)

				DRM_DEBUG_DRIVER("MISR read failed\n");



			return rc;

		}



		pos += rc;

	}



	return drm_crtc_add_crc_entry(crtc, true,

			drm_crtc_accurate_vblank_count(crtc), crcs);

}



static int dpu_crtc_get_crc(struct drm_crtc *crtc)

{

	struct dpu_crtc_state *crtc_state = to_dpu_crtc_state(crtc->state);
@@ -227,6 +269,8 @@ static int dpu_crtc_get_crc(struct drm_crtc *crtc) 


	if (crtc_state->crc_source == DPU_CRTC_CRC_SOURCE_LAYER_MIXER)

		return dpu_crtc_get_lm_crc(crtc, crtc_state);

	else if (crtc_state->crc_source == DPU_CRTC_CRC_SOURCE_ENCODER)

		return dpu_crtc_get_encoder_crc(crtc);



	return -EINVAL;

}

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h

+3 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>
@@ -73,11 +74,13 @@ struct dpu_crtc_smmu_state_data { 
 * enum dpu_crtc_crc_source: CRC source

 * @DPU_CRTC_CRC_SOURCE_NONE: no source set

 * @DPU_CRTC_CRC_SOURCE_LAYER_MIXER: CRC in layer mixer

 * @DPU_CRTC_CRC_SOURCE_ENCODER: CRC in encoder

 * @DPU_CRTC_CRC_SOURCE_INVALID: Invalid source

 */

enum dpu_crtc_crc_source {

	DPU_CRTC_CRC_SOURCE_NONE = 0,

	DPU_CRTC_CRC_SOURCE_LAYER_MIXER,

	DPU_CRTC_CRC_SOURCE_ENCODER,

	DPU_CRTC_CRC_SOURCE_MAX,

	DPU_CRTC_CRC_SOURCE_INVALID = -1

};

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+64 −0
Original line number Diff line number Diff line
@@ -225,6 +225,70 @@ bool dpu_encoder_is_widebus_enabled(const struct drm_encoder *drm_enc) 
	return dpu_enc->wide_bus_en;

}



int dpu_encoder_get_crc_values_cnt(const struct drm_encoder *drm_enc)

{

	struct dpu_encoder_virt *dpu_enc;

	int i, num_intf = 0;



	dpu_enc = to_dpu_encoder_virt(drm_enc);



	for (i = 0; i < dpu_enc->num_phys_encs; i++) {

		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];



		if (phys->hw_intf && phys->hw_intf->ops.setup_misr

				&& phys->hw_intf->ops.collect_misr)

			num_intf++;

	}



	return num_intf;

}



void dpu_encoder_setup_misr(const struct drm_encoder *drm_enc)

{

	struct dpu_encoder_virt *dpu_enc;



	int i;



	dpu_enc = to_dpu_encoder_virt(drm_enc);



	for (i = 0; i < dpu_enc->num_phys_encs; i++) {

		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];



		if (!phys->hw_intf || !phys->hw_intf->ops.setup_misr)

			continue;



		phys->hw_intf->ops.setup_misr(phys->hw_intf, true, 1);

	}

}



int dpu_encoder_get_crc(const struct drm_encoder *drm_enc, u32 *crcs, int pos)

{

	struct dpu_encoder_virt *dpu_enc;



	int i, rc = 0, entries_added = 0;



	if (!drm_enc->crtc) {

		DRM_ERROR("no crtc found for encoder %d\n", drm_enc->index);

		return -EINVAL;

	}



	dpu_enc = to_dpu_encoder_virt(drm_enc);



	for (i = 0; i < dpu_enc->num_phys_encs; i++) {

		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];



		if (!phys->hw_intf || !phys->hw_intf->ops.collect_misr)

			continue;



		rc = phys->hw_intf->ops.collect_misr(phys->hw_intf, &crcs[pos + entries_added]);

		if (rc)

			return rc;

		entries_added++;

	}



	return entries_added;

}



static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, unsigned bpc)

{

	struct dpu_hw_dither_cfg dither_cfg = { 0 };

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h

+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>
@@ -174,6 +175,27 @@ int dpu_encoder_get_vsync_count(struct drm_encoder *drm_enc); 


bool dpu_encoder_is_widebus_enabled(const struct drm_encoder *drm_enc);



/**

 * dpu_encoder_get_crc_values_cnt - get number of physical encoders contained

 *	in virtual encoder that can collect CRC values

 * @drm_enc:    Pointer to previously created drm encoder structure

 * Returns:     Number of physical encoders for given drm encoder

 */

int dpu_encoder_get_crc_values_cnt(const struct drm_encoder *drm_enc);



/**

 * dpu_encoder_setup_misr - enable misr calculations

 * @drm_enc:    Pointer to previously created drm encoder structure

 */

void dpu_encoder_setup_misr(const struct drm_encoder *drm_encoder);



/**

 * dpu_encoder_get_crc - get the crc value from interface blocks

 * @drm_enc:    Pointer to previously created drm encoder structure

 * Returns:     0 on success, error otherwise

 */

int dpu_encoder_get_crc(const struct drm_encoder *drm_enc, u32 *crcs, int pos);



/**

 * dpu_encoder_use_dsc_merge - returns true if the encoder uses DSC merge topology.

 * @drm_enc:    Pointer to previously created drm encoder structure