hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: drm/omap: some minor fb cleanups 

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>
This commit is contained in:
Rob Clark 2012-03-05 10:48:34 -06:00 committed by Greg Kroah-Hartman
parent 9b55b95a8e
commit 9f18c95abb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/omapdrm/omap_fb.c
View File

@ -101,7 +101,7 @@ static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
static void omap_framebuffer_destroy(struct drm_framebuffer *fb) static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
{ {
struct omap_framebuffer *omap_fb = to_omap_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); DBG("destroy: FB ID: %d (%p)", fb->base.id, fb);
@ -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 drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)
{ {
struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); 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 NULL;
return omap_fb->planes[p].bo; return omap_fb->planes[p].bo;
} }
@ -351,8 +351,8 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
plane->bo = bos[i]; plane->bo = bos[i];
plane->offset = mode_cmd->offsets[i]; plane->offset = mode_cmd->offsets[i];
plane->pitch = mode_cmd->pitches[i]; plane->pitch = pitch;
plane->paddr = pitch; plane->paddr = 0;
} }
drm_helper_mode_fill_fb_struct(fb, mode_cmd); drm_helper_mode_fill_fb_struct(fb, mode_cmd);