Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b39d50e5 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Dave Airlie
Browse files

i915: wrap chipset types requiring hw status set ioctl 



Also applys to recent added new chipset.

Signed-off-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 60f92683

drivers/char/drm/i915_dma.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) 
	dev_priv->allow_batchbuffer = 1;

	dev_priv->allow_batchbuffer = 1;





	/* Program Hardware Status Page */

	/* Program Hardware Status Page */

	if (!IS_G33(dev)) {

	if (!I915_NEED_GFX_HWS(dev)) {

		dev_priv->status_page_dmah =

		dev_priv->status_page_dmah =

			drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);

			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_private_t *dev_priv = dev->dev_private;

	drm_i915_hws_addr_t *hws = data;

	drm_i915_hws_addr_t *hws = data;





	if (!I915_NEED_GFX_HWS(dev))

		return -EINVAL;



	if (!dev_priv) {

	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

		return -EINVAL;

drivers/char/drm/i915_drv.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -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) || \

#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \

			IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(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)

#define PRIMARY_RINGBUFFER_SIZE         (128*1024)





#endif
 
#endif