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

drm: Remove fb hsub/vsub alignment requirement 

Allow framebuffers dimesions to be misaligned w.r.t. the subsampling
factors. No real reason the core should have to enforce this, and
it definitely starts to cause us issues with the i915 CCS support.
So let's just lift the restriction.

Let's start to round up when computing the color plane dimesions
so that we'll not end up with too low an estimate for the memory
requirements and whatnot.

Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170321181218.10042-3-ville.syrjala@linux.intel.com
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ville Syrjälä 2017-03-21 20:12:15 +02:00
parent 568c5e4536
commit 33f673aa55
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/gpu/drm/drm_framebuffer.c
View File

@ -132,7 +132,7 @@ static int fb_plane_width(int width,
if (plane == 0) if (plane == 0)
return width; return width;
return width / format->hsub; return DIV_ROUND_UP(width, format->hsub);
} }
static int fb_plane_height(int height, static int fb_plane_height(int height,
@ -141,7 +141,7 @@ static int fb_plane_height(int height,
if (plane == 0) if (plane == 0)
return height; return height;
return height / format->vsub; return DIV_ROUND_UP(height, format->vsub);
} }
static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) static int framebuffer_check(const struct drm_mode_fb_cmd2 *r)
@ -158,12 +158,12 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r)
return -EINVAL; return -EINVAL;
} }
if (r->width == 0 || r->width % info->hsub) { if (r->width == 0) {
DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width); DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width);
return -EINVAL; return -EINVAL;
} }
if (r->height == 0 || r->height % info->vsub) { if (r->height == 0) {
DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height);
return -EINVAL; return -EINVAL;
} }