All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: check for drm_universal_plane_init error
@ 2016-03-21 13:19 Matthew Auld
  2016-03-21 13:50 ` Ville Syrjälä
  2016-03-21 17:06 ` ✗ Fi.CI.BAT: warning for " Patchwork
  0 siblings, 2 replies; 3+ messages in thread
From: Matthew Auld @ 2016-03-21 13:19 UTC (permalink / raw)
  To: intel-gfx

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 74b0165..b728f36 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13965,6 +13965,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
 	struct intel_plane_state *state;
 	const uint32_t *intel_primary_formats;
 	unsigned int num_formats;
+	int ret;
 
 	primary = kzalloc(sizeof(*primary), GFP_KERNEL);
 	if (primary == NULL)
@@ -14016,10 +14017,14 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
 		primary->disable_plane = i9xx_disable_primary_plane;
 	}
 
-	drm_universal_plane_init(dev, &primary->base, 0,
-				 &intel_plane_funcs,
-				 intel_primary_formats, num_formats,
-				 DRM_PLANE_TYPE_PRIMARY, NULL);
+	ret = drm_universal_plane_init(dev, &primary->base, 0,
+				       &intel_plane_funcs,
+				       intel_primary_formats, num_formats,
+				       DRM_PLANE_TYPE_PRIMARY, NULL);
+	if (ret) {
+		kfree(primary);
+		return ERR_PTR(ret);
+	}
 
 	if (INTEL_INFO(dev)->gen >= 4)
 		intel_create_rotation_property(dev, primary);
@@ -14145,6 +14150,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
 {
 	struct intel_plane *cursor;
 	struct intel_plane_state *state;
+	int ret;
 
 	cursor = kzalloc(sizeof(*cursor), GFP_KERNEL);
 	if (cursor == NULL)
@@ -14166,11 +14172,15 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
 	cursor->update_plane = intel_update_cursor_plane;
 	cursor->disable_plane = intel_disable_cursor_plane;
 
-	drm_universal_plane_init(dev, &cursor->base, 0,
-				 &intel_plane_funcs,
-				 intel_cursor_formats,
-				 ARRAY_SIZE(intel_cursor_formats),
-				 DRM_PLANE_TYPE_CURSOR, NULL);
+	ret = drm_universal_plane_init(dev, &cursor->base, 0,
+				       &intel_plane_funcs,
+				       intel_cursor_formats,
+				       ARRAY_SIZE(intel_cursor_formats),
+				       DRM_PLANE_TYPE_CURSOR, NULL);
+	if (ret) {
+		kfree(cursor);
+		return ERR_PTR(ret);
+	}
 
 	if (INTEL_INFO(dev)->gen >= 4) {
 		if (!dev->mode_config.rotation_property)
@@ -14239,11 +14249,11 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
 	}
 
 	primary = intel_primary_plane_create(dev, pipe);
-	if (!primary)
+	if (IS_ERR_OR_NULL(primary))
 		goto fail;
 
 	cursor = intel_cursor_plane_create(dev, pipe);
-	if (!cursor)
+	if (IS_ERR_OR_NULL(cursor))
 		goto fail;
 
 	ret = drm_crtc_init_with_planes(dev, &intel_crtc->base, primary,
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: check for drm_universal_plane_init error
  2016-03-21 13:19 [PATCH] drm/i915: check for drm_universal_plane_init error Matthew Auld
@ 2016-03-21 13:50 ` Ville Syrjälä
  2016-03-21 17:06 ` ✗ Fi.CI.BAT: warning for " Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: Ville Syrjälä @ 2016-03-21 13:50 UTC (permalink / raw)
  To: Matthew Auld; +Cc: intel-gfx

On Mon, Mar 21, 2016 at 01:19:24PM +0000, Matthew Auld wrote:
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>

Missing commit message. Also I have a patch sitting on the list
somewhere that does this and cleans up even more of the mess.

I guess this was the last version
https://lists.freedesktop.org/archives/intel-gfx/2015-December/082368.html

> ---
>  drivers/gpu/drm/i915/intel_display.c | 32 +++++++++++++++++++++-----------
>  1 file changed, 21 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 74b0165..b728f36 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13965,6 +13965,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
>  	struct intel_plane_state *state;
>  	const uint32_t *intel_primary_formats;
>  	unsigned int num_formats;
> +	int ret;
>  
>  	primary = kzalloc(sizeof(*primary), GFP_KERNEL);
>  	if (primary == NULL)
> @@ -14016,10 +14017,14 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
>  		primary->disable_plane = i9xx_disable_primary_plane;
>  	}
>  
> -	drm_universal_plane_init(dev, &primary->base, 0,
> -				 &intel_plane_funcs,
> -				 intel_primary_formats, num_formats,
> -				 DRM_PLANE_TYPE_PRIMARY, NULL);
> +	ret = drm_universal_plane_init(dev, &primary->base, 0,
> +				       &intel_plane_funcs,
> +				       intel_primary_formats, num_formats,
> +				       DRM_PLANE_TYPE_PRIMARY, NULL);
> +	if (ret) {
> +		kfree(primary);
> +		return ERR_PTR(ret);
> +	}
>  
>  	if (INTEL_INFO(dev)->gen >= 4)
>  		intel_create_rotation_property(dev, primary);
> @@ -14145,6 +14150,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
>  {
>  	struct intel_plane *cursor;
>  	struct intel_plane_state *state;
> +	int ret;
>  
>  	cursor = kzalloc(sizeof(*cursor), GFP_KERNEL);
>  	if (cursor == NULL)
> @@ -14166,11 +14172,15 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
>  	cursor->update_plane = intel_update_cursor_plane;
>  	cursor->disable_plane = intel_disable_cursor_plane;
>  
> -	drm_universal_plane_init(dev, &cursor->base, 0,
> -				 &intel_plane_funcs,
> -				 intel_cursor_formats,
> -				 ARRAY_SIZE(intel_cursor_formats),
> -				 DRM_PLANE_TYPE_CURSOR, NULL);
> +	ret = drm_universal_plane_init(dev, &cursor->base, 0,
> +				       &intel_plane_funcs,
> +				       intel_cursor_formats,
> +				       ARRAY_SIZE(intel_cursor_formats),
> +				       DRM_PLANE_TYPE_CURSOR, NULL);
> +	if (ret) {
> +		kfree(cursor);
> +		return ERR_PTR(ret);
> +	}
>  
>  	if (INTEL_INFO(dev)->gen >= 4) {
>  		if (!dev->mode_config.rotation_property)
> @@ -14239,11 +14249,11 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
>  	}
>  
>  	primary = intel_primary_plane_create(dev, pipe);
> -	if (!primary)
> +	if (IS_ERR_OR_NULL(primary))
>  		goto fail;
>  
>  	cursor = intel_cursor_plane_create(dev, pipe);
> -	if (!cursor)
> +	if (IS_ERR_OR_NULL(cursor))
>  		goto fail;
>  
>  	ret = drm_crtc_init_with_planes(dev, &intel_crtc->base, primary,
> -- 
> 2.4.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: check for drm_universal_plane_init error
  2016-03-21 13:19 [PATCH] drm/i915: check for drm_universal_plane_init error Matthew Auld
  2016-03-21 13:50 ` Ville Syrjälä
@ 2016-03-21 17:06 ` Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2016-03-21 17:06 UTC (permalink / raw)
  To: Matthew Auld; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: check for drm_universal_plane_init error
URL   : https://patchwork.freedesktop.org/series/4703/
State : warning

== Summary ==

Series 4703v1 drm/i915: check for drm_universal_plane_init error
http://patchwork.freedesktop.org/api/1.0/series/4703/revisions/1/mbox/

Test gem_ringfill:
        Subgroup basic-default-s3:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-wf_vblank:
                fail       -> PASS       (bdw-ultra)
        Subgroup basic-plain-flip:
                dmesg-warn -> PASS       (hsw-brixbox)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                pass       -> DMESG-WARN (snb-x220t)
                pass       -> SKIP       (ilk-hp8440p)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                pass       -> DMESG-WARN (snb-x220t)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (hsw-brixbox)
        Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t)

bdw-nuci7        total:194  pass:182  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:194  pass:173  dwarn:0   dfail:0   fail:0   skip:21 
bsw-nuc-2        total:194  pass:156  dwarn:1   dfail:0   fail:0   skip:37 
byt-nuc          total:194  pass:159  dwarn:0   dfail:0   fail:0   skip:35 
hsw-brixbox      total:194  pass:172  dwarn:0   dfail:0   fail:0   skip:22 
hsw-gt2          total:194  pass:176  dwarn:1   dfail:0   fail:0   skip:17 
ilk-hp8440p      total:194  pass:129  dwarn:1   dfail:0   fail:0   skip:64 
ivb-t430s        total:194  pass:169  dwarn:0   dfail:0   fail:0   skip:25 
skl-i5k-2        total:194  pass:171  dwarn:0   dfail:0   fail:0   skip:23 
skl-i7k-2        total:194  pass:171  dwarn:0   dfail:0   fail:0   skip:23 
skl-nuci5        total:194  pass:183  dwarn:0   dfail:0   fail:0   skip:11 
snb-dellxps      total:194  pass:159  dwarn:1   dfail:0   fail:0   skip:34 
snb-x220t        total:194  pass:158  dwarn:2   dfail:0   fail:1   skip:33 

Results at /archive/results/CI_IGT_test/Patchwork_1661/

3b8b9e2deb9f23e1a841d0f9d80296a9759ff8f8 drm-intel-nightly: 2016y-03m-21d-13h-03m-53s UTC integration manifest
9e31679485ece131c3370d3ed04fb62d338f80b5 drm/i915: check for drm_universal_plane_init error

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-21 17:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-21 13:19 [PATCH] drm/i915: check for drm_universal_plane_init error Matthew Auld
2016-03-21 13:50 ` Ville Syrjälä
2016-03-21 17:06 ` ✗ Fi.CI.BAT: warning for " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.