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

Commit 213a8434 authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500: use the register map to clean up 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8512e074

drivers/gpu/drm/gma500/cdv_device.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -494,6 +494,7 @@ static const struct psb_offset cdv_regmap[2] = { 
		.conf = PIPEACONF,

		.conf = PIPEACONF,

		.src = PIPEASRC,

		.src = PIPEASRC,

		.dpll = DPLL_A,

		.dpll = DPLL_A,

		.dpll_md = DPLL_A_MD,

		.htotal = HTOTAL_A,

		.htotal = HTOTAL_A,

		.hblank = HBLANK_A,

		.hblank = HBLANK_A,

		.hsync = HSYNC_A,

		.hsync = HSYNC_A,
@@ -518,6 +519,7 @@ static const struct psb_offset cdv_regmap[2] = { 
		.conf = PIPEBCONF,

		.conf = PIPEBCONF,

		.src = PIPEBSRC,

		.src = PIPEBSRC,

		.dpll = DPLL_B,

		.dpll = DPLL_B,

		.dpll_md = DPLL_B_MD,

		.htotal = HTOTAL_B,

		.htotal = HTOTAL_B,

		.hblank = HBLANK_B,

		.hblank = HBLANK_B,

		.hsync = HSYNC_B,

		.hsync = HSYNC_B,

drivers/gpu/drm/gma500/cdv_intel_display.c

+135 −155

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/gma500/mdfld_device.c

+54 −169

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c

+9 −15
Original line number Original line Diff line number Diff line
@@ -605,6 +605,8 @@ int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector, 
	struct mdfld_dsi_config *dsi_config =

	struct mdfld_dsi_config *dsi_config =

				mdfld_dsi_get_config(dsi_connector);

				mdfld_dsi_get_config(dsi_connector);

	struct drm_device *dev = dsi_config->dev;

	struct drm_device *dev = dsi_config->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	const struct psb_offset *map = &dev_priv->regmap[pipe];

	u32 mipi_val = 0;

	u32 mipi_val = 0;





	if (!dsi_connector) {

	if (!dsi_connector) {
@@ -632,21 +634,13 @@ int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector, 
	pkg_sender->status = MDFLD_DSI_PKG_SENDER_FREE;

	pkg_sender->status = MDFLD_DSI_PKG_SENDER_FREE;





	/*init regs*/

	/*init regs*/

	if (pipe == 0) {

	/* FIXME: should just copy the regmap ptr ? */

		pkg_sender->dpll_reg = MRST_DPLL_A;

	pkg_sender->dpll_reg = map->dpll;

		pkg_sender->dspcntr_reg = DSPACNTR;

	pkg_sender->dspcntr_reg = map->cntr;

		pkg_sender->pipeconf_reg = PIPEACONF;

	pkg_sender->pipeconf_reg = map->conf;

		pkg_sender->dsplinoff_reg = DSPALINOFF;

	pkg_sender->dsplinoff_reg = map->linoff;

		pkg_sender->dspsurf_reg = DSPASURF;

	pkg_sender->dspsurf_reg = map->surf;

		pkg_sender->pipestat_reg = PIPEASTAT;

	pkg_sender->pipestat_reg = map->status;

	} else if (pipe == 2) {

		pkg_sender->dpll_reg = MRST_DPLL_A;

		pkg_sender->dspcntr_reg = DSPCCNTR;

		pkg_sender->pipeconf_reg = PIPECCONF;

		pkg_sender->dsplinoff_reg = DSPCLINOFF;

		pkg_sender->dspsurf_reg = DSPCSURF;

		pkg_sender->pipestat_reg = PIPECSTAT;

	}





	pkg_sender->mipi_intr_stat_reg = MIPI_INTR_STAT_REG(pipe);

	pkg_sender->mipi_intr_stat_reg = MIPI_INTR_STAT_REG(pipe);

	pkg_sender->mipi_lp_gen_data_reg = MIPI_LP_GEN_DATA_REG(pipe);

	pkg_sender->mipi_lp_gen_data_reg = MIPI_LP_GEN_DATA_REG(pipe);

drivers/gpu/drm/gma500/mdfld_intel_display.c

+102 −228

File changed.

Preview size limit exceeded, changes collapsed.