diff options
| author | Kumar, Mahesh | 2015-09-03 12:47:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-04 09:38:16 +0200 |
| commit | 395ab7541a0e141ffbde127b534e44f28d39a050 (patch) | |
| tree | 0a7889587ccd83d6241a211215565fc6b14cdb38 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt (diff) | |
| download | kernel-qcow2-linux-395ab7541a0e141ffbde127b534e44f28d39a050.tar.gz kernel-qcow2-linux-395ab7541a0e141ffbde127b534e44f28d39a050.tar.xz kernel-qcow2-linux-395ab7541a0e141ffbde127b534e44f28d39a050.zip | |
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: Kumar, Mahesh <mahesh1.kumar@intel.com>
Cc: Konduru, Chandra <chandra.konduru@intel.com>
Reviewed-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ea4966144650..1b90f03f7025 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -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]; |