Commit a26e5239 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass dev_priv to IS_BROADWATER/IS_CRESTLINE 



Unify our approach to things by passing around dev_priv instead of dev.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477946245-14134-21-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 03427fcb

drivers/gpu/drm/i915/i915_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -981,7 +981,6 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) 
static int i915_driver_init_hw(struct drm_i915_private *dev_priv)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

	struct drm_device *dev = &dev_priv->drm;

	int ret;



	if (i915_inject_load_failure())
@@ -1039,7 +1038,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
	 * behaviour if any general state is accessed within a page above 4GB,

	 * which also needs to be handled carefully.

	 */

	if (IS_BROADWATER(dev) || IS_CRESTLINE(dev)) {

	if (IS_BROADWATER(dev_priv) || IS_CRESTLINE(dev_priv)) {

		ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));



		if (ret) {

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -2729,8 +2729,8 @@ struct drm_i915_cmd_table { 
#define IS_I915GM(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2592)

#define IS_I945G(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2772)

#define IS_I945GM(dev)		(INTEL_INFO(dev)->is_i945gm)

#define IS_BROADWATER(dev)	(INTEL_INFO(dev)->is_broadwater)

#define IS_CRESTLINE(dev)	(INTEL_INFO(dev)->is_crestline)

#define IS_BROADWATER(dev_priv)	((dev_priv)->info.is_broadwater)

#define IS_CRESTLINE(dev_priv)	((dev_priv)->info.is_crestline)

#define IS_GM45(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2A42)

#define IS_G4X(dev_priv)	((dev_priv)->info.is_g4x)

#define IS_PINEVIEW_G(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa001)

drivers/gpu/drm/i915/i915_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -4158,6 +4158,7 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = { 
struct drm_i915_gem_object *

i915_gem_object_create(struct drm_device *dev, u64 size)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_gem_object *obj;

	struct address_space *mapping;

	gfp_t mask;
@@ -4183,7 +4184,7 @@ i915_gem_object_create(struct drm_device *dev, u64 size) 
		goto fail;



	mask = GFP_HIGHUSER | __GFP_RECLAIMABLE;

	if (IS_CRESTLINE(dev) || IS_BROADWATER(dev)) {

	if (IS_CRESTLINE(dev_priv) || IS_BROADWATER(dev_priv)) {

		/* 965gm cannot relocate objects above 4GiB. */

		mask &= ~__GFP_HIGHMEM;

		mask |= __GFP_DMA32;

CRA Git | Maintained and supported by SUSTech CRA and CCSE