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

Commit 3ce72bcf authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/kms/nv04-nv40: prevent undisplayable framebuffers from creation 



Pre-nv50 YUV overlays have stringent requirements for working with the
internal machinery. Instead of rejecting these at update_plane time, we
should instead prevent the framebuffers from being created in the first
place.

Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d257f9bf

drivers/gpu/drm/nouveau/nouveau_display.c

+21 −0
Original line number Diff line number Diff line
@@ -231,9 +231,30 @@ nouveau_framebuffer_new(struct drm_device *dev, 
			struct nouveau_bo *nvbo,

			struct nouveau_framebuffer **pfb)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_framebuffer *fb;

	int ret;



        /* YUV overlays have special requirements pre-NV50 */

	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&



	    (mode_cmd->pixel_format == DRM_FORMAT_YUYV ||

	     mode_cmd->pixel_format == DRM_FORMAT_UYVY ||

	     mode_cmd->pixel_format == DRM_FORMAT_NV12 ||

	     mode_cmd->pixel_format == DRM_FORMAT_NV21) &&

	    (mode_cmd->pitches[0] & 0x3f || /* align 64 */

	     mode_cmd->pitches[0] >= 0x10000 || /* at most 64k pitch */

	     (mode_cmd->pitches[1] && /* pitches for planes must match */

	      mode_cmd->pitches[0] != mode_cmd->pitches[1]))) {

		struct drm_format_name_buf format_name;

		DRM_DEBUG_KMS("Unsuitable framebuffer: format: %s; pitches: 0x%x\n 0x%x\n",

			      drm_get_format_name(mode_cmd->pixel_format,

						  &format_name),

			      mode_cmd->pitches[0],

			      mode_cmd->pitches[1]);

		return -EINVAL;

	}



	if (!(fb = *pfb = kzalloc(sizeof(*fb), GFP_KERNEL)))

		return -ENOMEM;