| Message ID | 1314410781-5866-1-git-send-email-jy0922.shim@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
this seems like a better fix than decrementing the count in individual drivers, but would like to hear what some 'old timers' think ;-) BR, -R On Fri, Aug 26, 2011 at 9:06 PM, Joonyoung Shim <jy0922.shim@samsung.com> wrote: > It is left out the code to decrease the number of connector and encoder > to the cleanup functions. > > Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/gpu/drm/drm_crtc.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 82db185..fe738f0 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -499,6 +499,7 @@ void drm_connector_cleanup(struct drm_connector *connector) > mutex_lock(&dev->mode_config.mutex); > drm_mode_object_put(dev, &connector->base); > list_del(&connector->head); > + dev->mode_config.num_connector--; > mutex_unlock(&dev->mode_config.mutex); > } > EXPORT_SYMBOL(drm_connector_cleanup); > @@ -529,6 +530,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > mutex_lock(&dev->mode_config.mutex); > drm_mode_object_put(dev, &encoder->base); > list_del(&encoder->head); > + dev->mode_config.num_encoder--; > mutex_unlock(&dev->mode_config.mutex); > } > EXPORT_SYMBOL(drm_encoder_cleanup); > -- > 1.7.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
On Tue, Aug 30, 2011 at 11:17 PM, Rob Clark <robdclark@gmail.com> wrote: > this seems like a better fix than decrementing the count in individual > drivers, but would like to hear what some 'old timers' think ;-) It's already upstream: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=6380c509215b10c44aec8760e65b2e7f1827d009 Alex > > BR, > -R > > On Fri, Aug 26, 2011 at 9:06 PM, Joonyoung Shim <jy0922.shim@samsung.com> wrote: >> It is left out the code to decrease the number of connector and encoder >> to the cleanup functions. >> >> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> drivers/gpu/drm/drm_crtc.c | 2 ++ >> 1 files changed, 2 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c >> index 82db185..fe738f0 100644 >> --- a/drivers/gpu/drm/drm_crtc.c >> +++ b/drivers/gpu/drm/drm_crtc.c >> @@ -499,6 +499,7 @@ void drm_connector_cleanup(struct drm_connector *connector) >> mutex_lock(&dev->mode_config.mutex); >> drm_mode_object_put(dev, &connector->base); >> list_del(&connector->head); >> + dev->mode_config.num_connector--; >> mutex_unlock(&dev->mode_config.mutex); >> } >> EXPORT_SYMBOL(drm_connector_cleanup); >> @@ -529,6 +530,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) >> mutex_lock(&dev->mode_config.mutex); >> drm_mode_object_put(dev, &encoder->base); >> list_del(&encoder->head); >> + dev->mode_config.num_encoder--; >> mutex_unlock(&dev->mode_config.mutex); >> } >> EXPORT_SYMBOL(drm_encoder_cleanup); >> -- >> 1.7.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel >> > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 82db185..fe738f0 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -499,6 +499,7 @@ void drm_connector_cleanup(struct drm_connector *connector) mutex_lock(&dev->mode_config.mutex); drm_mode_object_put(dev, &connector->base); list_del(&connector->head); + dev->mode_config.num_connector--; mutex_unlock(&dev->mode_config.mutex); } EXPORT_SYMBOL(drm_connector_cleanup); @@ -529,6 +530,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) mutex_lock(&dev->mode_config.mutex); drm_mode_object_put(dev, &encoder->base); list_del(&encoder->head); + dev->mode_config.num_encoder--; mutex_unlock(&dev->mode_config.mutex); } EXPORT_SYMBOL(drm_encoder_cleanup);