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

Commit 2e1d6eab authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v4.17-rc2' of... 

Merge tag 'exynos-drm-fixes-for-v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Remove Exynos specific framebuffer structure and
relevant functions.
- it removes exynos_drm_fb structure which is a wrapper of
  drm_framebuffer and unnecessary two exynos specific callback
  functions, exynos_drm_destory() and exynos_drm_fb_create_handle()
  because we can reuse existing drm common callback ones instead.

* tag 'exynos-drm-fixes-for-v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: exynos_drm_fb -> drm_framebuffer
  drm/exynos: Move dma_addr out of exynos_drm_fb
  drm/exynos: Move GEM BOs to drm_framebuffer
  drm/amdkfd: Deallocate SDMA queues correctly
  drm/amdkfd: Fix scratch memory with HWS enabled
parents bc9ebca2 ff059fcb

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+14 −6
Original line number Diff line number Diff line
@@ -1058,13 +1058,13 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
		pr_warn("Can't create new usermode queue because %d queues were already created\n",

				dqm->total_queue_count);

		retval = -EPERM;

		goto out;

		goto out_unlock;

	}



	if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {

		retval = allocate_sdma_queue(dqm, &q->sdma_id);

		if (retval)

			goto out;

			goto out_unlock;

		q->properties.sdma_queue_id =

			q->sdma_id / CIK_SDMA_QUEUES_PER_ENGINE;

		q->properties.sdma_engine_id =
@@ -1075,7 +1075,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 


	if (!mqd) {

		retval = -ENOMEM;

		goto out;

		goto out_deallocate_sdma_queue;

	}

	/*

	 * Eviction state logic: we only mark active queues as evicted
@@ -1093,7 +1093,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
	retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,

				&q->gart_mqd_addr, &q->properties);

	if (retval)

		goto out;

		goto out_deallocate_sdma_queue;



	list_add(&q->list, &qpd->queues_list);

	qpd->queue_count++;
@@ -1114,7 +1114,13 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



out:

	mutex_unlock(&dqm->lock);

	return retval;



out_deallocate_sdma_queue:

	if (q->properties.type == KFD_QUEUE_TYPE_SDMA)

		deallocate_sdma_queue(dqm, q->sdma_id);

out_unlock:

	mutex_unlock(&dqm->lock);

	return retval;

}
@@ -1433,8 +1439,10 @@ static int process_termination_cpsch(struct device_queue_manager *dqm, 


	/* Clear all user mode queues */

	list_for_each_entry(q, &qpd->queues_list, list) {

		if (q->properties.type == KFD_QUEUE_TYPE_SDMA)

		if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {

			dqm->sdma_queue_count--;

			deallocate_sdma_queue(dqm, q->sdma_id);

		}



		if (q->properties.is_active)

			dqm->queue_count--;

drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ static int pm_create_map_process(struct packet_manager *pm, uint32_t *buffer, 
	packet->sh_mem_ape1_base = qpd->sh_mem_ape1_base;

	packet->sh_mem_ape1_limit = qpd->sh_mem_ape1_limit;



	/* TODO: scratch support */

	packet->sh_hidden_private_base_vmid = 0;

	packet->sh_hidden_private_base_vmid = qpd->sh_hidden_private_base;



	packet->gds_addr_lo = lower_32_bits(qpd->gds_context_area);

	packet->gds_addr_hi = upper_32_bits(qpd->gds_context_area);

drivers/gpu/drm/exynos/exynos_drm_fb.c

+14 −59
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <uapi/drm/exynos_drm.h>



#include "exynos_drm_drv.h"
@@ -26,20 +27,6 @@ 
#include "exynos_drm_iommu.h"

#include "exynos_drm_crtc.h"



#define to_exynos_fb(x)	container_of(x, struct exynos_drm_fb, fb)



/*

 * exynos specific framebuffer structure.

 *

 * @fb: drm framebuffer obejct.

 * @exynos_gem: array of exynos specific gem object containing a gem object.

 */

struct exynos_drm_fb {

	struct drm_framebuffer	fb;

	struct exynos_drm_gem	*exynos_gem[MAX_FB_BUFFER];

	dma_addr_t			dma_addr[MAX_FB_BUFFER];

};



static int check_fb_gem_memory_type(struct drm_device *drm_dev,

				    struct exynos_drm_gem *exynos_gem)

{
@@ -66,40 +53,9 @@ static int check_fb_gem_memory_type(struct drm_device *drm_dev, 
	return 0;

}



static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

	unsigned int i;



	drm_framebuffer_cleanup(fb);



	for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem); i++) {

		struct drm_gem_object *obj;



		if (exynos_fb->exynos_gem[i] == NULL)

			continue;



		obj = &exynos_fb->exynos_gem[i]->base;

		drm_gem_object_unreference_unlocked(obj);

	}



	kfree(exynos_fb);

	exynos_fb = NULL;

}



static int exynos_drm_fb_create_handle(struct drm_framebuffer *fb,

					struct drm_file *file_priv,

					unsigned int *handle)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);



	return drm_gem_handle_create(file_priv,

				     &exynos_fb->exynos_gem[0]->base, handle);

}



static const struct drm_framebuffer_funcs exynos_drm_fb_funcs = {

	.destroy	= exynos_drm_fb_destroy,

	.create_handle	= exynos_drm_fb_create_handle,

	.destroy	= drm_gem_fb_destroy,

	.create_handle	= drm_gem_fb_create_handle,

};



struct drm_framebuffer *
@@ -108,12 +64,12 @@ exynos_drm_framebuffer_init(struct drm_device *dev, 
			    struct exynos_drm_gem **exynos_gem,

			    int count)

{

	struct exynos_drm_fb *exynos_fb;

	struct drm_framebuffer *fb;

	int i;

	int ret;



	exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL);

	if (!exynos_fb)

	fb = kzalloc(sizeof(*fb), GFP_KERNEL);

	if (!fb)

		return ERR_PTR(-ENOMEM);



	for (i = 0; i < count; i++) {
@@ -121,23 +77,21 @@ exynos_drm_framebuffer_init(struct drm_device *dev, 
		if (ret < 0)

			goto err;



		exynos_fb->exynos_gem[i] = exynos_gem[i];

		exynos_fb->dma_addr[i] = exynos_gem[i]->dma_addr

						+ mode_cmd->offsets[i];

		fb->obj[i] = &exynos_gem[i]->base;

	}



	drm_helper_mode_fill_fb_struct(dev, &exynos_fb->fb, mode_cmd);

	drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd);



	ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs);

	ret = drm_framebuffer_init(dev, fb, &exynos_drm_fb_funcs);

	if (ret < 0) {

		DRM_ERROR("failed to initialize framebuffer\n");

		goto err;

	}



	return &exynos_fb->fb;

	return fb;



err:

	kfree(exynos_fb);

	kfree(fb);

	return ERR_PTR(ret);

}
@@ -191,12 +145,13 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 


dma_addr_t exynos_drm_fb_dma_addr(struct drm_framebuffer *fb, int index)

{

	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

	struct exynos_drm_gem *exynos_gem;



	if (WARN_ON_ONCE(index >= MAX_FB_BUFFER))

		return 0;



	return exynos_fb->dma_addr[index];

	exynos_gem = to_exynos_gem(fb->obj[index]);

	return exynos_gem->dma_addr + fb->offsets[index];

}



static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = {