Commit 399895b3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2020-12-22' of... 

Merge tag 'drm-misc-next-fixes-2020-12-22' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

 * dma-buf: Include <linux/vmalloc.h> for building on MIPS
 * komeda: Fix order of operation in commit tail; Fix NULL-pointer and
           out-of-bounds access; Cleanups
 * ttm: Fix an unused-function warning

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/X+JFYlW1SEZa6ShA@linux-uq9g
parents 4efd7fab be3e477e

drivers/dma-buf/heaps/cma_heap.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/module.h>

#include <linux/scatterlist.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>





struct cma_heap {

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

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) 
	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_name_eq(child, "pipeline")) {

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

+2 −2
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ static void komeda_kms_commit_tail(struct drm_atomic_state *old_state) 


	drm_atomic_helper_commit_modeset_enables(dev, old_state);



	drm_atomic_helper_wait_for_flip_done(dev, old_state);



	drm_atomic_helper_commit_hw_done(old_state);



	drm_atomic_helper_wait_for_flip_done(dev, old_state);



	drm_atomic_helper_cleanup_planes(dev, old_state);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -137,9 +137,10 @@ komeda_pipeline_get_first_component(struct komeda_pipeline *pipe, 
				    u32 comp_mask)

{

	struct komeda_component *c = NULL;

	unsigned long comp_mask_local = (unsigned long)comp_mask;

	int id;



	id = find_first_bit((unsigned long *)&comp_mask, 32);

	id = find_first_bit(&comp_mask_local, 32);

	if (id < 32)

		c = komeda_pipeline_get_component(pipe, id);

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

+2 −2
Original line number Diff line number Diff line
@@ -704,10 +704,10 @@ komeda_compiz_set_input(struct komeda_compiz *compiz, 
	cin->layer_alpha = dflow->layer_alpha;



	old_st = komeda_component_get_old_state(&compiz->base, drm_st);

	WARN_ON(!old_st);



	/* compare with old to check if this input has been changed */

	if (memcmp(&(to_compiz_st(old_st)->cins[idx]), cin, sizeof(*cin)))

	if (WARN_ON(!old_st) ||

	    memcmp(&(to_compiz_st(old_st)->cins[idx]), cin, sizeof(*cin)))

		c_st->changed_active_inputs |= BIT(idx);



	komeda_component_add_input(c_st, &dflow->input, idx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE