Skip to contentSkip to conversation

drm/i915: Refactor dma mask usage to a common helper

PATCH In review Michael J. Ruhl 3 participants 14 messages Apr 17, 2020 – Apr 19, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Refactor dma mask usage to a common helper

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

cc Brian Welty <[email protected]>
cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c     | 15 --------------
 drivers/gpu/drm/i915/i915_drv.c          | 25 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_pci.c          | 14 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c |  1 +
 drivers/gpu/drm/i915/intel_device_info.h |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -15
index eebd1190506f..66165b10256e 100644
@@ -840,7 +840,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
 	struct pci_dev *pdev = i915->drm.pdev;
 	unsigned int size;
 	u16 snb_gmch_ctl;
-	int err;
 
 	/* TODO: We're not aware of mappable constraints on gen8 yet */
 	if (!IS_DGFX(i915)) {
@@ -848,13 +847,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
 		ggtt->mappable_end = resource_size(&ggtt->gmadr);
 	}
 
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-	if (!err)
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));
-	if (err)
-		drm_err(&i915->drm,
-			"Can't set DMA mask/consistent mask (%d)\n", err);
-
 	pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 	if (IS_CHERRYVIEW(i915))
 		size = chv_get_total_gtt_size(snb_gmch_ctl);
@@ -990,7 +982,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
 	struct pci_dev *pdev = i915->drm.pdev;
 	unsigned int size;
 	u16 snb_gmch_ctl;
-	int err;
 
 	ggtt->gmadr = pci_resource(pdev, 2);
 	ggtt->mappable_end = resource_size(&ggtt->gmadr);
@@ -1005,12 +996,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
 		return -ENXIO;
 	}
 
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-	if (!err)
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-	if (err)
-		drm_err(&i915->drm,
-			"Can't set DMA mask/consistent mask (%d)\n", err);
 	pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 
 	size = gen6_get_total_gtt_size(snb_gmch_ctl);
drivers/gpu/drm/i915/i915_drv.c +25 -0
index 641f5e03b661..3c5654b5d321 100644
@@ -566,6 +566,29 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
 	intel_gvt_sanitize_options(dev_priv);
 }
 
+/**
+ * i915_set_dma_mask - set the dma mask as configured for the platform
+ * @i915: valid i915 instance
+ *
+ * Set the dma device and coherent masks.  This needs to occur before
+ * i915_ggtt_probe_hw.
+ *
+ * NOTE: for devices < GEN(6), the dma_mask will also be set in
+ * intel_gmch_probe() (i.e. it will be set a second time).
+ */
+static void i915_set_dma_mask(struct drm_i915_private *i915)
+{
+	struct pci_dev *pdev = i915->drm.pdev;
+	unsigned int mask_size = INTEL_INFO(i915)->dma_mask_size;
+	int err;
+
+	GEM_BUG_ON(!mask_size);
+
+	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(mask_size));
+	if (err)
+		DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);
+}
+
 /**
  * i915_driver_hw_probe - setup state requiring device access
  * @dev_priv: device private
@@ -613,6 +636,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
 	i915_perf_init(dev_priv);
 
+	i915_set_dma_mask(dev_priv);
+
 	ret = i915_ggtt_probe_hw(dev_priv);
 	if (ret)
 		goto err_perf;
drivers/gpu/drm/i915/i915_pci.c +14 -0
index 66738f2c4f28..2fc25ec12c3d 100644
@@ -171,6 +171,7 @@
 	.engine_mask = BIT(RCS0), \
 	.has_snoop = true, \
 	.has_coherent_ggtt = false, \
+	.dma_mask_size = 32, \
 	I9XX_PIPE_OFFSETS, \
 	I9XX_CURSOR_OFFSETS, \
 	I9XX_COLORS, \
@@ -190,6 +191,7 @@
 	.engine_mask = BIT(RCS0), \
 	.has_snoop = true, \
 	.has_coherent_ggtt = false, \
+	.dma_mask_size = 32, \
 	I845_PIPE_OFFSETS, \
 	I845_CURSOR_OFFSETS, \
 	I9XX_COLORS, \
@@ -226,6 +228,7 @@ static const struct intel_device_info i865g_info = {
 	.engine_mask = BIT(RCS0), \
 	.has_snoop = true, \
 	.has_coherent_ggtt = true, \
+	.dma_mask_size = 32, \
 	I9XX_PIPE_OFFSETS, \
 	I9XX_CURSOR_OFFSETS, \
 	I9XX_COLORS, \
@@ -286,6 +289,7 @@ static const struct intel_device_info g33_info = {
 	PLATFORM(INTEL_G33),
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
+	.dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_g_info = {
@@ -293,6 +297,7 @@ static const struct intel_device_info pnv_g_info = {
 	PLATFORM(INTEL_PINEVIEW),
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
+	.dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_m_info = {
@@ -301,6 +306,7 @@ static const struct intel_device_info pnv_m_info = {
 	.is_mobile = 1,
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
+	.dma_mask_size = 36,
 };
 
 #define GEN4_FEATURES \
@@ -313,6 +319,7 @@ static const struct intel_device_info pnv_m_info = {
 	.engine_mask = BIT(RCS0), \
 	.has_snoop = true, \
 	.has_coherent_ggtt = true, \
+	.dma_mask_size = 36, \
 	I9XX_PIPE_OFFSETS, \
 	I9XX_CURSOR_OFFSETS, \
 	I965_COLORS, \
@@ -365,6 +372,7 @@ static const struct intel_device_info gm45_info = {
 	.has_coherent_ggtt = true, \
 	/* ilk does support rc6, but we do not implement [power] contexts */ \
 	.has_rc6 = 0, \
+	.dma_mask_size = 36, \
 	I9XX_PIPE_OFFSETS, \
 	I9XX_CURSOR_OFFSETS, \
 	ILK_COLORS, \
@@ -395,6 +403,7 @@ static const struct intel_device_info ilk_m_info = {
 	.has_rc6 = 1, \
 	.has_rc6p = 1, \
 	.has_rps = true, \
+	.dma_mask_size = 40, \
 	.ppgtt_type = INTEL_PPGTT_ALIASING, \
 	.ppgtt_size = 31, \
 	I9XX_PIPE_OFFSETS, \
@@ -445,6 +454,7 @@ static const struct intel_device_info snb_m_gt2_info = {
 	.has_rc6 = 1, \
 	.has_rc6p = 1, \
 	.has_rps = true, \
+	.dma_mask_size = 40, \
 	.ppgtt_type = INTEL_PPGTT_ALIASING, \
 	.ppgtt_size = 31, \
 	IVB_PIPE_OFFSETS, \
@@ -504,6 +514,7 @@ static const struct intel_device_info vlv_info = {
 	.has_rps = true,
 	.display.has_gmch = 1,
 	.display.has_hotplug = 1,
+	.dma_mask_size = 40,
 	.ppgtt_type = INTEL_PPGTT_ALIASING,
 	.ppgtt_size = 31,
 	.has_snoop = true,
@@ -554,6 +565,7 @@ static const struct intel_device_info hsw_gt3_info = {
 	G75_FEATURES, \
 	GEN(8), \
 	.has_logical_ring_contexts = 1, \
+	.dma_mask_size = 39, \
 	.ppgtt_type = INTEL_PPGTT_FULL, \
 	.ppgtt_size = 48, \
 	.has_64bit_reloc = 1, \
@@ -602,6 +614,7 @@ static const struct intel_device_info chv_info = {
 	.has_rps = true,
 	.has_logical_ring_contexts = 1,
 	.display.has_gmch = 1,
+	.dma_mask_size = 39,
 	.ppgtt_type = INTEL_PPGTT_ALIASING,
 	.ppgtt_size = 32,
 	.has_reset_engine = 1,
@@ -685,6 +698,7 @@ static const struct intel_device_info skl_gt4_info = {
 	.has_logical_ring_contexts = 1, \
 	.has_logical_ring_preemption = 1, \
 	.has_gt_uc = 1, \
+	.dma_mask_size = 39, \
 	.ppgtt_type = INTEL_PPGTT_FULL, \
 	.ppgtt_size = 48, \
 	.has_reset_engine = 1, \
drivers/gpu/drm/i915/intel_device_info.c +1 -0
index db8496b4c38d..91bb7891c70c 100644
@@ -98,6 +98,7 @@ void intel_device_info_print_static(const struct intel_device_info *info,
 	drm_printf(p, "platform: %s\n", intel_platform_name(info->platform));
 	drm_printf(p, "ppgtt-size: %d\n", info->ppgtt_size);
 	drm_printf(p, "ppgtt-type: %d\n", info->ppgtt_type);
+	drm_printf(p, "dma_mask_size: %u\n", info->dma_mask_size);
 
 #define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, yesno(info->name));
 	DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG);
drivers/gpu/drm/i915/intel_device_info.h +2 -0
index cce6a72c5ebc..69c9257c6c6a 100644
@@ -158,6 +158,8 @@ struct intel_device_info {
 
 	enum intel_platform platform;
 
+	unsigned int dma_mask_size; /* available DMA address bits */
+
 	enum intel_ppgtt_type ppgtt_type;
 	unsigned int ppgtt_size; /* log2, e.g. 31/32/48 bits */
 
Signature · 6 lines
2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 89 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

cc Brian Welty <[email protected]>
cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c     | 15 --------------
 drivers/gpu/drm/i915/i915_drv.c          | 25 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_pci.c          | 14 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c |  1 +
 drivers/gpu/drm/i915/intel_device_info.h |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -15
index eebd1190506f..66165b10256e 100644
@@ -840,7 +840,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        /* TODO: We're not aware of mappable constraints on gen8 yet */
        if (!IS_DGFX(i915)) {
@@ -848,13 +847,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
                ggtt->mappable_end = resource_size(&ggtt->gmadr);
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
-
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
        if (IS_CHERRYVIEW(i915))
                size = chv_get_total_gtt_size(snb_gmch_ctl);
@@ -990,7 +982,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        ggtt->gmadr = pci_resource(pdev, 2);
        ggtt->mappable_end = resource_size(&ggtt->gmadr);
@@ -1005,12 +996,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
                return -ENXIO;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 
        size = gen6_get_total_gtt_size(snb_gmch_ctl);
drivers/gpu/drm/i915/i915_drv.c +11 -0
index 641f5e03b661..3c5654b5d321 100644
@@ -566,6 +566,29 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
        intel_gvt_sanitize_options(dev_priv);
 }
 
+/**
+ * i915_set_dma_mask - set the dma mask as configured for the platform
+ * @i915: valid i915 instance
+ *
+ * Set the dma device and coherent masks.  This needs to occur before
+ * i915_ggtt_probe_hw.
+ *
+ * NOTE: for devices < GEN(6), the dma_mask will also be set in
+ * intel_gmch_probe() (i.e. it will be set a second time).
+ */
+static void i915_set_dma_mask(struct drm_i915_private *i915)

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv) · line 589

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10 -0
+{
+       struct pci_dev *pdev = i915->drm.pdev;
+       unsigned int mask_size = INTEL_INFO(i915)->dma_mask_size;
+       int err;
+
+       GEM_BUG_ON(!mask_size);
+
+       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(mask_size));
+       if (err)
+               DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);

Which device again? How serious of an error is it exactly since it is ignored? Since it is being ignored, what's the impact to the user? Should they take any action, or can they ignore it? [If they can ignore it as well, this is barely anything to take note of.]

Quoted 33 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
 /**
  * i915_driver_hw_probe - setup state requiring device access
  * @dev_priv: device private
@@ -613,6 +636,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        i915_perf_init(dev_priv);
 
+       i915_set_dma_mask(dev_priv);
+
        ret = i915_ggtt_probe_hw(dev_priv);
        if (ret)
                goto err_perf;
drivers/gpu/drm/i915/i915_pci.c +2 -0
index 66738f2c4f28..2fc25ec12c3d 100644
@@ -171,6 +171,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -190,6 +191,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I845_PIPE_OFFSETS, \
        I845_CURSOR_OFFSETS, \
        I9XX_COLORS, \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info i865g_info = { · line 231

Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -226,6 +228,7 @@ static const struct intel_device_info i865g_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 32, \

gen2 is set to 30b?

Quoted 28 lines
drivers/gpu/drm/i915/i915_pci.c +3 -0
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -286,6 +289,7 @@ static const struct intel_device_info g33_info = {
        PLATFORM(INTEL_G33),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_g_info = {
@@ -293,6 +297,7 @@ static const struct intel_device_info pnv_g_info = {
        PLATFORM(INTEL_PINEVIEW),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_m_info = {
@@ -301,6 +306,7 @@ static const struct intel_device_info pnv_m_info = {
        .is_mobile = 1,
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 #define GEN4_FEATURES \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info = { · line 325

Quoted 7 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -313,6 +319,7 @@ static const struct intel_device_info pnv_m_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 36, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I965_COLORS, \

I thought we had restricted i965g/i965gm to 32b.

Hmm. dma_set_coherent_mask.

Not much point tablifying one without the other?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 110 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:42 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 23 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

cc Brian Welty <[email protected]>
cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c     | 15 --------------
 drivers/gpu/drm/i915/i915_drv.c          | 25 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_pci.c          | 14 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c |  1 +
 drivers/gpu/drm/i915/intel_device_info.h |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/gt/intel_ggtt.c

Review

Quoted 47 lines

index eebd1190506f..66165b10256e 100644

drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -15
@@ -840,7 +840,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        /* TODO: We're not aware of mappable constraints on gen8 yet */
        if (!IS_DGFX(i915)) {
@@ -848,13 +847,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
                ggtt->mappable_end = resource_size(&ggtt->gmadr);
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
-
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
        if (IS_CHERRYVIEW(i915))
                size = chv_get_total_gtt_size(snb_gmch_ctl);
@@ -990,7 +982,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        ggtt->gmadr = pci_resource(pdev, 2);
        ggtt->mappable_end = resource_size(&ggtt->gmadr);
@@ -1005,12 +996,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
                return -ENXIO;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 
        size = gen6_get_total_gtt_size(snb_gmch_ctl);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.c

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct

Quoted 4 lines

index 641f5e03b661..3c5654b5d321 100644

drivers/gpu/drm/i915/i915_drv.c +0 -0
@@ -566,6 +566,29 @@ static void intel_sanitize_options(struct

drm_i915_private *dev_priv)

Quoted 12 lines
drivers/gpu/drm/i915/i915_drv.c +9 -0
        intel_gvt_sanitize_options(dev_priv);
 }
 
+/**
+ * i915_set_dma_mask - set the dma mask as configured for the platform
+ * @i915: valid i915 instance
+ *
+ * Set the dma device and coherent masks.  This needs to occur before
+ * i915_ggtt_probe_hw.
+ *
+ * NOTE: for devices < GEN(6), the dma_mask will also be set in
+ * intel_gmch_probe() (i.e. it will be set a second time).

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv)

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10 -0
+ */
+static void i915_set_dma_mask(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = i915->drm.pdev;
+       unsigned int mask_size = INTEL_INFO(i915)->dma_mask_size;
+       int err;
+
+       GEM_BUG_ON(!mask_size);
+
+       err = dma_set_mask_and_coherent(&pdev->dev,

DMA_BIT_MASK(mask_size));

Quoted 7 lines

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv) · line 589

Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
+       if (err)
+               DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);

Which device again? How serious of an error is it exactly since it is ignored? Since it is being ignored, what's the impact to the user? Should they take any action, or can they ignore it? [If they can ignore it as well, this is barely anything to take note of.]

I am keeping the "original" code path intact. The original locations spit out an error, and then ignore it.

A quick sampling of drivers shows that most drivers exit on this failure.

I am not sure why the i915 does not. I am willing to change it. 😊

Quoted 80 lines

drivers/gpu/drm/i915/i915_drv.c static int i915_driver_hw_probe(struct

Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +0 -0
 /**
  * i915_driver_hw_probe - setup state requiring device access
  * @dev_priv: device private
@@ -613,6 +636,8 @@ static int i915_driver_hw_probe(struct

drm_i915_private *dev_priv)

Review

Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
        i915_perf_init(dev_priv);
 
+       i915_set_dma_mask(dev_priv);
+
        ret = i915_ggtt_probe_hw(dev_priv);
        if (ret)
                goto err_perf;
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_pci.c

Quoted 20 lines

index 66738f2c4f28..2fc25ec12c3d 100644

drivers/gpu/drm/i915/i915_pci.c +2 -0
@@ -171,6 +171,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -190,6 +191,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I845_PIPE_OFFSETS, \
        I845_CURSOR_OFFSETS, \
        I9XX_COLORS, \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info i865g_info = { · line 231

Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -226,6 +228,7 @@ static const struct intel_device_info i865g_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 32, \

gen2 is set to 30b?

Quoted 28 lines
drivers/gpu/drm/i915/i915_pci.c +3 -0
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -286,6 +289,7 @@ static const struct intel_device_info g33_info = {
        PLATFORM(INTEL_G33),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_g_info = {
@@ -293,6 +297,7 @@ static const struct intel_device_info pnv_g_info = {
        PLATFORM(INTEL_PINEVIEW),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_m_info = {
@@ -301,6 +306,7 @@ static const struct intel_device_info pnv_m_info = {
        .is_mobile = 1,
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 #define GEN4_FEATURES \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info = { · line 325

Quoted 7 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -313,6 +319,7 @@ static const struct intel_device_info pnv_m_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 36, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I965_COLORS, \

I thought we had restricted i965g/i965gm to 32b.

Quoted 3 lines

Hmm. dma_set_coherent_mask.

Not much point tablifying one without the other?

Since these were the only two, adding this to the table seemed like overkill.

Gen2 (restricted to 30 bits), i965g and i965gm have the coherent mask set after the i915_ggtt_enable_hw occurs (in i915_drv.c)

I can move this code into the common location for setting the dma mask, but I was not clear on the ramifications of this. Do you know if there is a reason for the location of this workaround?

Note, if these calls fail, the probe does exit. Nothing like consistent behavior...

Mike

Quoted 1 line

-Chris

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Quoting Ruhl, Michael J (2020-04-17 17:05:07)

Quoted 113 lines
Quoted 113 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:42 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 23 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

cc Brian Welty <[email protected]>
cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c     | 15 --------------
 drivers/gpu/drm/i915/i915_drv.c          | 25 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_pci.c          | 14 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c |  1 +
 drivers/gpu/drm/i915/intel_device_info.h |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/gt/intel_ggtt.c

Review

Quoted 47 lines

index eebd1190506f..66165b10256e 100644

drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -15
@@ -840,7 +840,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        /* TODO: We're not aware of mappable constraints on gen8 yet */
        if (!IS_DGFX(i915)) {
@@ -848,13 +847,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
                ggtt->mappable_end = resource_size(&ggtt->gmadr);
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
-
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
        if (IS_CHERRYVIEW(i915))
                size = chv_get_total_gtt_size(snb_gmch_ctl);
@@ -990,7 +982,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        ggtt->gmadr = pci_resource(pdev, 2);
        ggtt->mappable_end = resource_size(&ggtt->gmadr);
@@ -1005,12 +996,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
                return -ENXIO;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 
        size = gen6_get_total_gtt_size(snb_gmch_ctl);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.c

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct

Quoted 4 lines

index 641f5e03b661..3c5654b5d321 100644

drivers/gpu/drm/i915/i915_drv.c +0 -0
@@ -566,6 +566,29 @@ static void intel_sanitize_options(struct

drm_i915_private *dev_priv)

Quoted 12 lines
drivers/gpu/drm/i915/i915_drv.c +9 -0
        intel_gvt_sanitize_options(dev_priv);
 }
 
+/**
+ * i915_set_dma_mask - set the dma mask as configured for the platform
+ * @i915: valid i915 instance
+ *
+ * Set the dma device and coherent masks.  This needs to occur before
+ * i915_ggtt_probe_hw.
+ *
+ * NOTE: for devices < GEN(6), the dma_mask will also be set in
+ * intel_gmch_probe() (i.e. it will be set a second time).

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv)

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10 -0
+ */
+static void i915_set_dma_mask(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = i915->drm.pdev;
+       unsigned int mask_size = INTEL_INFO(i915)->dma_mask_size;
+       int err;
+
+       GEM_BUG_ON(!mask_size);
+
+       err = dma_set_mask_and_coherent(&pdev->dev,

DMA_BIT_MASK(mask_size));

Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
+       if (err)
+               DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);
Quoted 7 lines
Quoted 4 lines

Which device again? How serious of an error is it exactly since it is ignored? Since it is being ignored, what's the impact to the user? Should they take any action, or can they ignore it? [If they can ignore it as well, this is barely anything to take note of.]

I am keeping the "original" code path intact. The original locations spit out an error, and then ignore it.

You changed from drm_err() though :-p

Quoted 3 lines

A quick sampling of drivers shows that most drivers exit on this failure.

I am not sure why the i915 does not. I am willing to change it. 😊

If we cannot constrain the mask to be a subset of the device capabilities we probably should bail. I'm happy if you do propagate the error.

Quoted 85 lines
Quoted 81 lines

drivers/gpu/drm/i915/i915_drv.c static int i915_driver_hw_probe(struct

Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +0 -0
 /**
  * i915_driver_hw_probe - setup state requiring device access
  * @dev_priv: device private
@@ -613,6 +636,8 @@ static int i915_driver_hw_probe(struct

drm_i915_private *dev_priv)

Review

Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
        i915_perf_init(dev_priv);
 
+       i915_set_dma_mask(dev_priv);
+
        ret = i915_ggtt_probe_hw(dev_priv);
        if (ret)
                goto err_perf;
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_pci.c

Quoted 20 lines

index 66738f2c4f28..2fc25ec12c3d 100644

drivers/gpu/drm/i915/i915_pci.c +2 -0
@@ -171,6 +171,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -190,6 +191,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I845_PIPE_OFFSETS, \
        I845_CURSOR_OFFSETS, \
        I9XX_COLORS, \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info i865g_info = { · line 231

Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -226,6 +228,7 @@ static const struct intel_device_info i865g_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 32, \

gen2 is set to 30b?

Quoted 28 lines
drivers/gpu/drm/i915/i915_pci.c +3 -0
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -286,6 +289,7 @@ static const struct intel_device_info g33_info = {
        PLATFORM(INTEL_G33),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_g_info = {
@@ -293,6 +297,7 @@ static const struct intel_device_info pnv_g_info = {
        PLATFORM(INTEL_PINEVIEW),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_m_info = {
@@ -301,6 +306,7 @@ static const struct intel_device_info pnv_m_info = {
        .is_mobile = 1,
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 #define GEN4_FEATURES \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info = { · line 325

Quoted 7 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -313,6 +319,7 @@ static const struct intel_device_info pnv_m_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 36, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I965_COLORS, \

I thought we had restricted i965g/i965gm to 32b.

Quoted 3 lines

Hmm. dma_set_coherent_mask.

Not much point tablifying one without the other?

Quoted 8 lines

Since these were the only two, adding this to the table seemed like overkill.

Gen2 (restricted to 30 bits), i965g and i965gm have the coherent mask set after the i915_ggtt_enable_hw occurs (in i915_drv.c)

I can move this code into the common location for setting the dma mask, but I was not clear on the ramifications of this. Do you know if there is a reason for the location of this workaround?

Tbh, I was surprised the pci_set_dma_mask() was being so late in ggtt probe :)

But the only reason why the dma_set_coherent_mask() is being done much earlier is because that was historically where we were first handed the pci device and so where we configure the pci_dev (as opposed to thinking of operating on the drm_i915_device).

There should not be a problem pulling them into the same location, and returning an error in case of failure. And if we do that we might as well do something like:

i915_set_dma_mask {
	int dma_mask_size = INTEL_INFO(i915)->dma_mask_size;

	err = dma_set_mask(&i915->drm.dev, DMA_BIT_MASK(dma_mask_size));
	if (err)
		goto err;

	/* w/a overlay... */
	if (IS_GEN2)
		dma_mask_size = 30;

	/* w/a lots of fun restrictions */
	if (IS_I965G...)
		dma_mask_size = 32;

	err = dma_set_coherent_mask(&i915->drm.dev, DMA_BIT_MASK(dma_mask_size));
	if (err)
		goto err;

	return 0;

err:

	drm_err(&i915->drm, "....");
	return err;
}

?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 136 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 12:17 PM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Ruhl, Michael J (2020-04-17 17:05:07)

Quoted 19 lines
Quoted 19 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:42 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 10 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Note: GEN(5) and down is also set in intel_gmch_probe().

cc Brian Welty <[email protected]>
cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c     | 15 --------------
 drivers/gpu/drm/i915/i915_drv.c          | 25

++++++++++++++++++++++++

Quoted 11 lines
Quoted 11 lines

Review

Quoted 6 lines
 drivers/gpu/drm/i915/i915_pci.c          | 14 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c |  1 +
 drivers/gpu/drm/i915/intel_device_info.h |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/gt/intel_ggtt.c

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen8_gmch_probe(struct i915_ggtt

Quoted 4 lines

index eebd1190506f..66165b10256e 100644

drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -0
@@ -840,7 +840,6 @@ static int gen8_gmch_probe(struct i915_ggtt

*ggtt)

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen8_gmch_probe(struct i915_ggtt

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -1
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        /* TODO: We're not aware of mappable constraints on gen8 yet */
        if (!IS_DGFX(i915)) {
@@ -848,13 +847,6 @@ static int gen8_gmch_probe(struct i915_ggtt

*ggtt)

Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen8_gmch_probe(struct i915_ggtt *ggtt)

Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -3
                ggtt->mappable_end = resource_size(&ggtt->gmadr);
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev,

DMA_BIT_MASK(39));

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen6_gmch_probe(struct i915_ggtt

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -4
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
-
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
        if (IS_CHERRYVIEW(i915))
                size = chv_get_total_gtt_size(snb_gmch_ctl);
@@ -990,7 +982,6 @@ static int gen6_gmch_probe(struct i915_ggtt

*ggtt)

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen6_gmch_probe(struct i915_ggtt

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -1
        struct pci_dev *pdev = i915->drm.pdev;
        unsigned int size;
        u16 snb_gmch_ctl;
-       int err;
 
        ggtt->gmadr = pci_resource(pdev, 2);
        ggtt->mappable_end = resource_size(&ggtt->gmadr);
@@ -1005,12 +996,6 @@ static int gen6_gmch_probe(struct i915_ggtt

*ggtt)

Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/i915/gt/intel_ggtt.c static int gen6_gmch_probe(struct i915_ggtt *ggtt)

Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -3
                return -ENXIO;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-       if (!err)
-               err = pci_set_consistent_dma_mask(pdev,

DMA_BIT_MASK(40));

Quoted 13 lines
Quoted 13 lines

Review

Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +0 -3
-       if (err)
-               drm_err(&i915->drm,
-                       "Can't set DMA mask/consistent mask (%d)\n", err);
        pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
 
        size = gen6_get_total_gtt_size(snb_gmch_ctl);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.c

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct

Quoted 4 lines

index 641f5e03b661..3c5654b5d321 100644

drivers/gpu/drm/i915/i915_drv.c +0 -0
@@ -566,6 +566,29 @@ static void intel_sanitize_options(struct

drm_i915_private *dev_priv)

Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv)

Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
        intel_gvt_sanitize_options(dev_priv);
 }
 
+/**
+ * i915_set_dma_mask - set the dma mask as configured for the

platform

Quoted 18 lines
Quoted 18 lines
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +7 -0
+ * @i915: valid i915 instance
+ *
+ * Set the dma device and coherent masks.  This needs to occur before
+ * i915_ggtt_probe_hw.
+ *
+ * NOTE: for devices < GEN(6), the dma_mask will also be set in
+ * intel_gmch_probe() (i.e. it will be set a second time).

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct drm_i915_private *dev_priv)

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10 -0
+ */
+static void i915_set_dma_mask(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = i915->drm.pdev;
+       unsigned int mask_size = INTEL_INFO(i915)->dma_mask_size;
+       int err;
+
+       GEM_BUG_ON(!mask_size);
+
+       err = dma_set_mask_and_coherent(&pdev->dev,

DMA_BIT_MASK(mask_size));

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/i915_drv.c static void intel_sanitize_options(struct · line 589

Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
+       if (err)
+               DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n",

err);

Quoted 6 lines
Quoted 5 lines

Which device again? How serious of an error is it exactly since it is ignored? Since it is being ignored, what's the impact to the user? Should they take any action, or can they ignore it? [If they can ignore it as well, this is barely anything to take note of.]

Quoted 4 lines
Quoted 2 lines

I am keeping the "original" code path intact. The original locations spit out an error, and then ignore it.

You changed from drm_err() though :-p

Yeah, not sure why I did that....

Quoted 7 lines
Quoted 3 lines

A quick sampling of drivers shows that most drivers exit on this failure.

I am not sure why the i915 does not. I am willing to change it. 😊

If we cannot constrain the mask to be a subset of the device capabilities we probably should bail. I'm happy if you do propagate the error.

I will update.

Quoted 90 lines
Quoted 53 lines
Quoted 53 lines

drivers/gpu/drm/i915/i915_drv.c static int i915_driver_hw_probe(struct

Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +0 -0
 /**
  * i915_driver_hw_probe - setup state requiring device access
  * @dev_priv: device private
@@ -613,6 +636,8 @@ static int i915_driver_hw_probe(struct

drm_i915_private *dev_priv)

Review

Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +2 -0
        i915_perf_init(dev_priv);
 
+       i915_set_dma_mask(dev_priv);
+
        ret = i915_ggtt_probe_hw(dev_priv);
        if (ret)
                goto err_perf;
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_pci.c

Quoted 20 lines

index 66738f2c4f28..2fc25ec12c3d 100644

drivers/gpu/drm/i915/i915_pci.c +2 -0
@@ -171,6 +171,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -190,6 +191,7 @@
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = false, \
+       .dma_mask_size = 32, \
        I845_PIPE_OFFSETS, \
        I845_CURSOR_OFFSETS, \
        I9XX_COLORS, \

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info i865g_info = { · line 231

Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -226,6 +228,7 @@ static const struct intel_device_info i865g_info = {
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 32, \

gen2 is set to 30b?

Quoted 10 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I9XX_COLORS, \
@@ -286,6 +289,7 @@ static const struct intel_device_info g33_info = {
        PLATFORM(INTEL_G33),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_g_info =

Quoted 2 lines
drivers/gpu/drm/i915/i915_pci.c +0 -0
 static const struct intel_device_info pnv_g_info = {
@@ -293,6 +297,7 @@ static const struct intel_device_info pnv_g_info =

{

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info =

Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
        PLATFORM(INTEL_PINEVIEW),
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 static const struct intel_device_info pnv_m_info = {
@@ -301,6 +306,7 @@ static const struct intel_device_info pnv_m_info =

{

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info =

Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
        .is_mobile = 1,
        .display.has_hotplug = 1,
        .display.has_overlay = 1,
+       .dma_mask_size = 36,
 };
 
 #define GEN4_FEATURES \
@@ -313,6 +319,7 @@ static const struct intel_device_info pnv_m_info =

{

Quoted 16 lines
Quoted 8 lines

drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pnv_m_info = { · line 325

Quoted 7 lines
drivers/gpu/drm/i915/i915_pci.c +1 -0
        .engine_mask = BIT(RCS0), \
        .has_snoop = true, \
        .has_coherent_ggtt = true, \
+       .dma_mask_size = 36, \
        I9XX_PIPE_OFFSETS, \
        I9XX_CURSOR_OFFSETS, \
        I965_COLORS, \
Quoted 5 lines

I thought we had restricted i965g/i965gm to 32b.

Hmm. dma_set_coherent_mask.

Not much point tablifying one without the other?

Since these were the only two, adding this to the table seemed like overkill.

Quoted 9 lines
Quoted 1 line

Gen2 (restricted to 30 bits), i965g and i965gm have the coherent mask set

after

Quoted 3 lines

the i915_ggtt_enable_hw occurs (in i915_drv.c)

I can move this code into the common location for setting the dma mask,

but I

Quoted 1 line

was not clear on the ramifications of this. Do you know if there is a reason

for

Quoted 1 line

the location of this workaround?

Ahh, I just remembered why I did not put the work arounds in the new helper.

I discovered that the intel_gmch_probe() code is in the char/agp directory, so the path is:

i915 set dma_mask
< gen5 set dma_mask
i915 < gen 5 work arounds

If I put the workarounds in the set dma mask, I lose the workaround.

Hmmm, intel_gmch_probe() has "gpu_pdev" to indicate that it is being inited from i915. I could use this to skip the dma mask setting for this path.

Is that reasonable?

Mike

Quoted 36 lines

Tbh, I was surprised the pci_set_dma_mask() was being so late in ggtt probe :)

But the only reason why the dma_set_coherent_mask() is being done much earlier is because that was historically where we were first handed the pci device and so where we configure the pci_dev (as opposed to thinking of operating on the drm_i915_device).

There should not be a problem pulling them into the same location, and returning an error in case of failure. And if we do that we might as well do something like:

i915_set_dma_mask {
	int dma_mask_size = INTEL_INFO(i915)->dma_mask_size;

	err = dma_set_mask(&i915->drm.dev,
DMA_BIT_MASK(dma_mask_size));
	if (err)
		goto err;

	/* w/a overlay... */
	if (IS_GEN2)
		dma_mask_size = 30;

	/* w/a lots of fun restrictions */
	if (IS_I965G...)
		dma_mask_size = 32;

	err = dma_set_coherent_mask(&i915->drm.dev,
DMA_BIT_MASK(dma_mask_size));
	if (err)
		goto err;

	return 0;

err:

Quoted 8 lines
	drm_err(&i915->drm, "....");
	return err;
}

?
-Chris

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Quoting Ruhl, Michael J (2020-04-17 18:14:24)

Quoted 10 lines

Ahh, I just remembered why I did not put the work arounds in the new helper.

I discovered that the intel_gmch_probe() code is in the char/agp directory, so the path is:

i915 set dma_mask
< gen5 set dma_mask
i915 < gen 5 work arounds

Quoted 7 lines

If I put the workarounds in the set dma mask, I lose the workaround.

Hmmm, intel_gmch_probe() has "gpu_pdev" to indicate that it is being inited from i915. I could use this to skip the dma mask setting for this path.

Is that reasonable?

If this is the straw the breaks the camel's back to pull in the gmch code under gt/, let me add a pile of hay!

Honestly, I would set the dma masks as we think they should be here and if they are being overridden in char/agp, so be it. When we do pull the code out, it will remain correct; and overall with the refactoring you are doing the driver will be much more consistent across all gen. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
In reply to Michael J. Ruhl

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 11 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

Assume we pull that code into i915.ko, we will one day. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
Quoted 14 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:43 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 5 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Quoted 8 lines
Quoted 6 lines

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

Assume we pull that code into i915.ko, we will one day.

The gen5 stuff has the same dma_mask_size that I added to the i915 config structures.

I thought about pulling it out of the gen 5 area, but it appears that that can be built as a separate driver, and if I pulled it out, the ability for it to be set in that path would be lost.

M

Quoted 1 line

-Chris

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

Quoting Ruhl, Michael J (2020-04-17 17:07:24)

Quoted 21 lines
Quoted 21 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:43 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 11 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

Quoted 8 lines
Quoted 1 line

Assume we pull that code into i915.ko, we will one day.

The gen5 stuff has the same dma_mask_size that I added to the i915 config structures.

I thought about pulling it out of the gen 5 area, but it appears that that can be built as a separate driver, and if I pulled it out, the ability for it to be set in that path would be lost.

It's not viable standalone anymore. It's over a decade dead by this point, we can drop the old AGP interface and then the sole user is i915.ko. Even if we did not, you can't use the AGP interface at the same time as i915.ko so we can just orphan char/agp, and use our own code. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 35 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 12:20 PM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Ruhl, Michael J (2020-04-17 17:07:24)

Quoted 26 lines
Quoted 14 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:43 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 5 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Quoted 8 lines
Quoted 6 lines

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

Assume we pull that code into i915.ko, we will one day.

The gen5 stuff has the same dma_mask_size that I added to the i915 config structures.

Quoted 8 lines
Quoted 3 lines

I thought about pulling it out of the gen 5 area, but it appears that that can be built as a separate driver, and if I pulled it out, the ability for it to be set in that path would be lost.

It's not viable standalone anymore. It's over a decade dead by this point, we can drop the old AGP interface and then the sole user is i915.ko. Even if we did not, you can't use the AGP interface at the same time as i915.ko so we can just orphan char/agp, and use our own code.

Ok, so can I do something like this in char/agp/intel-gtt.c:

#if IS_ENABLED(CONFIG_AGP_INTEL)
	mask = intel_private.driver->dma_mask_size;
	if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
		dev_err(&intel_private.pcidev->dev,
			"set gfx device dma mask %d-bit failed!\n", mask);
	else
		pci_set_consistent_dma_mask(intel_private.pcidev,
					    DMA_BIT_MASK(mask));

#endif

This would fix my flow issue from the previous comments.

Mike

Quoted 1 line

-Chris

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
Quoted 61 lines

-----Original Message-----
From: Ruhl, Michael J
Sent: Friday, April 17, 2020 1:21 PM
To: 'Chris Wilson' <[email protected]>; [email protected]
Subject: RE: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoted 35 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 12:20 PM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Ruhl, Michael J (2020-04-17 17:07:24)

Quoted 26 lines
Quoted 14 lines

-----Original Message-----
From: Chris Wilson <[email protected]>
Sent: Friday, April 17, 2020 11:43 AM
To: Ruhl, Michael J <[email protected]>; intel- [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refactor dma mask usage to a common helper

Quoting Michael J. Ruhl (2020-04-17 16:22:44)

Quoted 5 lines

DMA_MASK bit values are different for different generations.

This will become more difficult to manage over time with the open coded usage of different versions of the device.

Quoted 8 lines
Quoted 6 lines

Fix by:
adding dma_mask_size to the device info configuration, updating open code call sequence to the latest interface, refactoring into a common function for setting the dma_mask

Note: GEN(5) and down is also set in intel_gmch_probe().

Assume we pull that code into i915.ko, we will one day.

The gen5 stuff has the same dma_mask_size that I added to the i915 config structures.

Quoted 8 lines
Quoted 3 lines

I thought about pulling it out of the gen 5 area, but it appears that that can be built as a separate driver, and if I pulled it out, the ability for it to be set in that path would be lost.

It's not viable standalone anymore. It's over a decade dead by this point, we can drop the old AGP interface and then the sole user is i915.ko. Even if we did not, you can't use the AGP interface at the same time as i915.ko so we can just orphan char/agp, and use our own code.

Ok, so can I do something like this in char/agp/intel-gtt.c:

#if IS_ENABLED(CONFIG_AGP_INTEL)
	mask = intel_private.driver->dma_mask_size;
	if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
		dev_err(&intel_private.pcidev->dev,
			"set gfx device dma mask %d-bit failed!\n", mask);
	else
		pci_set_consistent_dma_mask(intel_private.pcidev,
					    DMA_BIT_MASK(mask));
Quoted 1 line

#endif

Hmmm, will still need to add an "if (bridge)" around it as well.

M

Quoted 6 lines

This would fix my flow issue from the previous comments.

Mike

Quoted 1 line

-Chris

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

[Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/i915: Refactor dma mask usage to a common helper

In reply to Michael J. Ruhl
== Series Details ==

== Series Details ==

Series: drm/i915: Refactor dma mask usage to a common helper
URL : https://patchwork.freedesktop.org/series/76104/
State : warning

== Summary ==

$ make htmldocs 2>&1 > /dev/null | grep i915
/home/cidrm/kernel/Documentation/gpu/i915.rst:610: WARNING: duplicate label gpu/i915:layout, other instance in /home/cidrm/kernel/Documentation/gpu/i915.rst

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Refactor dma mask usage to a common helper

In reply to Michael J. Ruhl
== Series Details ==

== Series Details ==

Series: drm/i915: Refactor dma mask usage to a common helper
URL : https://patchwork.freedesktop.org/series/76104/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8322 -> Patchwork_17355
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/index.html

Known issues
------------

Here are the changes found in Patchwork_17355 that come from known issues:

### IGT changes ###

#### Warnings ####

* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][1] ([fdo#109271]) -> [FAIL][2] ([i915#62])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/fi-kbl-x1275/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/fi-kbl-x1275/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62

Participating hosts (51 -> 45)
------------------------------

Additional (1): fi-cml-u2
Missing (7): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-kbl-7560u fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8322 -> Patchwork_17355

CI-20190529: 20190529
CI_DRM_8322: fd447e6b1ee13e6a9731bddc7694552640e8a01e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5599: cdb07101dda33e2fcb0f4c2aa199c47159d88f35 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17355: f02e648584585c3b3d8da4049e2e4fb41b8026a3 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

f02e64858458 drm/i915: Refactor dma mask usage to a common helper

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#13 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Refactor dma mask usage to a common helper

In reply to Michael J. Ruhl
== Series Details ==

== Series Details ==

Series: drm/i915: Refactor dma mask usage to a common helper
URL : https://patchwork.freedesktop.org/series/76104/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8322_full -> Patchwork_17355_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_17355_full:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* {igt@kms_flip@flip-vs-suspend-interruptible@c-edp1}:
- shard-skl: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl6/igt@kms_flip@[email protected]

Known issues
------------

Here are the changes found in Patchwork_17355_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload-with-fault-injection:
- shard-glk: [PASS][2] -> [INCOMPLETE][3] ([i915#58] / [k.org#198133])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-glk6/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-glk2/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-snb: [PASS][4] -> [FAIL][5] ([i915#1066])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-snb6/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-snb1/igt@[email protected]

* igt@i915_suspend@sysfs-reader:
- shard-apl: [PASS][6] -> [DMESG-WARN][7] ([i915#180]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-apl6/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-apl6/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-128x42-random:
- shard-kbl: [PASS][8] -> [FAIL][9] ([i915#54] / [i915#93] / [i915#95])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl1/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl2/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-64x21-offscreen:
- shard-skl: [PASS][10] -> [FAIL][11] ([i915#54])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl7/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl4/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [PASS][12] -> [SKIP][13] ([fdo#109349])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb2/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb5/igt@[email protected]

* igt@kms_fbcon_fbt@psr-suspend:
- shard-tglb: [PASS][14] -> [SKIP][15] ([i915#668])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-tglb7/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-tglb6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][16] -> [INCOMPLETE][17] ([i915#155])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl7/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl1/igt@[email protected]

* igt@kms_mmap_write_crc@main:
- shard-kbl: [PASS][18] -> [FAIL][19] ([i915#93] / [i915#95])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl4/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl4/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [PASS][20] -> [DMESG-WARN][21] ([i915#180]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][22] -> [FAIL][23] ([fdo#108145] / [i915#265])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl8/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl5/igt@[email protected]

* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][24] -> [FAIL][25] ([i915#173])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb3/igt@kms_psr@no_drrs.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb1/igt@kms_psr@no_drrs.html

* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][26] -> [SKIP][27] ([fdo#109441]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb6/igt@kms_psr@psr2_cursor_render.html

* igt@kms_setmode@basic:
- shard-kbl: [PASS][28] -> [FAIL][29] ([i915#31])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl6/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl2/igt@[email protected]

* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-iclb: [PASS][30] -> [INCOMPLETE][31] ([i915#1185])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb2/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb3/igt@[email protected]

#### Possible fixes ####

* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][32] ([i915#300]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl1/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl6/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-render-ytiled:
- shard-glk: [FAIL][34] ([i915#52] / [i915#54]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-glk6/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-glk4/igt@[email protected]

* {igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1}:
- shard-skl: [FAIL][36] ([i915#79]) -> [PASS][37] +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl8/igt@kms_flip@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl8/igt@kms_flip@[email protected]

* {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}:
- shard-apl: [DMESG-WARN][38] ([i915#180]) -> [PASS][39] +3 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-apl3/igt@kms_flip@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-apl8/igt@kms_flip@[email protected]

* {igt@kms_flip@plain-flip-ts-check@c-edp1}:
- shard-skl: [FAIL][40] ([i915#34]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl9/igt@kms_flip@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl1/igt@kms_flip@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [DMESG-WARN][42] ([i915#180]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-kbl7/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-kbl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][44] ([fdo#108145] / [i915#265]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-skl7/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-skl9/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][46] ([fdo#109642] / [fdo#111068]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb7/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb2/igt@[email protected]

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][48] ([fdo#109441]) -> [PASS][49] +3 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html

* {igt@perf@polling-small-buf}:
- shard-iclb: [FAIL][50] -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-iclb3/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-iclb4/igt@[email protected]

* {igt@sysfs_timeslice_duration@timeout@vecs0}:
- shard-apl: [FAIL][52] -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8322/shard-apl2/igt@sysfs_timeslice_duration@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/shard-apl3/igt@sysfs_timeslice_duration@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1066]: https://gitlab.freedesktop.org/drm/intel/issues/1066
[i915#1185]: https://gitlab.freedesktop.org/drm/intel/issues/1185
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8322 -> Patchwork_17355

CI-20190529: 20190529
CI_DRM_8322: fd447e6b1ee13e6a9731bddc7694552640e8a01e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5599: cdb07101dda33e2fcb0f4c2aa199c47159d88f35 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17355: f02e648584585c3b3d8da4049e2e4fb41b8026a3 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17355/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx