diff mbox

drm/i915: Actually attach the tv_format property to the SDVO connector

Message ID 20170615172308.10121-1-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjala June 15, 2017, 5:23 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Attach the tv_format property to the SDVO connector instead of passing
a '0' in place of the pointer to the property. This got broken when
the SDVO connector properties were converted to atomic.

We can thank sparse for catching this:
drivers/gpu/drm/i915/intel_sdvo.c:2742:75: warning: Using plain integer as NULL pointer

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: 630d30a4ee27 ("drm/i915: Convert intel_sdvo connector properties to atomic.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_sdvo.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Rodrigo Vivi June 15, 2017, 5:28 p.m. UTC | #1
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Thu, Jun 15, 2017 at 10:23 AM,  <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Attach the tv_format property to the SDVO connector instead of passing
> a '0' in place of the pointer to the property. This got broken when
> the SDVO connector properties were converted to atomic.
>
> We can thank sparse for catching this:
> drivers/gpu/drm/i915/intel_sdvo.c:2742:75: warning: Using plain integer as NULL pointer
>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Fixes: 630d30a4ee27 ("drm/i915: Convert intel_sdvo connector properties to atomic.")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_sdvo.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index f4329d20b6f6..3f8f30b412cd 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2739,7 +2739,8 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
>                                 i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
>
>         intel_sdvo_connector->base.base.state->tv.mode = intel_sdvo_connector->tv_format_supported[0];
> -       drm_object_attach_property(&intel_sdvo_connector->base.base.base, 0, 0);
> +       drm_object_attach_property(&intel_sdvo_connector->base.base.base,
> +                                  intel_sdvo_connector->tv_format, 0);
>         return true;
>
>  }
> --
> 2.13.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjala June 16, 2017, 1:07 p.m. UTC | #2
On Thu, Jun 15, 2017 at 05:56:52PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Actually attach the tv_format property to the SDVO connector
> URL   : https://patchwork.freedesktop.org/series/25860/
> State : warning
> 
> == Summary ==
> 
> Series 25860v1 drm/i915: Actually attach the tv_format property to the SDVO connector
> https://patchwork.freedesktop.org/api/1.0/series/25860/revisions/1/mbox/
> 
> Test gem_exec_flush:
>         Subgroup basic-batch-kernel-default-uc:
>                 pass       -> FAIL       (fi-snb-2600) fdo#100007
> Test kms_cursor_legacy:
>         Subgroup basic-busy-flip-before-cursor-legacy:
>                 fail       -> PASS       (fi-snb-2600) fdo#100215
> Test kms_pipe_crc_basic:
>         Subgroup bad-nb-words-1:
>                 pass       -> DMESG-WARN (fi-skl-6700hq)
>         Subgroup bad-nb-words-3:
>                 pass       -> DMESG-WARN (fi-skl-6700hq)
>         Subgroup bad-pipe:
>                 pass       -> DMESG-WARN (fi-skl-6700hq)
>         Subgroup bad-source:
>                 pass       -> DMESG-WARN (fi-skl-6700hq)

Same old rotting eDP panel.

[  338.510558] [drm:intel_dp_check_link_status [i915]] *ERROR* Failed to get link status
[  339.336178] [drm:intel_dp_check_link_status [i915]] *ERROR* Failed to get link status

https://bugs.freedesktop.org/show_bug.cgi?id=101144

Patch pushed to dinq. Thanks for the review.

>         Subgroup hang-read-crc-pipe-a:
>                 fail       -> DMESG-FAIL (fi-skl-6700hq) fdo#101154 +15
> 
> fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
> fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
> fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154
> 
> fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:463s
> fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:484s
> fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:594s
> fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:561s
> fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:493s
> fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:485s
> fi-glk-2a        total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:594s
> fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:431s
> fi-hsw-4770r     total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:16  time:421s
> fi-ilk-650       total:278  pass:227  dwarn:0   dfail:0   fail:0   skip:50  time:462s
> fi-ivb-3520m     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:18  time:498s
> fi-ivb-3770      total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:18  time:512s
> fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:470s
> fi-kbl-7560u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:575s
> fi-kbl-r         total:278  pass:259  dwarn:1   dfail:0   fail:0   skip:18  time:575s
> fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:489s
> fi-skl-6700hq    total:278  pass:224  dwarn:5   dfail:16  fail:11  skip:22  time:470s
> fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:512s
> fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:498s
> fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:508s
> fi-snb-2520m     total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:28  time:627s
> fi-snb-2600      total:278  pass:246  dwarn:0   dfail:0   fail:2   skip:29  time:401s
> 
> b2e12a9ff1f20d8b4b7b2d25650858ea793396c2 drm-tip: 2017y-06m-15d-16h-45m-30s UTC integration manifest
> 364c8e8 drm/i915: Actually attach the tv_format property to the SDVO connector
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4962/
Maarten Lankhorst June 19, 2017, 7:28 a.m. UTC | #3
Op 15-06-17 om 19:23 schreef ville.syrjala@linux.intel.com:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Attach the tv_format property to the SDVO connector instead of passing
> a '0' in place of the pointer to the property. This got broken when
> the SDVO connector properties were converted to atomic.
>
> We can thank sparse for catching this:
> drivers/gpu/drm/i915/intel_sdvo.c:2742:75: warning: Using plain integer as NULL pointer
>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Fixes: 630d30a4ee27 ("drm/i915: Convert intel_sdvo connector properties to atomic.")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_sdvo.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index f4329d20b6f6..3f8f30b412cd 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2739,7 +2739,8 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
>  				i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
>  
>  	intel_sdvo_connector->base.base.state->tv.mode = intel_sdvo_connector->tv_format_supported[0];
> -	drm_object_attach_property(&intel_sdvo_connector->base.base.base, 0, 0);
> +	drm_object_attach_property(&intel_sdvo_connector->base.base.base,
> +				   intel_sdvo_connector->tv_format, 0);
>  	return true;
>  
>  }

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Thanks for catching!
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index f4329d20b6f6..3f8f30b412cd 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2739,7 +2739,8 @@  static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
 				i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
 
 	intel_sdvo_connector->base.base.state->tv.mode = intel_sdvo_connector->tv_format_supported[0];
-	drm_object_attach_property(&intel_sdvo_connector->base.base.base, 0, 0);
+	drm_object_attach_property(&intel_sdvo_connector->base.base.base,
+				   intel_sdvo_connector->tv_format, 0);
 	return true;
 
 }