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

Commit cf3627fb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-08-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Fixes for v5.3-rc6:
- dma fix for omap.
- Make output polling work on komeda.
- Fix bpp computing for AFBC formats in komeda.
- Support the memory-region property in komeda.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5f1fdfe3-814e-fad1-663c-7279217fc085@linux.intel.com
parents dd89c112 63daf4e1

drivers/gpu/drm/arm/display/komeda/komeda_dev.c

+9 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/iommu.h>

#include <linux/of_device.h>

#include <linux/of_graph.h>

#include <linux/of_reserved_mem.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#ifdef CONFIG_DEBUG_FS
@@ -143,6 +144,12 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) 
		return mdev->irq;

	}



	/* Get the optional framebuffer memory resource */

	ret = of_reserved_mem_device_init(dev);

	if (ret && ret != -ENODEV)

		return ret;

	ret = 0;



	for_each_available_child_of_node(np, child) {

		if (of_node_cmp(child->name, "pipeline") == 0) {

			ret = komeda_parse_pipe_dt(mdev, child);
@@ -289,6 +296,8 @@ void komeda_dev_destroy(struct komeda_dev *mdev) 


	mdev->n_pipelines = 0;



	of_reserved_mem_device_release(dev);



	if (funcs && funcs->cleanup)

		funcs->cleanup(mdev);

drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c

+19 −0
Original line number Diff line number Diff line
@@ -35,6 +35,25 @@ komeda_get_format_caps(struct komeda_format_caps_table *table, 
	return NULL;

}



u32 komeda_get_afbc_format_bpp(const struct drm_format_info *info, u64 modifier)

{

	u32 bpp;



	switch (info->format) {

	case DRM_FORMAT_YUV420_8BIT:

		bpp = 12;

		break;

	case DRM_FORMAT_YUV420_10BIT:

		bpp = 15;

		break;

	default:

		bpp = info->cpp[0] * 8;

		break;

	}



	return bpp;

}



/* Two assumptions

 * 1. RGB always has YTR

 * 2. Tiled RGB always has SC

drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ const struct komeda_format_caps * 
komeda_get_format_caps(struct komeda_format_caps_table *table,

		       u32 fourcc, u64 modifier);



u32 komeda_get_afbc_format_bpp(const struct drm_format_info *info,

			       u64 modifier);



u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table,

				  u32 layer_type, u32 *n_fmts);

drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file, 
	struct drm_framebuffer *fb = &kfb->base;

	const struct drm_format_info *info = fb->format;

	struct drm_gem_object *obj;

	u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks;

	u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks, bpp;

	u64 min_size;



	obj = drm_gem_object_lookup(file, mode_cmd->handles[0]);
@@ -88,8 +88,9 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file, 
	kfb->offset_payload = ALIGN(n_blocks * AFBC_HEADER_SIZE,

				    alignment_header);



	bpp = komeda_get_afbc_format_bpp(info, fb->modifier);

	kfb->afbc_size = kfb->offset_payload + n_blocks *

			 ALIGN(info->cpp[0] * AFBC_SUPERBLK_PIXELS,

			 ALIGN(bpp * AFBC_SUPERBLK_PIXELS / 8,

			       AFBC_SUPERBLK_ALIGNMENT);

	min_size = kfb->afbc_size + fb->offsets[0];

	if (min_size > obj->size) {

drivers/gpu/drm/arm/display/komeda/komeda_kms.c

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_vblank.h>

#include <drm/drm_probe_helper.h>



#include "komeda_dev.h"

#include "komeda_framebuffer.h"
@@ -315,6 +316,8 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 


	drm->irq_enabled = true;



	drm_kms_helper_poll_init(drm);



	err = drm_dev_register(drm, 0);

	if (err)

		goto cleanup_mode_config;
@@ -322,6 +325,7 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 
	return kms;



cleanup_mode_config:

	drm_kms_helper_poll_fini(drm);

	drm->irq_enabled = false;

	drm_mode_config_cleanup(drm);

	komeda_kms_cleanup_private_objs(kms);
@@ -338,6 +342,7 @@ void komeda_kms_detach(struct komeda_kms_dev *kms) 
	drm->irq_enabled = false;

	mdev->funcs->disable_irq(mdev);

	drm_dev_unregister(drm);

	drm_kms_helper_poll_fini(drm);

	component_unbind_all(mdev->dev, drm);

	komeda_kms_cleanup_private_objs(kms);

	drm_mode_config_cleanup(drm);