1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 43986d81ae34..e9d6663bec73 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -171,7 +171,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
         dev_priv->allow_batchbuffer = 1;
 
         /* Program Hardware Status Page */
-        if (!IS_G33(dev)) {
+        if (!I915_NEED_GFX_HWS(dev)) {
                 dev_priv->status_page_dmah =
                         drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
 
@@ -720,6 +720,9 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_hws_addr_t *hws = data;
 
+        if (!I915_NEED_GFX_HWS(dev))
+                return -EINVAL;
+
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;