diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:08:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:08:12 -0700 |
commit | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (patch) | |
tree | e288bedf1bc4be63b7970efa21353d462398078c /drivers/gpu/drm/radeon/r100.c | |
parent | d7526f271f2111684211fc7d27814e86a36336c9 (diff) | |
parent | 68b3adb429e0abf5c0a3deb75d71671436b3af10 (diff) | |
download | kernel_samsung_smdk4412-7ebd467551ed6ae200d7835a84bbda0dcadaa511.zip kernel_samsung_smdk4412-7ebd467551ed6ae200d7835a84bbda0dcadaa511.tar.gz kernel_samsung_smdk4412-7ebd467551ed6ae200d7835a84bbda0dcadaa511.tar.bz2 |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms/legacy: only enable load detection property on DVI-I
drm/radeon/kms: fix panel scaling adjusted mode setup
drivers/gpu/drm/drm_sysfs.c: sysfs files error handling
drivers/gpu/drm/radeon/radeon_atombios.c: range check issues
gpu: vga_switcheroo, fix lock imbalance
drivers/gpu/drm/drm_memory.c: fix check for end of loop
drivers/gpu/drm/via/via_video.c: fix off by one issue
drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference
drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index d7388fd..cf60c0b 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2975,7 +2975,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) for (i = 0; i < track->num_cb; i++) { if (track->cb[i].robj == NULL) { - if (!(track->fastfill || track->color_channel_mask || + if (!(track->zb_cb_clear || track->color_channel_mask || track->blend_read_enable)) { continue; } |