Merge tag 'drm-misc-next-fixes-2020-02-07' of... (7ebdc26a) · Commits · 戴 / test

drivers/gpu/drm/drm_edid.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3211,7 +3211,7 @@ static u8 drm_find_cea_extension(const struct edid edid)
		return cea;
		}

		static const struct drm_display_mode *cea_mode_for_vic(u8 vic)
		static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic)
		{
		BUILD_BUG_ON(1 + ARRAY_SIZE(edid_cea_modes_1) - 1 != 127);
		BUILD_BUG_ON(193 + ARRAY_SIZE(edid_cea_modes_193) - 1 != 219);

+8 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,14 @@ static int msm_drm_init(struct device dev, struct drm_driver drv)
		if (ret)
		goto err_msm_uninit;

		if (!dev->dma_parms) {
		dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
		GFP_KERNEL);
		if (!dev->dma_parms)
		return -ENOMEM;
		}
		dma_set_max_seg_size(dev, DMA_BIT_MASK(32));

		msm_gem_shrinker_init(ddev);

		switch (get_mdp_ver(pdev)) {

+6 −3

Original line number	Diff line number	Diff line
		@@ -196,9 +196,10 @@ static struct drm_gem_object vgem_gem_create(struct drm_device dev,
		return ERR_CAST(obj);

		ret = drm_gem_handle_create(file, &obj->base, handle);
		if (ret) {
		drm_gem_object_put_unlocked(&obj->base);
		if (ret)
		return ERR_PTR(ret);
		}

		return &obj->base;
		}
		@@ -221,7 +222,9 @@ static int vgem_gem_dumb_create(struct drm_file file, struct drm_device dev,
		args->size = gem_object->size;
		args->pitch = pitch;

		DRM_DEBUG("Created object of size %lld\n", size);
		drm_gem_object_put_unlocked(gem_object);

		DRM_DEBUG("Created object of size %llu\n", args->size);

		return 0;
		}