aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-10-18 17:48:24 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-21 04:04:03 -0400
commitde45eaf7b9530b6137d3ce370b12b199fae01419 (patch)
treed90b0f00787b77768f3b650b15e0fb8326f2e45f
parentdc39fff7229c01550cad1ee8fa0309dfafdcd2e7 (diff)
drm/i915: fix open-coded DIV_ROUND_UP
Use the nice Kernel macro, it makes the code much more readable. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 34df59b660f8..e7b39d731db6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -261,7 +261,7 @@ i915_gem_dumb_create(struct drm_file *file,
261 struct drm_mode_create_dumb *args) 261 struct drm_mode_create_dumb *args)
262{ 262{
263 /* have to work out size/pitch and return them */ 263 /* have to work out size/pitch and return them */
264 args->pitch = ALIGN(args->width * ((args->bpp + 7) / 8), 64); 264 args->pitch = ALIGN(args->width * DIV_ROUND_UP(args->bpp, 8), 64);
265 args->size = args->pitch * args->height; 265 args->size = args->pitch * args->height;
266 return i915_gem_create(file, dev, 266 return i915_gem_create(file, dev,
267 args->size, &args->handle); 267 args->size, &args->handle);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index acc839569c3f..895fcb4fbd94 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -78,8 +78,8 @@ static int intelfb_create(struct drm_fb_helper *helper,
78 mode_cmd.width = sizes->surface_width; 78 mode_cmd.width = sizes->surface_width;
79 mode_cmd.height = sizes->surface_height; 79 mode_cmd.height = sizes->surface_height;
80 80
81 mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((sizes->surface_bpp + 7) / 81 mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
82 8), 64); 82 DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
83 mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, 83 mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
84 sizes->surface_depth); 84 sizes->surface_depth);
85 85