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

Commit 309048ef authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: correct clamp shift for csc 10" into msm-4.9

parents d3756c00 eab00a0c

drivers/gpu/drm/msm/sde/sde_hw_sspp.c

+5 −2
Original line number Diff line number Diff line
@@ -895,14 +895,17 @@ static void sde_hw_sspp_setup_csc(struct sde_hw_pipe *ctx, 
		struct sde_csc_cfg *data)

{

	u32 idx;

	bool csc10 = false;



	if (_sspp_subblk_offset(ctx, SDE_SSPP_CSC, &idx) || !data)

		return;



	if (test_bit(SDE_SSPP_CSC_10BIT, &ctx->cap->features))

	if (test_bit(SDE_SSPP_CSC_10BIT, &ctx->cap->features)) {

		idx += CSC_10BIT_OFFSET;

		csc10 = true;

	}



	sde_hw_csc_setup(&ctx->hw, idx, data);

	sde_hw_csc_setup(&ctx->hw, idx, data, csc10);

}



static void sde_hw_sspp_setup_sharpening(struct sde_hw_pipe *ctx,

drivers/gpu/drm/msm/sde/sde_hw_util.c

+9 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -42,9 +42,10 @@ u32 *sde_hw_util_get_log_mask_ptr(void) 


void sde_hw_csc_setup(struct sde_hw_blk_reg_map *c,

		u32 csc_reg_off,

		struct sde_csc_cfg *data)

		struct sde_csc_cfg *data, bool csc10)

{

	static const u32 matrix_shift = 7;

	u32 clamp_shift = csc10 ? 16 : 8;

	u32 val;



	/* matrix coeff - convert S15.16 to S4.9 */
@@ -64,19 +65,19 @@ void sde_hw_csc_setup(struct sde_hw_blk_reg_map *c, 
	SDE_REG_WRITE(c, csc_reg_off + 0x10, val);



	/* Pre clamp */

	val = (data->csc_pre_lv[0] << 8) | data->csc_pre_lv[1];

	val = (data->csc_pre_lv[0] << clamp_shift) | data->csc_pre_lv[1];

	SDE_REG_WRITE(c, csc_reg_off + 0x14, val);

	val = (data->csc_pre_lv[2] << 8) | data->csc_pre_lv[3];

	val = (data->csc_pre_lv[2] << clamp_shift) | data->csc_pre_lv[3];

	SDE_REG_WRITE(c, csc_reg_off + 0x18, val);

	val = (data->csc_pre_lv[4] << 8) | data->csc_pre_lv[5];

	val = (data->csc_pre_lv[4] << clamp_shift) | data->csc_pre_lv[5];

	SDE_REG_WRITE(c, csc_reg_off + 0x1c, val);



	/* Post clamp */

	val = (data->csc_post_lv[0] << 8) | data->csc_post_lv[1];

	val = (data->csc_post_lv[0] << clamp_shift) | data->csc_post_lv[1];

	SDE_REG_WRITE(c, csc_reg_off + 0x20, val);

	val = (data->csc_post_lv[2] << 8) | data->csc_post_lv[3];

	val = (data->csc_post_lv[2] << clamp_shift) | data->csc_post_lv[3];

	SDE_REG_WRITE(c, csc_reg_off + 0x24, val);

	val = (data->csc_post_lv[4] << 8) | data->csc_post_lv[5];

	val = (data->csc_post_lv[4] << clamp_shift) | data->csc_post_lv[5];

	SDE_REG_WRITE(c, csc_reg_off + 0x28, val);



	/* Pre-Bias */

drivers/gpu/drm/msm/sde/sde_hw_util.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void *sde_hw_util_get_dir(void); 


void sde_hw_csc_setup(struct sde_hw_blk_reg_map  *c,

		u32 csc_reg_off,

		struct sde_csc_cfg *data);

		struct sde_csc_cfg *data, bool csc10);



#endif /* _SDE_HW_UTIL_H */