diff mbox

[02/18] drm: fix memory leak around mode_group (v2)

Message ID 1415019661-19435-3-git-send-email-dariusz.gadomski@canonical.com
State New
Headers show

Commit Message

Dariusz Gadomski Nov. 3, 2014, 1 p.m. UTC
From: Dave Airlie <airlied@redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1104230

This mode group id_list was never being freed.

v2: take David's suggestion to free in minor_free.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_crtc.c
	drivers/gpu/drm/drm_stub.c

(cherry picked from commit 04a2b20670b9c24e69497ff5315f3d28955c8284 upstream)
Signed-off-by: Dariusz Gadomski <dariusz.gadomski@canonical.com>
---
 drivers/gpu/drm/drm_crtc.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Luis Henriques Nov. 3, 2014, 1:34 p.m. UTC | #1
On Mon, Nov 03, 2014 at 02:00:45PM +0100, Dariusz Gadomski wrote:
> From: Dave Airlie <airlied@redhat.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1104230
> 
> This mode group id_list was never being freed.
> 
> v2: take David's suggestion to free in minor_free.
> 
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> 
> Conflicts:
> 	drivers/gpu/drm/drm_crtc.c
> 	drivers/gpu/drm/drm_stub.c
> 
> (cherry picked from commit 04a2b20670b9c24e69497ff5315f3d28955c8284 upstream)
> Signed-off-by: Dariusz Gadomski <dariusz.gadomski@canonical.com>
> ---
>  drivers/gpu/drm/drm_crtc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index fe94cc1..ba5b0c3 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -1438,6 +1438,7 @@ void drm_mode_group_destroy(struct drm_mode_group *group)
>   * NOTE: Driver's shouldn't ever call drm_mode_group_init_legacy_group - it is
>   * the drm core's responsibility to set up mode control groups.
>   */
> +
>  int drm_mode_group_init_legacy_group(struct drm_device *dev,
>  				     struct drm_mode_group *group)
>  {

I haven't reviewed this patchset but you need to either fix this one
or drop it from the set as it doesn't seem to be relevant :-)

Oh, and the SHA1s don't seem to exists upstream.

Cheers,
--
Luís

> -- 
> 1.9.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Dariusz Gadomski Nov. 3, 2014, 2:04 p.m. UTC | #2
On Mon, Nov 03, 2014 at 01:34:40PM +0000, Luis Henriques wrote:
> I haven't reviewed this patchset but you need to either fix this one
> or drop it from the set as it doesn't seem to be relevant :-)

That's a good point. I've missed that. In fact this is not
necessary here.

> 
> Oh, and the SHA1s don't seem to exists upstream.

As I have mentioned in the cover letter this has been initially
backported to v3.16 by David Airlie - the original author of this
feature
(http://cgit.freedesktop.org/~airlied/linux/log/?h=drm-i915-mst-v3.16).
I have done the cherry-picking referring to his branch as the
'upstream'.

For some reason he kept the commit there
(http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-i915-mst-v3.16&id=04a2b20670b9c24e69497ff5315f3d28955c8284)
As you have noted - it is totally unnecessary in this context.

Cheers,
Dariusz
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fe94cc1..ba5b0c3 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1438,6 +1438,7 @@  void drm_mode_group_destroy(struct drm_mode_group *group)
  * NOTE: Driver's shouldn't ever call drm_mode_group_init_legacy_group - it is
  * the drm core's responsibility to set up mode control groups.
  */
+
 int drm_mode_group_init_legacy_group(struct drm_device *dev,
 				     struct drm_mode_group *group)
 {