From 1a58c0ae4d3b223429e7281d8ae600891e3620e2 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Mon, 6 Jul 2009 17:27:52 +0800 Subject: [PATCH] --- yaml --- r: 155257 b: refs/heads/master c: 22bd50c5b9aaf46476cade52c4ae9afa21c44e15 h: refs/heads/master i: 155255: 87b2394d05f6d2f8a72daca557857e1dadcabfbb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c1c86ff7989..93caa0b8acaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3d254955fb5797232ec329b136c363aa4fdaa05 +refs/heads/master: 22bd50c5b9aaf46476cade52c4ae9afa21c44e15 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 47ecb617e519..9aa3263c56dc 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -892,7 +892,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define SUPPORTS_INTEGRATED_DP(dev) (IS_G4X(dev) || IS_IGDNG(dev)) #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) /* dsparb controlled by hw only */ -#define DSPARB_HWCONTROL(dev) (IS_G4X(dev)) +#define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev)) #define PRIMARY_RINGBUFFER_SIZE (128*1024)