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

Commit 291d284c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next 

Here's some gma500 unifying and cleanups for drm-next. There is more stuff in
the pipe for 3.12 but I'd like to get these out of the way first.

* 'gma500-next' of git://github.com/patjak/drm-gma500: (35 commits)
  drm/gma500/cdv: Add and hook up chip op for disabling sr
  drm/gma500/cdv: Add and hook up chip op for watermarks
  drm/gma500: Rename psb_intel_encoder to gma_encoder
  drm/gma500: Rename psb_intel_connector to gma_connector
  drm/gma500: Rename psb_intel_crtc to gma_crtc
  drm/gma500/cdv: Convert to generic set_config()
  drm/gma500/psb: Convert to generic set_config()
  drm/gma500: Add generic set_config() function
  drm/gma500/cdv: Convert to generic save/restore
  drm/gma500/psb: Convert to generic save/restore
  drm/gma500: Add generic crtc save/restore funcs
  drm/gma500: Convert to generic encoder funcs
  drm/gma500: Add generic encoder functions
  drm/gma500/psb: Convert to generic cursor funcs
  drm/gma500/cdv: Convert to generic cursor funcs
  drm/gma500: Add generic cursor functions
  drm/gma500/psb: Convert to generic crtc->destroy
  drm/gma500/mdfld: Use identical generic crtc funcs
  drm/gma500/oak: Use identical generic crtc funcs
  drm/gma500/psb: Convert to gma_crtc_dpms()
  ...
parents d0b2c533 75346fe9

drivers/gpu/drm/gma500/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ gma500_gfx-y += \ 
	  mmu.o \

	  power.o \

	  psb_drv.o \

	  gma_display.o \

	  psb_intel_display.o \

	  psb_intel_lvds.o \

	  psb_intel_modes.o \

drivers/gpu/drm/gma500/cdv_device.c

+3 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ const struct psb_ops cdv_chip_ops = { 


	.crtc_helper = &cdv_intel_helper_funcs,

	.crtc_funcs = &cdv_intel_crtc_funcs,

	.clock_funcs = &cdv_clock_funcs,



	.output_init = cdv_output_init,

	.hotplug = cdv_hotplug_event,
@@ -655,4 +656,6 @@ const struct psb_ops cdv_chip_ops = { 
	.restore_regs = cdv_restore_display_registers,

	.power_down = cdv_power_down,

	.power_up = cdv_power_up,

	.update_wm = cdv_update_wm,

	.disable_sr = cdv_disable_sr,

};

drivers/gpu/drm/gma500/cdv_device.h

+3 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;

extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;

extern const struct gma_clock_funcs cdv_clock_funcs;

extern void cdv_intel_crt_init(struct drm_device *dev,

			struct psb_intel_mode_device *mode_dev);

extern void cdv_intel_lvds_init(struct drm_device *dev,
@@ -25,12 +26,5 @@ extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device * 
			int reg);

extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,

					     struct drm_crtc *crtc);



static inline void cdv_intel_wait_for_vblank(struct drm_device *dev)

{

	/* Wait for 20ms, i.e. one cycle at 50hz. */

        /* FIXME: msleep ?? */

	mdelay(20);

}



extern void cdv_update_wm(struct drm_device *dev, struct drm_crtc *crtc);

extern void cdv_disable_sr(struct drm_device *dev);

drivers/gpu/drm/gma500/cdv_intel_crt.c

+27 −30
Original line number Diff line number Diff line
@@ -95,13 +95,12 @@ static void cdv_intel_crt_mode_set(struct drm_encoder *encoder, 


	struct drm_device *dev = encoder->dev;

	struct drm_crtc *crtc = encoder->crtc;

	struct psb_intel_crtc *psb_intel_crtc =

					to_psb_intel_crtc(crtc);

	struct gma_crtc *gma_crtc = to_gma_crtc(crtc);

	int dpll_md_reg;

	u32 adpa, dpll_md;

	u32 adpa_reg;



	if (psb_intel_crtc->pipe == 0)

	if (gma_crtc->pipe == 0)

		dpll_md_reg = DPLL_A_MD;

	else

		dpll_md_reg = DPLL_B_MD;
@@ -124,7 +123,7 @@ static void cdv_intel_crt_mode_set(struct drm_encoder *encoder, 
	if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)

		adpa |= ADPA_VSYNC_ACTIVE_HIGH;



	if (psb_intel_crtc->pipe == 0)

	if (gma_crtc->pipe == 0)

		adpa |= ADPA_PIPE_A_SELECT;

	else

		adpa |= ADPA_PIPE_B_SELECT;
@@ -197,10 +196,9 @@ static enum drm_connector_status cdv_intel_crt_detect( 


static void cdv_intel_crt_destroy(struct drm_connector *connector)

{

	struct psb_intel_encoder *psb_intel_encoder =

					psb_intel_attached_encoder(connector);

	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);



	psb_intel_i2c_destroy(psb_intel_encoder->ddc_bus);

	psb_intel_i2c_destroy(gma_encoder->ddc_bus);

	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);

	kfree(connector);
@@ -208,9 +206,9 @@ static void cdv_intel_crt_destroy(struct drm_connector *connector) 


static int cdv_intel_crt_get_modes(struct drm_connector *connector)

{

	struct psb_intel_encoder *psb_intel_encoder =

				psb_intel_attached_encoder(connector);

	return psb_intel_ddc_get_modes(connector, &psb_intel_encoder->ddc_bus->adapter);

	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);

	return psb_intel_ddc_get_modes(connector,

				       &gma_encoder->ddc_bus->adapter);

}



static int cdv_intel_crt_set_property(struct drm_connector *connector,
@@ -227,8 +225,8 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector, 
static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {

	.dpms = cdv_intel_crt_dpms,

	.mode_fixup = cdv_intel_crt_mode_fixup,

	.prepare = psb_intel_encoder_prepare,

	.commit = psb_intel_encoder_commit,

	.prepare = gma_encoder_prepare,

	.commit = gma_encoder_commit,

	.mode_set = cdv_intel_crt_mode_set,

};
@@ -244,7 +242,7 @@ static const struct drm_connector_helper_funcs 
				cdv_intel_crt_connector_helper_funcs = {

	.mode_valid = cdv_intel_crt_mode_valid,

	.get_modes = cdv_intel_crt_get_modes,

	.best_encoder = psb_intel_best_encoder,

	.best_encoder = gma_best_encoder,

};



static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder)
@@ -260,32 +258,31 @@ void cdv_intel_crt_init(struct drm_device *dev, 
			struct psb_intel_mode_device *mode_dev)

{



	struct psb_intel_connector *psb_intel_connector;

	struct psb_intel_encoder *psb_intel_encoder;

	struct gma_connector *gma_connector;

	struct gma_encoder *gma_encoder;

	struct drm_connector *connector;

	struct drm_encoder *encoder;



	u32 i2c_reg;



	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);

	if (!psb_intel_encoder)

	gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);

	if (!gma_encoder)

		return;



	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);

	if (!psb_intel_connector)

	gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);

	if (!gma_connector)

		goto failed_connector;



	connector = &psb_intel_connector->base;

	connector = &gma_connector->base;

	connector->polled = DRM_CONNECTOR_POLL_HPD;

	drm_connector_init(dev, connector,

		&cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);



	encoder = &psb_intel_encoder->base;

	encoder = &gma_encoder->base;

	drm_encoder_init(dev, encoder,

		&cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC);



	psb_intel_connector_attach_encoder(psb_intel_connector,

					   psb_intel_encoder);

	gma_connector_attach_encoder(gma_connector, gma_encoder);



	/* Set up the DDC bus. */

	i2c_reg = GPIOA;
@@ -294,15 +291,15 @@ void cdv_intel_crt_init(struct drm_device *dev, 
	if (dev_priv->crt_ddc_bus != 0)

		i2c_reg = dev_priv->crt_ddc_bus;

	}*/

	psb_intel_encoder->ddc_bus = psb_intel_i2c_create(dev,

	gma_encoder->ddc_bus = psb_intel_i2c_create(dev,

							  i2c_reg, "CRTDDC_A");

	if (!psb_intel_encoder->ddc_bus) {

	if (!gma_encoder->ddc_bus) {

		dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "

			   "failed.\n");

		goto failed_ddc;

	}



	psb_intel_encoder->type = INTEL_OUTPUT_ANALOG;

	gma_encoder->type = INTEL_OUTPUT_ANALOG;

	/*

	psb_intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT);

	psb_intel_output->crtc_mask = (1 << 0) | (1 << 1);
@@ -318,10 +315,10 @@ void cdv_intel_crt_init(struct drm_device *dev, 


	return;

failed_ddc:

	drm_encoder_cleanup(&psb_intel_encoder->base);

	drm_connector_cleanup(&psb_intel_connector->base);

	kfree(psb_intel_connector);

	drm_encoder_cleanup(&gma_encoder->base);

	drm_connector_cleanup(&gma_connector->base);

	kfree(gma_connector);

failed_connector:

	kfree(psb_intel_encoder);

	kfree(gma_encoder);

	return;

}

drivers/gpu/drm/gma500/cdv_intel_display.c

+81 −839

File changed.

Preview size limit exceeded, changes collapsed.