diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
| commit | fb2bbe6d40539e74fc890d529c370e6b977fbf47 (patch) | |
| tree | 41c5bbfcae5617b46bf32400fd17372bf30b3ec3 /drivers/gpu/drm/radeon/r300.c | |
| parent | 74da01dcfbb6300d758490d5d4efa1314c0e4e8b (diff) | |
| parent | 0a01063d5fd7417175512f0f916629008c0a842e (diff) | |
Merge branch 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6 into drm-core-nextdrm-radeon-testing
* 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6: (186 commits)
drm/radeon: disable any GPU activity after unrecovered lockup v5
drm/radeon: fix VM page table setup on SI
watchdog: core: fix WDIOC_GETSTATUS return value
watchdog: hpwdt: Unregister NMI events on exit.
watchdog: iTCO_wdt: add platform driver module alias
udf: Fortify loading of sparing table
udf: Avoid run away loop when partition table length is corrupted
udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()
sh: Convert sh_clk_mstp32_register to sh_clk_mstp_register
sh: kfr2r09: fix compile breakage
9p: fix min_t() casting in p9pdu_vwritef()
chmod +x scripts/gfp-translate
Revert "drm/i915: allow PCH PWM override on IVB"
UBI: correct usage of IS_ENABLED()
UBIFS: correct usage of IS_ENABLED()
can: flexcan: use be32_to_cpup to handle the value of dt entry
drm/nouveau: add license header to prime.
xen/netfront: teardown the device before unregistering it.
bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)
vhost: use USER_DS in vhost_worker thread
...
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 97722a33e513..206ac1f4d84b 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -1358,6 +1358,7 @@ static int r300_startup(struct radeon_device *rdev) if (r) return r; } + rdev->accel_working = true; if (rdev->family == CHIP_R300 || rdev->family == CHIP_R350 || @@ -1426,7 +1427,6 @@ int r300_resume(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); - rdev->accel_working = true; r = r300_startup(rdev); if (r) { rdev->accel_working = false; |