| Message ID | 20191115092120.4445-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Fri, 15 Nov 2019 10:21:14 +0100 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Spotted while looking through them all. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Boris Brezillon <bbrezillon@kernel.org> Acked-by: Boris Brezillon <boris.brezillon@collabora.com> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > Cc: linux-arm-kernel@lists.infradead.org > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 92640298ad41..8dc917a1270b 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -557,12 +557,6 @@ static irqreturn_t atmel_hlcdc_dc_irq_handler(int irq, void *data) > return IRQ_HANDLED; > } > > -static struct drm_framebuffer *atmel_hlcdc_fb_create(struct drm_device *dev, > - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) > -{ > - return drm_gem_fb_create(dev, file_priv, mode_cmd); > -} > - > struct atmel_hlcdc_dc_commit { > struct work_struct work; > struct drm_device *dev; > @@ -657,7 +651,7 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev, > } > > static const struct drm_mode_config_funcs mode_config_funcs = { > - .fb_create = atmel_hlcdc_fb_create, > + .fb_create = drm_gem_fb_create, > .atomic_check = drm_atomic_helper_check, > .atomic_commit = atmel_hlcdc_dc_atomic_commit, > };
On Fri, Nov 15, 2019 at 10:33:24AM +0100, Boris Brezillon wrote: > On Fri, 15 Nov 2019 10:21:14 +0100 > Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > Spotted while looking through them all. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: Boris Brezillon <bbrezillon@kernel.org> > > Acked-by: Boris Brezillon <boris.brezillon@collabora.com> Merged, thanks for taking a look. -Daniel > > > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > > Cc: linux-arm-kernel@lists.infradead.org > > --- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > index 92640298ad41..8dc917a1270b 100644 > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > @@ -557,12 +557,6 @@ static irqreturn_t atmel_hlcdc_dc_irq_handler(int irq, void *data) > > return IRQ_HANDLED; > > } > > > > -static struct drm_framebuffer *atmel_hlcdc_fb_create(struct drm_device *dev, > > - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) > > -{ > > - return drm_gem_fb_create(dev, file_priv, mode_cmd); > > -} > > - > > struct atmel_hlcdc_dc_commit { > > struct work_struct work; > > struct drm_device *dev; > > @@ -657,7 +651,7 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev, > > } > > > > static const struct drm_mode_config_funcs mode_config_funcs = { > > - .fb_create = atmel_hlcdc_fb_create, > > + .fb_create = drm_gem_fb_create, > > .atomic_check = drm_atomic_helper_check, > > .atomic_commit = atmel_hlcdc_dc_atomic_commit, > > }; >
Hi Daniel. On Tue, Nov 19, 2019 at 10:22:31PM +0100, Daniel Vetter wrote: > On Fri, Nov 15, 2019 at 10:33:24AM +0100, Boris Brezillon wrote: > > On Fri, 15 Nov 2019 10:21:14 +0100 > > Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > > > Spotted while looking through them all. > > > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > Cc: Sam Ravnborg <sam@ravnborg.org> > > > Cc: Boris Brezillon <bbrezillon@kernel.org> > > > > Acked-by: Boris Brezillon <boris.brezillon@collabora.com> > > Merged, thanks for taking a look. Hi Daniel, thanks for merging this. Sam
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 92640298ad41..8dc917a1270b 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -557,12 +557,6 @@ static irqreturn_t atmel_hlcdc_dc_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static struct drm_framebuffer *atmel_hlcdc_fb_create(struct drm_device *dev, - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) -{ - return drm_gem_fb_create(dev, file_priv, mode_cmd); -} - struct atmel_hlcdc_dc_commit { struct work_struct work; struct drm_device *dev; @@ -657,7 +651,7 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev, } static const struct drm_mode_config_funcs mode_config_funcs = { - .fb_create = atmel_hlcdc_fb_create, + .fb_create = drm_gem_fb_create, .atomic_check = drm_atomic_helper_check, .atomic_commit = atmel_hlcdc_dc_atomic_commit, };
Spotted while looking through them all. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)