Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293692
b: refs/heads/master
c: 1fc9333
h: refs/heads/master
v: v3
  • Loading branch information
Kirill A. Shutemov authored and Dave Airlie committed Mar 10, 2012
1 parent be1cadb commit d9ffd67
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 699f0b45cef8259790ca7a8811d4e6bccc4b54a9
refs/heads/master: 1fc93332cd2ba59a5fd5b3c4369fc62c724ddae6
8 changes: 0 additions & 8 deletions trunk/drivers/gpu/drm/gma500/psb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
{
struct drm_psb_private *dev_priv;
unsigned long resource_start;
struct psb_gtt *pg;
unsigned long irqflags;
int ret = -ENOMEM;
uint32_t tt_pages;
struct drm_connector *connector;
struct psb_intel_encoder *psb_intel_encoder;

Expand Down Expand Up @@ -336,12 +334,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
if (!dev_priv->mmu)
goto out_err;

pg = &dev_priv->gtt;

tt_pages = (pg->gatt_pages < PSB_TT_PRIV0_PLIMIT) ?
(pg->gatt_pages) : PSB_TT_PRIV0_PLIMIT;


dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
if (!dev_priv->pf_pd)
goto out_err;
Expand Down

0 comments on commit d9ffd67

Please sign in to comment.