From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Sonika Jindal <sonika.jindal@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Cleaning up encoder in the end on intel_dp_encoder_destroy
Date: Mon, 12 Jan 2015 14:07:30 +0200 [thread overview]
Message-ID: <20150112120730.GE10649@intel.com> (raw)
In-Reply-To: <1421038841-16621-1-git-send-email-sonika.jindal@intel.com>
On Mon, Jan 12, 2015 at 10:30:41AM +0530, Sonika Jindal wrote:
> We clean up the encoder and then try to acquire pps_lock where it tries
> to get the encoder. So moving the cleanup to the end.
>
> Suggested-by: Satheeshakrishna M <satheeshakrishna.m@intel.com>
> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Already fixed
commit c8bd0e49519ce1d80196e54ba2e20c3a1b7c88c0
Author: Imre Deak <imre.deak@intel.com>
Date: Fri Dec 12 17:57:38 2014 +0200
drm/i915: fix use after free during eDP encoder destroying
> ---
> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 64c7578..92415f4 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4317,8 +4317,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
> struct intel_dp *intel_dp = &intel_dig_port->dp;
>
> drm_dp_aux_unregister(&intel_dp->aux);
> - intel_dp_mst_encoder_cleanup(intel_dig_port);
> - drm_encoder_cleanup(encoder);
> if (is_edp(intel_dp)) {
> cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
> /*
> @@ -4334,6 +4332,8 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
> intel_dp->edp_notifier.notifier_call = NULL;
> }
> }
> + intel_dp_mst_encoder_cleanup(intel_dig_port);
> + drm_encoder_cleanup(encoder);
> kfree(intel_dig_port);
> }
>
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-01-12 12:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 5:00 [PATCH] drm/i915: Cleaning up encoder in the end on intel_dp_encoder_destroy Sonika Jindal
2015-01-12 12:07 ` Ville Syrjälä [this message]
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=20150112120730.GE10649@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sonika.jindal@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox