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

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

Merge "disp: msm: sde: Fix 32-bit compilation issues"

parents a6d0aaef c926ca31

drivers/gpu/drm/msm/dp/dp_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static void _dp_panel_calc_tu(struct dp_tu_calc_input *in, 


	tu.ratio = drm_fixp2int(tu.ratio_fp);

	temp1_fp = drm_fixp_from_fraction(tu.nlanes, 1);

	temp2_fp = tu.lwidth_fp % temp1_fp;

	div64_u64_rem(tu.lwidth_fp, temp1_fp, &temp2_fp);

	if (temp2_fp != 0 &&

			!tu.ratio && tu.dsc_en == 0) {

		tu.ratio_fp = drm_fixp_mul(tu.ratio_fp, RATIO_SCALE_fp);

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

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static int dsi_ctrl_update_link_freqs(struct dsi_ctrl *dsi_ctrl, 
	int rc = 0;

	u32 num_of_lanes = 0;

	u32 bpp;

	u32 refresh_rate = TICKS_IN_MICRO_SECOND;

	u64 refresh_rate = TICKS_IN_MICRO_SECOND;

	u64 h_period, v_period, bit_rate, pclk_rate, bit_rate_per_lane,

	    byte_clk_rate;

	struct dsi_host_common_cfg *host_cfg = &config->common_config;

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

+5 −2
Original line number Diff line number Diff line
@@ -2504,8 +2504,9 @@ static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode, 
	int rc = 0;

	struct dsi_display_mode_priv_info *priv_info;

	u64 h_period, v_period;

	u32 refresh_rate = TICKS_IN_MICRO_SECOND;

	u64 refresh_rate = TICKS_IN_MICRO_SECOND;

	struct dsi_mode_info *timing = NULL;

	u64 pixel_clk_khz;



	if (!mode || !mode->priv_info)

		return -EINVAL;
@@ -2540,7 +2541,9 @@ static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode, 
		refresh_rate = timing->refresh_rate;

	}



	mode->pixel_clk_khz = (h_period * v_period * refresh_rate) / 1000;

	pixel_clk_khz = h_period * v_period * refresh_rate;

	do_div(pixel_clk_khz, 1000);

	mode->pixel_clk_khz = pixel_clk_khz;



	return rc;

}

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

+4 −4
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2016-2019, 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
@@ -32,7 +32,7 @@ int32_t dsi_phy_hw_v4_0_calc_clk_zero(s64 rec_temp1, s64 mult) 
	s64 rec_temp2, rec_temp3;



	rec_temp2 = (rec_temp1 - mult);

	rec_temp3 = roundup(div_s64(rec_temp2, 8), mult);

	rec_temp3 = roundup64(div_s64(rec_temp2, 8), mult);

	return (div_s64(rec_temp3, mult) - 1);

}
@@ -43,7 +43,7 @@ int32_t dsi_phy_hw_v4_0_calc_clk_trail_rec_min(s64 temp_mul, 


	rec_temp1 = temp_mul + frac;

	rec_temp2 = div_s64(rec_temp1, 8);

	rec_temp3 = roundup(rec_temp2, mult);

	rec_temp3 = roundup64(rec_temp2, mult);

	return (div_s64(rec_temp3, mult) - 1);

}
@@ -59,7 +59,7 @@ int32_t dsi_phy_hw_v4_0_calc_hs_zero(s64 temp1, s64 mult) 
{

	s64 rec_temp2, rec_min;



	rec_temp2 = roundup((temp1 / 8), mult);

	rec_temp2 = roundup64((temp1 / 8), mult);

	rec_min = rec_temp2 - (1 * mult);

	return div_s64(rec_min, mult);

}

drivers/gpu/drm/msm/msm_smmu.c

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

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

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

 * Copyright (C) 2013 Red Hat

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

 *
@@ -501,7 +501,7 @@ static int _msm_smmu_create_mapping(struct msm_smmu_client *client, 
				sizeof(*client->dev->dma_parms), GFP_KERNEL);



	dma_set_max_seg_size(client->dev, DMA_BIT_MASK(32));

	dma_set_seg_boundary(client->dev, DMA_BIT_MASK(64));

	dma_set_seg_boundary(client->dev, (unsigned long)DMA_BIT_MASK(64));



	iommu_set_fault_handler(client->mmu_mapping->domain,

			msm_smmu_fault_handler, (void *)client);