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

Commit c66a86d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: apply HWSTAM writes to Ivy Bridge as well
  drm/i915: move IRQ function table init to i915_irq.c
  drm/i915/overlay: Fix unpinning along init error paths
  drm/i915: Don't call describe_obj on NULL pointers
  drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state
parents c9e0b845 2b1ecb73

drivers/gpu/drm/i915/i915_debugfs.c

+10 −6
Original line number Diff line number Diff line
@@ -1207,13 +1207,17 @@ static int i915_context_status(struct seq_file *m, void *unused) 
	if (ret)

		return ret;



	if (dev_priv->pwrctx) {

		seq_printf(m, "power context ");

		describe_obj(m, dev_priv->pwrctx);

		seq_printf(m, "\n");

	}



	if (dev_priv->renderctx) {

		seq_printf(m, "render context ");

		describe_obj(m, dev_priv->renderctx);

		seq_printf(m, "\n");

	}



	mutex_unlock(&dev->mode_config.mutex);

drivers/gpu/drm/i915/i915_dma.c

+1 −30
Original line number Diff line number Diff line
@@ -1266,30 +1266,6 @@ static int i915_load_modeset_init(struct drm_device *dev) 


	intel_modeset_gem_init(dev);



	if (IS_IVYBRIDGE(dev)) {

		/* Share pre & uninstall handlers with ILK/SNB */

		dev->driver->irq_handler = ivybridge_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_preinstall;

		dev->driver->irq_postinstall = ivybridge_irq_postinstall;

		dev->driver->irq_uninstall = ironlake_irq_uninstall;

		dev->driver->enable_vblank = ivybridge_enable_vblank;

		dev->driver->disable_vblank = ivybridge_disable_vblank;

	} else if (HAS_PCH_SPLIT(dev)) {

		dev->driver->irq_handler = ironlake_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_preinstall;

		dev->driver->irq_postinstall = ironlake_irq_postinstall;

		dev->driver->irq_uninstall = ironlake_irq_uninstall;

		dev->driver->enable_vblank = ironlake_enable_vblank;

		dev->driver->disable_vblank = ironlake_disable_vblank;

	} else {

		dev->driver->irq_preinstall = i915_driver_irq_preinstall;

		dev->driver->irq_postinstall = i915_driver_irq_postinstall;

		dev->driver->irq_uninstall = i915_driver_irq_uninstall;

		dev->driver->irq_handler = i915_driver_irq_handler;

		dev->driver->enable_vblank = i915_enable_vblank;

		dev->driver->disable_vblank = i915_disable_vblank;

	}



	ret = drm_irq_install(dev);

	if (ret)

		goto cleanup_gem;
@@ -2017,12 +1993,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	/* enable GEM by default */

	dev_priv->has_gem = 1;



	dev->driver->get_vblank_counter = i915_get_vblank_counter;

	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */

	if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev)) {

		dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */

		dev->driver->get_vblank_counter = gm45_get_vblank_counter;

	}

	intel_irq_init(dev);



	/* Try to make sure MCHBAR is enabled before poking at it */

	intel_setup_mchbar(dev);

drivers/gpu/drm/i915/i915_drv.c

+0 −8
Original line number Diff line number Diff line
@@ -765,14 +765,6 @@ static struct drm_driver driver = { 
	.resume = i915_resume,



	.device_is_agp = i915_driver_device_is_agp,

	.enable_vblank = i915_enable_vblank,

	.disable_vblank = i915_disable_vblank,

	.get_vblank_timestamp = i915_get_vblank_timestamp,

	.get_scanout_position = i915_get_crtc_scanoutpos,

	.irq_preinstall = i915_driver_irq_preinstall,

	.irq_postinstall = i915_driver_irq_postinstall,

	.irq_uninstall = i915_driver_irq_uninstall,

	.irq_handler = i915_driver_irq_handler,

	.reclaim_buffers = drm_core_reclaim_buffers,

	.master_create = i915_master_create,

	.master_destroy = i915_master_destroy,

drivers/gpu/drm/i915/i915_drv.h

+1 −31
Original line number Diff line number Diff line
@@ -997,8 +997,6 @@ extern unsigned int i915_enable_fbc; 


extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);

extern void i915_save_display(struct drm_device *dev);

extern void i915_restore_display(struct drm_device *dev);

extern int i915_master_create(struct drm_device *dev, struct drm_master *master);

extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
@@ -1033,33 +1031,12 @@ extern int i915_irq_emit(struct drm_device *dev, void *data, 
extern int i915_irq_wait(struct drm_device *dev, void *data,

			 struct drm_file *file_priv);



extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);

extern void i915_driver_irq_preinstall(struct drm_device * dev);

extern int i915_driver_irq_postinstall(struct drm_device *dev);

extern void i915_driver_irq_uninstall(struct drm_device * dev);



extern irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS);

extern void ironlake_irq_preinstall(struct drm_device *dev);

extern int ironlake_irq_postinstall(struct drm_device *dev);

extern void ironlake_irq_uninstall(struct drm_device *dev);



extern irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS);

extern void ivybridge_irq_preinstall(struct drm_device *dev);

extern int ivybridge_irq_postinstall(struct drm_device *dev);

extern void ivybridge_irq_uninstall(struct drm_device *dev);

extern void intel_irq_init(struct drm_device *dev);



extern int i915_vblank_pipe_set(struct drm_device *dev, void *data,

				struct drm_file *file_priv);

extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,

				struct drm_file *file_priv);

extern int i915_enable_vblank(struct drm_device *dev, int crtc);

extern void i915_disable_vblank(struct drm_device *dev, int crtc);

extern int ironlake_enable_vblank(struct drm_device *dev, int crtc);

extern void ironlake_disable_vblank(struct drm_device *dev, int crtc);

extern int ivybridge_enable_vblank(struct drm_device *dev, int crtc);

extern void ivybridge_disable_vblank(struct drm_device *dev, int crtc);

extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);

extern u32 gm45_get_vblank_counter(struct drm_device *dev, int crtc);

extern int i915_vblank_swap(struct drm_device *dev, void *data,

			    struct drm_file *file_priv);
@@ -1070,13 +1047,6 @@ void 
i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);



void intel_enable_asle (struct drm_device *dev);

int i915_get_vblank_timestamp(struct drm_device *dev, int crtc,

			      int *max_error,

			      struct timeval *vblank_time,

			      unsigned flags);



int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,

			     int *vpos, int *hpos);



#ifdef CONFIG_DEBUG_FS

extern void i915_destroy_error_state(struct drm_device *dev);

drivers/gpu/drm/i915/i915_irq.c

+59 −21
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ i915_pipe_enabled(struct drm_device *dev, int pipe) 
/* Called from drm generic code, passed a 'crtc', which

 * we use as a pipe index

 */

u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)

static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long high_frame;
@@ -184,7 +184,7 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe) 
	return (high1 << 8) | low;

}



u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)

static u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int reg = PIPE_FRMCOUNT_GM45(pipe);
@@ -198,7 +198,7 @@ u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe) 
	return I915_READ(reg);

}



int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,

static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,

			     int *vpos, int *hpos)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -264,7 +264,7 @@ int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, 
	return ret;

}



int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,

static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,

			      int *max_error,

			      struct timeval *vblank_time,

			      unsigned flags)
@@ -462,7 +462,7 @@ static void pch_irq_handler(struct drm_device *dev) 
		DRM_DEBUG_DRIVER("PCH transcoder A underrun interrupt\n");

}



irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)

static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)

{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -550,7 +550,7 @@ irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS) 
	return ret;

}



irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)

static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)

{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -1209,7 +1209,7 @@ static void i915_pageflip_stall_check(struct drm_device *dev, int pipe) 
	}

}



irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)

static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)

{

	struct drm_device *dev = (struct drm_device *) arg;

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -1454,7 +1454,7 @@ int i915_irq_wait(struct drm_device *dev, void *data, 
/* Called from drm generic code, passed 'crtc' which

 * we use as a pipe index

 */

int i915_enable_vblank(struct drm_device *dev, int pipe)

static int i915_enable_vblank(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1478,7 +1478,7 @@ int i915_enable_vblank(struct drm_device *dev, int pipe) 
	return 0;

}



int ironlake_enable_vblank(struct drm_device *dev, int pipe)

static int ironlake_enable_vblank(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1494,7 +1494,7 @@ int ironlake_enable_vblank(struct drm_device *dev, int pipe) 
	return 0;

}



int ivybridge_enable_vblank(struct drm_device *dev, int pipe)

static int ivybridge_enable_vblank(struct drm_device *dev, int pipe)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1513,7 +1513,7 @@ int ivybridge_enable_vblank(struct drm_device *dev, int pipe) 
/* Called from drm generic code, passed 'crtc' which

 * we use as a pipe index

 */

void i915_disable_vblank(struct drm_device *dev, int pipe)

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

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1529,7 +1529,7 @@ void i915_disable_vblank(struct drm_device *dev, int pipe) 
	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

}



void ironlake_disable_vblank(struct drm_device *dev, int pipe)

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

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1540,7 +1540,7 @@ void ironlake_disable_vblank(struct drm_device *dev, int pipe) 
	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

}



void ivybridge_disable_vblank(struct drm_device *dev, int pipe)

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

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;
@@ -1728,7 +1728,7 @@ void i915_hangcheck_elapsed(unsigned long data) 


/* drm_dma.h hooks

*/

void ironlake_irq_preinstall(struct drm_device *dev)

static void ironlake_irq_preinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -1740,7 +1740,7 @@ void ironlake_irq_preinstall(struct drm_device *dev) 
		INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);



	I915_WRITE(HWSTAM, 0xeffe);

	if (IS_GEN6(dev)) {

	if (IS_GEN6(dev) || IS_GEN7(dev)) {

		/* Workaround stalls observed on Sandy Bridge GPUs by

		 * making the blitter command streamer generate a

		 * write to the Hardware Status Page for
@@ -1769,7 +1769,7 @@ void ironlake_irq_preinstall(struct drm_device *dev) 
	POSTING_READ(SDEIER);

}



int ironlake_irq_postinstall(struct drm_device *dev)

static int ironlake_irq_postinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	/* enable kind of interrupts always enabled */
@@ -1841,7 +1841,7 @@ int ironlake_irq_postinstall(struct drm_device *dev) 
	return 0;

}



int ivybridge_irq_postinstall(struct drm_device *dev)

static int ivybridge_irq_postinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	/* enable kind of interrupts always enabled */
@@ -1891,7 +1891,7 @@ int ivybridge_irq_postinstall(struct drm_device *dev) 
	return 0;

}



void i915_driver_irq_preinstall(struct drm_device * dev)

static void i915_driver_irq_preinstall(struct drm_device * dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;
@@ -1918,7 +1918,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev) 
 * Must be called after intel_modeset_init or hotplug interrupts won't be

 * enabled correctly.

 */

int i915_driver_irq_postinstall(struct drm_device *dev)

static int i915_driver_irq_postinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	u32 enable_mask = I915_INTERRUPT_ENABLE_FIX | I915_INTERRUPT_ENABLE_VAR;
@@ -1994,7 +1994,7 @@ int i915_driver_irq_postinstall(struct drm_device *dev) 
	return 0;

}



void ironlake_irq_uninstall(struct drm_device *dev)

static void ironlake_irq_uninstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -2014,7 +2014,7 @@ void ironlake_irq_uninstall(struct drm_device *dev) 
	I915_WRITE(GTIIR, I915_READ(GTIIR));

}



void i915_driver_irq_uninstall(struct drm_device * dev)

static void i915_driver_irq_uninstall(struct drm_device * dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;
@@ -2040,3 +2040,41 @@ void i915_driver_irq_uninstall(struct drm_device * dev) 
			   I915_READ(PIPESTAT(pipe)) & 0x8000ffff);

	I915_WRITE(IIR, I915_READ(IIR));

}



void intel_irq_init(struct drm_device *dev)

{

	dev->driver->get_vblank_counter = i915_get_vblank_counter;

	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */

	if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev)) {

		dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */

		dev->driver->get_vblank_counter = gm45_get_vblank_counter;

	}





	dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;

	dev->driver->get_scanout_position = i915_get_crtc_scanoutpos;



	if (IS_IVYBRIDGE(dev)) {

		/* Share pre & uninstall handlers with ILK/SNB */

		dev->driver->irq_handler = ivybridge_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_preinstall;

		dev->driver->irq_postinstall = ivybridge_irq_postinstall;

		dev->driver->irq_uninstall = ironlake_irq_uninstall;

		dev->driver->enable_vblank = ivybridge_enable_vblank;

		dev->driver->disable_vblank = ivybridge_disable_vblank;

	} else if (HAS_PCH_SPLIT(dev)) {

		dev->driver->irq_handler = ironlake_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_preinstall;

		dev->driver->irq_postinstall = ironlake_irq_postinstall;

		dev->driver->irq_uninstall = ironlake_irq_uninstall;

		dev->driver->enable_vblank = ironlake_enable_vblank;

		dev->driver->disable_vblank = ironlake_disable_vblank;

	} else {

		dev->driver->irq_preinstall = i915_driver_irq_preinstall;

		dev->driver->irq_postinstall = i915_driver_irq_postinstall;

		dev->driver->irq_uninstall = i915_driver_irq_uninstall;

		dev->driver->irq_handler = i915_driver_irq_handler;

		dev->driver->enable_vblank = i915_enable_vblank;

		dev->driver->disable_vblank = i915_disable_vblank;

	}

}