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

Commit 5d77c36d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: add support for hardware based rounded corner"

parents 8c0a3f66 4d21a350

msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \ 
	sde/sde_hw_qdss.o \

	sde_dbg.o \

	sde_dbg_evtlog.o \

	sde/sde_hw_rc.o \



msm_drm-$(CONFIG_DRM_SDE_WB) += sde/sde_wb.o \

	sde/sde_encoder_phys_wb.o \

msm/msm_drv.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

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

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -138,6 +138,7 @@ enum msm_mdp_crtc_property { 
	CRTC_PROP_DEST_SCALER_LUT_ED,

	CRTC_PROP_DEST_SCALER_LUT_CIR,

	CRTC_PROP_DEST_SCALER_LUT_SEP,

	CRTC_PROP_DSPP_INFO,



	/* # of blob properties */

	CRTC_PROP_BLOBCOUNT,

msm/sde/sde_color_processing.c

+652 −32

File changed.

Preview size limit exceeded, changes collapsed.

msm/sde/sde_color_processing.h

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

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, 2021, The Linux Foundation. All rights reserved.

 */



#ifndef _SDE_COLOR_PROCESSING_H
@@ -93,6 +93,15 @@ void sde_cp_crtc_destroy_properties(struct drm_crtc *crtc); 
 */

int sde_cp_crtc_set_property(struct drm_crtc *crtc,

				struct drm_property *property, uint64_t val);

/**

 * sde_cp_crtc_check_properties: Verify color processing properties for a crtc.

 *                               Should be called during atomic check call.

 * @crtc: Pointer to crtc.

 * @state: Pointer to crtc state.

 * @returns: 0 on success, non-zero otherwise

 */

int sde_cp_crtc_check_properties(struct drm_crtc *crtc,

					struct drm_crtc_state *state);



/**

 * sde_cp_crtc_apply_properties: Enable/disable properties
@@ -196,4 +205,18 @@ int sde_cp_ltm_off_event_handler(struct drm_crtc *crtc_drm, bool en, 
 * @crtc_drm: Pointer to crtc.

 */

void sde_cp_mode_switch_prop_dirty(struct drm_crtc *crtc_drm);



/**

 * sde_cp_crtc_enable(): enable color processing info in the crtc.

 *                     Should be called during crtc enable.

 * @crtc:  Pointer to drm_crtc.

 */

void sde_cp_crtc_enable(struct drm_crtc *crtc);



/**

 * sde_cp_crtc_disable(): disable color processing info in the crtc.

 *                     Should be called during crtc disable.

 * @crtc:  Pointer to drm_crtc.

 */

void sde_cp_crtc_disable(struct drm_crtc *crtc);

#endif /*_SDE_COLOR_PROCESSING_H */

msm/sde/sde_crtc.c

+33 −4

File changed.

Preview size limit exceeded, changes collapsed.