diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:02:44 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:03:15 +0700 |
| commit | 99fed99a60000dcf75842a88103bfb513511cdd8 (patch) | |
| tree | 3daa2950331a080c0292916a63e6b6e0056a365e /drivers/gpu | |
| parent | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (diff) | |
| parent | ef4fb40e21750ad9c3d1b017c61a9a69701039ff (diff) | |
| download | kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.zip kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.gz kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.bz2 | |
Merge 3.0.70
Change-Id: I4316261b071ad622fcf62dcae7874c2ea6d9604d
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5548593..46e04a1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1256,6 +1256,11 @@ out: case 0: case -ERESTARTSYS: case -EINTR: + case -EBUSY: + /* + * EBUSY is ok: this just means that another thread + * already did the job. + */ return VM_FAULT_NOPAGE; case -ENOMEM: return VM_FAULT_OOM; diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 2157e77..98fb3d7 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -958,6 +958,15 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct found = 1; } + /* quirks */ + /* Radeon 9100 (R200) */ + if ((dev->pdev->device == 0x514D) && + (dev->pdev->subsystem_vendor == 0x174B) && + (dev->pdev->subsystem_device == 0x7149)) { + /* vbios value is bad, use the default */ + found = 0; + } + if (!found) /* fallback to defaults */ radeon_legacy_get_primary_dac_info_from_table(rdev, p_dac); |