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

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

Merge "disp: msm: sde: use wr_ptr interrupt instead of ctl_start"

parents 06f8bcc1 6daf1c58

msm/dp/dp_display.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2438,7 +2438,8 @@ static int dp_display_mst_connector_update_link_info( 
	memcpy(&dp_panel->link_info, &dp->panel->link_info,

	memcpy(&dp_panel->link_info, &dp->panel->link_info,

			sizeof(dp_panel->link_info));

			sizeof(dp_panel->link_info));





	DP_MST_DEBUG("dp mst connector:%d link info updated\n");

	DP_MST_DEBUG("dp mst connector:%d link info updated\n",

		connector->base.id);





	return rc;

	return rc;

}

}

msm/dp/dp_panel.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1201,7 +1201,7 @@ static void dp_panel_dsc_prepare_pps_packet(struct dp_panel *dp_panel) 
static void _dp_panel_dsc_get_num_extra_pclk(struct msm_display_dsc_info *dsc,

static void _dp_panel_dsc_get_num_extra_pclk(struct msm_display_dsc_info *dsc,

				enum msm_display_compression_ratio ratio)

				enum msm_display_compression_ratio ratio)

{

{

	unsigned int dto_n, dto_d, remainder;

	unsigned int dto_n = 0, dto_d = 0, remainder;

	int ack_required, last_few_ack_required, accum_ack;

	int ack_required, last_few_ack_required, accum_ack;

	int last_few_pclk, last_few_pclk_required;

	int last_few_pclk, last_few_pclk_required;

	int start, temp, line_width = dsc->pic_width/2;

	int start, temp, line_width = dsc->pic_width/2;
@@ -2819,7 +2819,7 @@ static bool dp_panel_read_mst_cap(struct dp_panel *dp_panel) 




	if (!dp_panel) {

	if (!dp_panel) {

		pr_err("invalid input\n");

		pr_err("invalid input\n");

		goto end;

		return 0;

	}

	}





	panel = container_of(dp_panel, struct dp_panel_private, dp_panel);

	panel = container_of(dp_panel, struct dp_panel_private, dp_panel);

msm/msm_drv.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1959,6 +1959,8 @@ static int msm_pdev_probe(struct platform_device *pdev) 
	ret = add_display_components(&pdev->dev, &match);

	ret = add_display_components(&pdev->dev, &match);

	if (ret)

	if (ret)

		return ret;

		return ret;

	if (!match)

		return -ENODEV;





	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match);

	return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match);

msm/msm_drv.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -65,11 +65,11 @@ struct msm_gem_address_space; 
struct msm_gem_vma;

struct msm_gem_vma;





#define NUM_DOMAINS    4    /* one for KMS, then one per gpu core (?) */

#define NUM_DOMAINS    4    /* one for KMS, then one per gpu core (?) */

#define MAX_CRTCS      8

#define MAX_CRTCS      16

#define MAX_PLANES     20

#define MAX_PLANES     20

#define MAX_ENCODERS   8

#define MAX_ENCODERS   16

#define MAX_BRIDGES    8

#define MAX_BRIDGES    16

#define MAX_CONNECTORS 8

#define MAX_CONNECTORS 16





#define TEARDOWN_DEADLOCK_RETRY_MAX 5

#define TEARDOWN_DEADLOCK_RETRY_MAX 5

msm/msm_gem_prime.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, 
	struct msm_drm_private *priv;

	struct msm_drm_private *priv;

	struct msm_kms *kms;

	struct msm_kms *kms;

	int ret;

	int ret;

	u32 domain;





	if (!dma_buf || !dev->dev_private)

	if (!dma_buf || !dev->dev_private)

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);
@@ -142,14 +141,14 @@ struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, 
				|| (flags & ION_FLAG_CP_CAMERA_PREVIEW))

				|| (flags & ION_FLAG_CP_CAMERA_PREVIEW))

			attach_dev = dev->dev;

			attach_dev = dev->dev;

		else

		else

			DRM_ERROR("invalid ion secure flag: 0x%x\n", flags);

			DRM_ERROR("invalid ion secure flag: 0x%lx\n", flags);

	} else {

	} else {

		attach_dev = kms->funcs->get_address_space_device(kms,

		attach_dev = kms->funcs->get_address_space_device(kms,

						MSM_SMMU_DOMAIN_UNSECURE);

						MSM_SMMU_DOMAIN_UNSECURE);

	}

	}





	if (!attach_dev) {

	if (!attach_dev) {

		DRM_ERROR("aspace device not found for domain:%d\n", domain);

		DRM_ERROR("aspace device not found for domain\n");

		ret = -EINVAL;

		ret = -EINVAL;

		goto fail_put;

		goto fail_put;

	}

	}