| Message ID | 1460697046-23781-5-git-send-email-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 15, 2016 at 03:10:35PM +1000, Dave Airlie wrote: > From: Dave Airlie <airlied@redhat.com> > > Avoids drivers knowing where the kref is stored. > > Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_crtc.c | 2 +- > drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- > drivers/gpu/drm/msm/msm_fb.c | 2 +- > drivers/gpu/drm/tegra/drm.c | 2 +- > include/drm/drm_crtc.h | 5 +++++ > 5 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 0ad1a92..8616737 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -612,7 +612,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) > * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot > * in this manner. > */ > - if (atomic_read(&fb->refcount.refcount) > 1) { > + if (drm_framebuffer_read_refcount(fb) > 1) { > drm_modeset_lock_all(dev); > /* remove from any CRTC */ > drm_for_each_crtc(crtc, dev) { > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index a0f1bd7..20d9300 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1908,7 +1908,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) > fbdev_fb->base.depth, > fbdev_fb->base.bits_per_pixel, > fbdev_fb->base.modifier[0], > - atomic_read(&fbdev_fb->base.refcount.refcount)); > + drm_framebuffer_read_refcount(&fbdev_fb->base)); > describe_obj(m, fbdev_fb->obj); > seq_putc(m, '\n'); > } > @@ -1926,7 +1926,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) > fb->base.depth, > fb->base.bits_per_pixel, > fb->base.modifier[0], > - atomic_read(&fb->base.refcount.refcount)); > + drm_framebuffer_read_refcount(&fb->base)); > describe_obj(m, fb->obj); > seq_putc(m, '\n'); > } > diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c > index a474d6c..17e0c9e 100644 > --- a/drivers/gpu/drm/msm/msm_fb.c > +++ b/drivers/gpu/drm/msm/msm_fb.c > @@ -77,7 +77,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m) > > seq_printf(m, "fb: %dx%d@%4.4s (%2d, ID:%d)\n", > fb->width, fb->height, (char *)&fb->pixel_format, > - fb->refcount.refcount.counter, fb->base.id); > + drm_framebuffer_read_refcount(fb), fb->base.id); > > for (i = 0; i < n; i++) { > seq_printf(m, " %d: offset=%d pitch=%d, obj: ", > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c > index 8e6b18c..2be88eb 100644 > --- a/drivers/gpu/drm/tegra/drm.c > +++ b/drivers/gpu/drm/tegra/drm.c > @@ -878,7 +878,7 @@ static int tegra_debugfs_framebuffers(struct seq_file *s, void *data) > seq_printf(s, "%3d: user size: %d x %d, depth %d, %d bpp, refcount %d\n", > fb->base.id, fb->width, fb->height, fb->depth, > fb->bits_per_pixel, > - atomic_read(&fb->refcount.refcount)); > + drm_framebuffer_read_refcount(fb)); > } > > mutex_unlock(&drm->mode_config.fb_lock); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index e0170bf..99a12f0 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -2608,6 +2608,11 @@ static inline uint32_t drm_color_lut_extract(uint32_t user_input, > return clamp_val(val, 0, max); > } > > +static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) > +{ > + return atomic_read(&fb->refcount.refcount); > +} > + > /* Plane list iterator for legacy (overlay only) planes. */ > #define drm_for_each_legacy_plane(plane, dev) \ > list_for_each_entry(plane, &(dev)->mode_config.plane_list, head) \ > -- > 2.5.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 0ad1a92..8616737 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -612,7 +612,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) * in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot * in this manner. */ - if (atomic_read(&fb->refcount.refcount) > 1) { + if (drm_framebuffer_read_refcount(fb) > 1) { drm_modeset_lock_all(dev); /* remove from any CRTC */ drm_for_each_crtc(crtc, dev) { diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index a0f1bd7..20d9300 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1908,7 +1908,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) fbdev_fb->base.depth, fbdev_fb->base.bits_per_pixel, fbdev_fb->base.modifier[0], - atomic_read(&fbdev_fb->base.refcount.refcount)); + drm_framebuffer_read_refcount(&fbdev_fb->base)); describe_obj(m, fbdev_fb->obj); seq_putc(m, '\n'); } @@ -1926,7 +1926,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) fb->base.depth, fb->base.bits_per_pixel, fb->base.modifier[0], - atomic_read(&fb->base.refcount.refcount)); + drm_framebuffer_read_refcount(&fb->base)); describe_obj(m, fb->obj); seq_putc(m, '\n'); } diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index a474d6c..17e0c9e 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -77,7 +77,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m) seq_printf(m, "fb: %dx%d@%4.4s (%2d, ID:%d)\n", fb->width, fb->height, (char *)&fb->pixel_format, - fb->refcount.refcount.counter, fb->base.id); + drm_framebuffer_read_refcount(fb), fb->base.id); for (i = 0; i < n; i++) { seq_printf(m, " %d: offset=%d pitch=%d, obj: ", diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 8e6b18c..2be88eb 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -878,7 +878,7 @@ static int tegra_debugfs_framebuffers(struct seq_file *s, void *data) seq_printf(s, "%3d: user size: %d x %d, depth %d, %d bpp, refcount %d\n", fb->base.id, fb->width, fb->height, fb->depth, fb->bits_per_pixel, - atomic_read(&fb->refcount.refcount)); + drm_framebuffer_read_refcount(fb)); } mutex_unlock(&drm->mode_config.fb_lock); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index e0170bf..99a12f0 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -2608,6 +2608,11 @@ static inline uint32_t drm_color_lut_extract(uint32_t user_input, return clamp_val(val, 0, max); } +static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) +{ + return atomic_read(&fb->refcount.refcount); +} + /* Plane list iterator for legacy (overlay only) planes. */ #define drm_for_each_legacy_plane(plane, dev) \ list_for_each_entry(plane, &(dev)->mode_config.plane_list, head) \