From: Matt Roper <matthew.d.roper@intel.com>
To: Imre Deak <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks
Date: Mon, 29 Feb 2016 11:49:37 -0800 [thread overview]
Message-ID: <20160229194937.GC4175@intel.com> (raw)
In-Reply-To: <1456773635-23362-1-git-send-email-imre.deak@intel.com>
On Mon, Feb 29, 2016 at 09:20:35PM +0200, Imre Deak wrote:
> Not all platforms set this callback, so NULL check it before calling it.
>
> CC: Matt Roper <matthew.d.roper@intel.com>
> Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
> Signed-off-by: Imre Deak <imre.deak@intel.com>
Oh, looks like gen9 is using the HSW enable, so yeah, we want to add the
test there. But we probably want an 'else' as well that calls
intel_update_watermarks(crtc) until we've converted the SKL-style code
over.
I'm not sure why this didn't raise any CI errors? Seems like something
that should have been easily caught by the BAT tests...
Matt
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 79bf527..a60018c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
> */
> intel_crtc_load_lut(crtc);
>
> - dev_priv->display.initial_watermarks(intel_crtc->config);
> + if (dev_priv->display.initial_watermarks != NULL)
> + dev_priv->display.initial_watermarks(intel_crtc->config);
> intel_enable_pipe(intel_crtc);
>
> if (intel_crtc->config->has_pch_encoder)
> @@ -5056,7 +5057,8 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
> if (!intel_crtc->config->has_dsi_encoder)
> intel_ddi_enable_transcoder_func(crtc);
>
> - dev_priv->display.initial_watermarks(pipe_config);
> + if (dev_priv->display.initial_watermarks != NULL)
> + dev_priv->display.initial_watermarks(pipe_config);
> intel_enable_pipe(intel_crtc);
>
> if (intel_crtc->config->has_pch_encoder)
> --
> 2.5.0
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-02-29 19:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 19:20 [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Imre Deak
2016-02-29 19:49 ` Matt Roper [this message]
2016-02-29 20:10 ` [PATCH v2] " Imre Deak
2016-02-29 21:06 ` Matt Roper
2016-02-29 21:35 ` Imre Deak
2016-03-01 7:24 ` ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2) Patchwork
2016-03-01 10:32 ` Imre Deak
2016-03-01 10:42 ` Imre Deak
2016-03-01 10:45 ` Ville Syrjälä
2016-03-01 11:30 ` Imre Deak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160229194937.GC4175@intel.com \
--to=matthew.d.roper@intel.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.