| Message ID | 20191211120001.1167980-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/gma500: globle no more! | expand |
On Wed, 11 Dec 2019, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > globle, goblin, moblin? > > It's dead code, we lucked out. Oh, sad to see it go. The oldest reference to globle_dev I could find was from 2011. Acked-by: Jani Nikula <jani.nikula@intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/gma500/mdfld_intel_display.c | 23 -------------------- > 1 file changed, 23 deletions(-) > > diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c > index b8bfb96008b8..4fff110c4921 100644 > --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c > +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c > @@ -113,27 +113,6 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev) > return (pfit_control >> 29) & 0x3; > } > > -static struct drm_device globle_dev; > - > -void mdfld__intel_plane_set_alpha(int enable) > -{ > - struct drm_device *dev = &globle_dev; > - int dspcntr_reg = DSPACNTR; > - u32 dspcntr; > - > - dspcntr = REG_READ(dspcntr_reg); > - > - if (enable) { > - dspcntr &= ~DISPPLANE_32BPP_NO_ALPHA; > - dspcntr |= DISPPLANE_32BPP; > - } else { > - dspcntr &= ~DISPPLANE_32BPP; > - dspcntr |= DISPPLANE_32BPP_NO_ALPHA; > - } > - > - REG_WRITE(dspcntr_reg, dspcntr); > -} > - > static int check_fb(struct drm_framebuffer *fb) > { > if (!fb) > @@ -164,8 +143,6 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, > u32 dspcntr; > int ret; > > - memcpy(&globle_dev, dev, sizeof(struct drm_device)); > - > dev_dbg(dev->dev, "pipe = 0x%x.\n", pipe); > > /* no fb bound */
On Wed, Dec 11, 2019 at 03:53:08PM +0200, Jani Nikula wrote: > On Wed, 11 Dec 2019, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > globle, goblin, moblin? > > > > It's dead code, we lucked out. > > Oh, sad to see it go. The oldest reference to globle_dev I could find > was from 2011. > > Acked-by: Jani Nikula <jani.nikula@intel.com> Thanks for taking a look, applied. -Daniel > > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/gma500/mdfld_intel_display.c | 23 -------------------- > > 1 file changed, 23 deletions(-) > > > > diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c > > index b8bfb96008b8..4fff110c4921 100644 > > --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c > > +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c > > @@ -113,27 +113,6 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev) > > return (pfit_control >> 29) & 0x3; > > } > > > > -static struct drm_device globle_dev; > > - > > -void mdfld__intel_plane_set_alpha(int enable) > > -{ > > - struct drm_device *dev = &globle_dev; > > - int dspcntr_reg = DSPACNTR; > > - u32 dspcntr; > > - > > - dspcntr = REG_READ(dspcntr_reg); > > - > > - if (enable) { > > - dspcntr &= ~DISPPLANE_32BPP_NO_ALPHA; > > - dspcntr |= DISPPLANE_32BPP; > > - } else { > > - dspcntr &= ~DISPPLANE_32BPP; > > - dspcntr |= DISPPLANE_32BPP_NO_ALPHA; > > - } > > - > > - REG_WRITE(dspcntr_reg, dspcntr); > > -} > > - > > static int check_fb(struct drm_framebuffer *fb) > > { > > if (!fb) > > @@ -164,8 +143,6 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, > > u32 dspcntr; > > int ret; > > > > - memcpy(&globle_dev, dev, sizeof(struct drm_device)); > > - > > dev_dbg(dev->dev, "pipe = 0x%x.\n", pipe); > > > > /* no fb bound */ > > -- > Jani Nikula, Intel Open Source Graphics Center
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c index b8bfb96008b8..4fff110c4921 100644 --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c @@ -113,27 +113,6 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev) return (pfit_control >> 29) & 0x3; } -static struct drm_device globle_dev; - -void mdfld__intel_plane_set_alpha(int enable) -{ - struct drm_device *dev = &globle_dev; - int dspcntr_reg = DSPACNTR; - u32 dspcntr; - - dspcntr = REG_READ(dspcntr_reg); - - if (enable) { - dspcntr &= ~DISPPLANE_32BPP_NO_ALPHA; - dspcntr |= DISPPLANE_32BPP; - } else { - dspcntr &= ~DISPPLANE_32BPP; - dspcntr |= DISPPLANE_32BPP_NO_ALPHA; - } - - REG_WRITE(dspcntr_reg, dspcntr); -} - static int check_fb(struct drm_framebuffer *fb) { if (!fb) @@ -164,8 +143,6 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, u32 dspcntr; int ret; - memcpy(&globle_dev, dev, sizeof(struct drm_device)); - dev_dbg(dev->dev, "pipe = 0x%x.\n", pipe); /* no fb bound */
globle, goblin, moblin? It's dead code, we lucked out. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/gma500/mdfld_intel_display.c | 23 -------------------- 1 file changed, 23 deletions(-)