Skip to content

Commit

Permalink
staging: drm/omap: some minor fb cleanups
Browse files Browse the repository at this point in the history
Now that 'struct drm_plane' has a pixel_format field, use that.  And
fix a minor typo.

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Rob Clark authored and Greg Kroah-Hartman committed Mar 7, 2012
1 parent 9b55b95 commit 9f18c95
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/omapdrm/omap_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
{
struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
int i, n = drm_format_num_planes(omap_fb->format->pixel_format);
int i, n = drm_format_num_planes(fb->pixel_format);

DBG("destroy: FB ID: %d (%p)", fb->base.id, fb);

Expand Down Expand Up @@ -204,7 +204,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, int x, int y,
struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)
{
struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
if (p >= drm_format_num_planes(omap_fb->format->pixel_format))
if (p >= drm_format_num_planes(fb->pixel_format))
return NULL;
return omap_fb->planes[p].bo;
}
Expand Down Expand Up @@ -351,8 +351,8 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,

plane->bo = bos[i];
plane->offset = mode_cmd->offsets[i];
plane->pitch = mode_cmd->pitches[i];
plane->paddr = pitch;
plane->pitch = pitch;
plane->paddr = 0;
}

drm_helper_mode_fill_fb_struct(fb, mode_cmd);
Expand Down

0 comments on commit 9f18c95

Please sign in to comment.