Skip to content

Commit

Permalink
i915: wrap chipset types requiring hw status set ioctl
Browse files Browse the repository at this point in the history
Also applys to recent added new chipset.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Zhenyu Wang authored and Dave Airlie committed Feb 19, 2008
1 parent 60f9268 commit b39d50e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/char/drm/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions drivers/char/drm/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))

#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev))

#define PRIMARY_RINGBUFFER_SIZE (128*1024)

#endif

0 comments on commit b39d50e

Please sign in to comment.