| Message ID | 20170524145212.27837-34-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 24, 2017 at 04:52:08PM +0200, Daniel Vetter wrote: > Again, doesn't seem to serve a purpose. > > Cc: Thierry Reding <thierry.reding@gmail.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/tegra/drm.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) I'm assuming that you want to apply the whole batch at once? From what I can tell the driver patches should be fine to apply independently, but it's probably a good idea to keep all of these together for coherence. Thierry
On Thu, Jun 15, 2017 at 03:00:08PM +0200, Thierry Reding wrote: > On Wed, May 24, 2017 at 04:52:08PM +0200, Daniel Vetter wrote: > > Again, doesn't seem to serve a purpose. > > > > Cc: Thierry Reding <thierry.reding@gmail.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/tegra/drm.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > I'm assuming that you want to apply the whole batch at once? From what I > can tell the driver patches should be fine to apply independently, but > it's probably a good idea to keep all of these together for coherence. I'm fine either way, but to avoid patch loss I applied this to drm-misc-next with your ack. -Daniel
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 51c48a8e00ec..0d8839244c3a 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -213,12 +213,10 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) err = tegra_drm_fb_init(drm); if (err < 0) - goto vblank; + goto device; return 0; -vblank: - drm_vblank_cleanup(drm); device: host1x_device_exit(device); fbdev: @@ -247,7 +245,6 @@ static void tegra_drm_unload(struct drm_device *drm) drm_kms_helper_poll_fini(drm); tegra_drm_fb_exit(drm); drm_mode_config_cleanup(drm); - drm_vblank_cleanup(drm); err = host1x_device_exit(device); if (err < 0)
Again, doesn't seem to serve a purpose. Cc: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/tegra/drm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)