leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Implement GPU reset for 915/945

Browse Source 
915/945 have the same reset registers as 965, so share the code.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-11-21 21:54:27 +02:00 committed by Daniel Vetter
parent ca83b9361b
commit 59ea90543f
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/i915_drv.c
View File

@ -881,7 +881,8 @@ int i915_reset(struct drm_device *dev)
if (INTEL_INFO(dev)->gen > 5) if (INTEL_INFO(dev)->gen > 5)
intel_reset_gt_powersave(dev); intel_reset_gt_powersave(dev);
if (IS_GEN4(dev) && !IS_G4X(dev)) { if ((IS_GEN3(dev) && !IS_G33(dev)) ||
(IS_GEN4(dev) && !IS_G4X(dev))) {
intel_runtime_pm_disable_interrupts(dev_priv); intel_runtime_pm_disable_interrupts(dev_priv);
intel_runtime_pm_enable_interrupts(dev_priv); intel_runtime_pm_enable_interrupts(dev_priv);

2
drivers/gpu/drm/i915/i915_reg.h
View File

@ -78,7 +78,7 @@
/* Graphics reset regs */ /* Graphics reset regs */
#define I965_GDRST 0xc0 /* PCI config register */ #define I915_GDRST 0xc0 /* PCI config register */
#define GRDOM_FULL (0<<2) #define GRDOM_FULL (0<<2)
#define GRDOM_RENDER (1<<2) #define GRDOM_RENDER (1<<2)
#define GRDOM_MEDIA (3<<2) #define GRDOM_MEDIA (3<<2)

24
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -1345,27 +1345,27 @@ int i915_get_reset_stats_ioctl(struct drm_device *dev,
return 0; return 0;
} }
static int i965_reset_complete(struct drm_device *dev) static int i915_reset_complete(struct drm_device *dev)
{ {
u8 gdrst; u8 gdrst;
pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst); pci_read_config_byte(dev->pdev, I915_GDRST, &gdrst);
return (gdrst & GRDOM_RESET_STATUS) == 0; return (gdrst & GRDOM_RESET_STATUS) == 0;
} }
static int i965_do_reset(struct drm_device *dev) static int i915_do_reset(struct drm_device *dev)
{ {
/* assert reset for at least 20 usec */ /* assert reset for at least 20 usec */
pci_write_config_byte(dev->pdev, I965_GDRST, GRDOM_RESET_ENABLE); pci_write_config_byte(dev->pdev, I915_GDRST, GRDOM_RESET_ENABLE);
udelay(20); udelay(20);
pci_write_config_byte(dev->pdev, I965_GDRST, 0); pci_write_config_byte(dev->pdev, I915_GDRST, 0);
return wait_for(i965_reset_complete(dev), 500); return wait_for(i915_reset_complete(dev), 500);
} }
static int g4x_reset_complete(struct drm_device *dev) static int g4x_reset_complete(struct drm_device *dev)
{ {
u8 gdrst; u8 gdrst;
pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst); pci_read_config_byte(dev->pdev, I915_GDRST, &gdrst);
return (gdrst & GRDOM_RESET_ENABLE) == 0; return (gdrst & GRDOM_RESET_ENABLE) == 0;
} }
@ -1374,7 +1374,7 @@ static int g4x_do_reset(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int ret; int ret;
pci_write_config_byte(dev->pdev, I965_GDRST, pci_write_config_byte(dev->pdev, I915_GDRST,
GRDOM_RENDER | GRDOM_RESET_ENABLE); GRDOM_RENDER | GRDOM_RESET_ENABLE);
ret = wait_for(g4x_reset_complete(dev), 500); ret = wait_for(g4x_reset_complete(dev), 500);
if (ret) if (ret)
@ -1384,7 +1384,7 @@ static int g4x_do_reset(struct drm_device *dev)
I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) | VCP_UNIT_CLOCK_GATE_DISABLE); I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) | VCP_UNIT_CLOCK_GATE_DISABLE);
POSTING_READ(VDECCLK_GATE_D); POSTING_READ(VDECCLK_GATE_D);
pci_write_config_byte(dev->pdev, I965_GDRST, pci_write_config_byte(dev->pdev, I915_GDRST,
GRDOM_MEDIA | GRDOM_RESET_ENABLE); GRDOM_MEDIA | GRDOM_RESET_ENABLE);
ret = wait_for(g4x_reset_complete(dev), 500); ret = wait_for(g4x_reset_complete(dev), 500);
if (ret) if (ret)
@ -1394,7 +1394,7 @@ static int g4x_do_reset(struct drm_device *dev)
I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) & ~VCP_UNIT_CLOCK_GATE_DISABLE); I915_WRITE(VDECCLK_GATE_D, I915_READ(VDECCLK_GATE_D) & ~VCP_UNIT_CLOCK_GATE_DISABLE);
POSTING_READ(VDECCLK_GATE_D); POSTING_READ(VDECCLK_GATE_D);
pci_write_config_byte(dev->pdev, I965_GDRST, 0); pci_write_config_byte(dev->pdev, I915_GDRST, 0);
return 0; return 0;
} }
@ -1452,8 +1452,8 @@ int intel_gpu_reset(struct drm_device *dev)
return ironlake_do_reset(dev); return ironlake_do_reset(dev);
else if (IS_G4X(dev)) else if (IS_G4X(dev))
return g4x_do_reset(dev); return g4x_do_reset(dev);
else if (IS_GEN4(dev)) else if (IS_GEN4(dev) || (IS_GEN3(dev) && !IS_G33(dev)))
return i965_do_reset(dev); return i915_do_reset(dev);
else else
return -ENODEV; return -ENODEV;
} }