Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 395ab754 authored by Kumar, Mahesh's avatar Kumar, Mahesh Committed by Daniel Vetter
Browse files

drm/i915/skl: Avoid using un-initialized bits_per_pixel 



Don't rely on fb->bits_per_pixel as intel_framebuffer_init is not
filling bits_per_pixel field of fb-struct for YUV pixel format.
This leads to divide by zero error during watermark calculation.

Signed-off-by: default avatarKumar, Mahesh <mahesh1.kumar@intel.com>
Cc: Konduru, Chandra <chandra.konduru@intel.com>
Reviewed-by: default avatarSonika Jindal <sonika.jindal@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 58f2cf24

drivers/gpu/drm/i915/intel_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -3170,7 +3170,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, 
		if (fb) {

			p->plane[0].enabled = true;

			p->plane[0].bytes_per_pixel = fb->pixel_format == DRM_FORMAT_NV12 ?

				drm_format_plane_cpp(fb->pixel_format, 1) : fb->bits_per_pixel / 8;

				drm_format_plane_cpp(fb->pixel_format, 1) :

				drm_format_plane_cpp(fb->pixel_format, 0);

			p->plane[0].y_bytes_per_pixel = fb->pixel_format == DRM_FORMAT_NV12 ?

				drm_format_plane_cpp(fb->pixel_format, 0) : 0;

			p->plane[0].tiling = fb->modifier[0];