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

Commit 762556c8 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/sde: standardize hw block caps naming"

parents 39cec133 4a752fc3

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

+2 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ struct sde_hw_cdm *sde_hw_cdm_init(enum sde_cdm idx, 
	}



	c->idx = idx;

	c->cdm_hw_cap = cfg;

	_setup_cdm_ops(&c->ops, c->cdm_hw_cap->features);

	c->caps = cfg;

	_setup_cdm_ops(&c->ops, c->caps->features);

	c->hw_mdp = hw_mdp;



	rc = sde_hw_blk_init(&c->base, SDE_HW_BLK_CDM, idx, &sde_hw_ops);

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct sde_hw_cdm { 
	struct sde_hw_blk_reg_map hw;



	/* chroma down */

	const struct sde_cdm_cfg   *cdm_hw_cap;

	const struct sde_cdm_cfg *caps;

	enum  sde_cdm  idx;



	/* mdp top hw driver */

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

+2 −2
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ struct sde_hw_dsc *sde_hw_dsc_init(enum sde_dsc idx, 
	}



	c->idx = idx;

	c->dsc_hw_cap = cfg;

	_setup_dsc_ops(&c->ops, c->dsc_hw_cap->features);

	c->caps = cfg;

	_setup_dsc_ops(&c->ops, c->caps->features);



	rc = sde_hw_blk_init(&c->base, SDE_HW_BLK_DSC, idx, &sde_hw_ops);

	if (rc) {

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct sde_hw_dsc { 


	/* dsc */

	enum sde_dsc idx;

	const struct sde_dsc_cfg *dsc_hw_cap;

	const struct sde_dsc_cfg *caps;



	/* ops */

	struct sde_hw_dsc_ops ops;

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

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ struct sde_hw_pingpong *sde_hw_pingpong_init(enum sde_pingpong idx, 
	}



	c->idx = idx;

	c->pingpong_hw_cap = cfg;

	_setup_pingpong_ops(&c->ops, c->pingpong_hw_cap->features);

	c->caps = cfg;

	_setup_pingpong_ops(&c->ops, c->caps->features);



	rc = sde_hw_blk_init(&c->base, SDE_HW_BLK_PINGPONG, idx, &sde_hw_ops);

	if (rc) {