Commit 700e59f6 authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Dave Airlie
Browse files

gma500: Add VBLANK support for Poulsbo hardware 



Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 84b08fe6

drivers/gpu/drm/gma500/psb_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ enum { 
#define _PSB_IRQ_MSVDX_FLAG	  (1<<19)

#define _LNC_IRQ_TOPAZ_FLAG	  (1<<20)



#define _PSB_PIPE_EVENT_FLAG	(_PSB_VSYNC_PIPEA_FLAG | \

				 _PSB_VSYNC_PIPEB_FLAG)



/* This flag includes all the display IRQ bits excepts the vblank irqs. */

#define _MDFLD_DISP_ALL_IRQ_FLAG (_MDFLD_PIPEC_EVENT_FLAG | \

				  _MDFLD_PIPEB_EVENT_FLAG | \

drivers/gpu/drm/gma500/psb_irq.c

+41 −30
Original line number Diff line number Diff line
@@ -137,22 +137,11 @@ void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe) 
	}

}



/**

 * Display controller interrupt handler for vsync/vblank.

 *

 */

static void mid_vblank_handler(struct drm_device *dev, uint32_t pipe)

{

	drm_handle_vblank(dev, pipe);

}





/**

 * Display controller interrupt handler for pipe event.

 *

 */

#define WAIT_STATUS_CLEAR_LOOP_COUNT 0xffff

static void mid_pipe_event_handler(struct drm_device *dev, uint32_t pipe)

static void mid_pipe_event_handler(struct drm_device *dev, int pipe)

{

	struct drm_psb_private *dev_priv =

	    (struct drm_psb_private *) dev->dev_private;
@@ -161,6 +150,7 @@ static void mid_pipe_event_handler(struct drm_device *dev, uint32_t pipe) 
	uint32_t pipe_stat_reg = psb_pipestat(pipe);

	uint32_t pipe_enable = dev_priv->pipestat[pipe];

	uint32_t pipe_status = dev_priv->pipestat[pipe] >> 16;

	uint32_t pipe_clear;

	uint32_t i = 0;



	spin_lock(&dev_priv->irqmask_lock);
@@ -171,27 +161,23 @@ static void mid_pipe_event_handler(struct drm_device *dev, uint32_t pipe) 


	spin_unlock(&dev_priv->irqmask_lock);



	/* clear the 2nd level interrupt status bits */

	/**

	* FIXME: shouldn't use while loop here. However, the interrupt

	* status 'sticky' bits cannot be cleared by setting '1' to that

	* bit once...

	*/

	for (i = 0; i < WAIT_STATUS_CLEAR_LOOP_COUNT; i++) {

	/* Clear the 2nd level interrupt status bits

	 * Sometimes the bits are very sticky so we repeat until they unstick */

	for (i = 0; i < 0xffff; i++) {

		PSB_WVDC32(PSB_RVDC32(pipe_stat_reg), pipe_stat_reg);

		(void) PSB_RVDC32(pipe_stat_reg);

		pipe_clear = PSB_RVDC32(pipe_stat_reg) & pipe_status;



		if ((PSB_RVDC32(pipe_stat_reg) & pipe_status) == 0)

		if (pipe_clear == 0)

			break;

	}



	if (i == WAIT_STATUS_CLEAR_LOOP_COUNT)

	if (pipe_clear)

		dev_err(dev->dev,

	"%s, can't clear the status bits in pipe_stat_reg, its value = 0x%x.\n",

			__func__, PSB_RVDC32(pipe_stat_reg));

		"%s, can't clear status bits for pipe %d, its value = 0x%x.\n",

		__func__, pipe, PSB_RVDC32(pipe_stat_reg));



	if (pipe_stat_val & PIPE_VBLANK_STATUS)

		mid_vblank_handler(dev, pipe);

		drm_handle_vblank(dev, pipe);



	if (pipe_stat_val & PIPE_TE_STATUS)

		drm_handle_vblank(dev, pipe);
@@ -202,8 +188,11 @@ static void mid_pipe_event_handler(struct drm_device *dev, uint32_t pipe) 
 */

static void psb_vdc_interrupt(struct drm_device *dev, uint32_t vdc_stat)

{

	if (vdc_stat & _PSB_PIPEA_EVENT_FLAG)

	if (vdc_stat & _PSB_VSYNC_PIPEA_FLAG)

		mid_pipe_event_handler(dev, 0);



	if (vdc_stat & _PSB_VSYNC_PIPEB_FLAG)

		mid_pipe_event_handler(dev, 1);

}



irqreturn_t psb_irq_handler(DRM_IRQ_ARGS)
@@ -219,8 +208,13 @@ irqreturn_t psb_irq_handler(DRM_IRQ_ARGS) 


	vdc_stat = PSB_RVDC32(PSB_INT_IDENTITY_R);



	if (vdc_stat & _PSB_PIPE_EVENT_FLAG)

		dsp_int = 1;



	/* FIXME: Handle Medfield

	if (vdc_stat & _MDFLD_DISP_ALL_IRQ_FLAG)

		dsp_int = 1;

	*/



	if (vdc_stat & _PSB_IRQ_SGX_FLAG)

		sgx_int = 1;
@@ -266,11 +260,16 @@ void psb_irq_preinstall(struct drm_device *dev) 
	if (gma_power_is_on(dev))

		PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);

	if (dev->vblank_enabled[0])

		dev_priv->vdc_irq_mask |= _PSB_PIPEA_EVENT_FLAG;

		dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;

	if (dev->vblank_enabled[1])

		dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;



	/* FIXME: Handle Medfield irq mask

	if (dev->vblank_enabled[1])

		dev_priv->vdc_irq_mask |= _MDFLD_PIPEB_EVENT_FLAG;

	if (dev->vblank_enabled[2])

		dev_priv->vdc_irq_mask |= _MDFLD_PIPEC_EVENT_FLAG;

	*/



	/* This register is safe even if display island is off */

	PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
@@ -464,7 +463,13 @@ int psb_enable_vblank(struct drm_device *dev, int pipe) 


	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);



	mid_enable_pipe_event(dev_priv, pipe);

	if (pipe == 0)

		dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;

	else if (pipe == 1)

		dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;



	PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);

	PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);

	psb_enable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);



	spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
@@ -482,7 +487,13 @@ void psb_disable_vblank(struct drm_device *dev, int pipe) 


	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);



	mid_disable_pipe_event(dev_priv, pipe);

	if (pipe == 0)

		dev_priv->vdc_irq_mask &= ~_PSB_VSYNC_PIPEA_FLAG;

	else if (pipe == 1)

		dev_priv->vdc_irq_mask &= ~_PSB_VSYNC_PIPEB_FLAG;



	PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);

	PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);

	psb_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);



	spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);