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

Commit 2f3e38e3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: fix DSC slice last_group_size config"

parents 05b64a03 bb9b4fe2

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+15 −2
Original line number Diff line number Diff line
@@ -2127,7 +2127,7 @@ int dsi_dsc_populate_static_param(struct msm_display_dsc_info *dsc) 
	int target_bpp_x16;

	int data;

	int final_value, final_scale;

	int ratio_index;

	int ratio_index, mod_offset;



	dsc->rc_model_size = 8192;
@@ -2199,7 +2199,20 @@ int dsi_dsc_populate_static_param(struct msm_display_dsc_info *dsc) 
		dsc->quant_incr_limit1 = 19;

	}



	dsc->slice_last_group_size = 3 - (dsc->slice_width % 3);

	mod_offset = dsc->slice_width % 3;

	switch (mod_offset) {

	case 0:

		dsc->slice_last_group_size = 2;

		break;

	case 1:

		dsc->slice_last_group_size = 0;

		break;

	case 2:

		dsc->slice_last_group_size = 1;

		break;

	default:

		break;

	}



	dsc->det_thresh_flatness = 7 + 2*(bpc - 8);

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -65,7 +65,7 @@ static void sde_hw_dsc_config(struct sde_hw_dsc *hw_dsc, 
		initial_lines += 1;



	data |= (initial_lines << 20);

	data |= ((dsc->slice_last_group_size - 1) << 18);

	data |= (dsc->slice_last_group_size << 18);

	/* bpp is 6.4 format, 4 LSBs bits are for fractional part */

	lsb = dsc->bpp % 4;

	bpp = dsc->bpp / 4;