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

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



drm-misc-fixes for v5.3 (rc7?):
- Make qxl reservel the vga ports using vgaargb to prevent switching to vga compatibility mode.
- Fix omap port lookup for SDI output
- Use virtio_max_dma_size to fix an issue with swiotlb.
- Compiler fixes to komeda.
- Add missing of_node_get() call in komeda.
- Reorder the komeda de-init functions.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f187c28b-6279-2c4f-3e53-296ee899133b@linux.intel.com
parents a55aa89a 6978bce0

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np) 
	pipe->of_output_port =

		of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT);



	pipe->of_node = np;

	pipe->of_node = of_node_get(np);



	return 0;

}

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

+17 −12
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_vblank.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "komeda_dev.h"

#include "komeda_framebuffer.h"
@@ -147,7 +147,6 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, 
	struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(crtc_st);

	struct komeda_plane_state *kplane_st;

	struct drm_plane_state *plane_st;

	struct drm_framebuffer *fb;

	struct drm_plane *plane;

	struct list_head zorder_list;

	int order = 0, err;
@@ -173,7 +172,6 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, 


	list_for_each_entry(kplane_st, &zorder_list, zlist_node) {

		plane_st = &kplane_st->base;

		fb = plane_st->fb;

		plane = plane_st->plane;



		plane_st->normalized_zpos = order++;
@@ -206,7 +204,7 @@ static int komeda_kms_check(struct drm_device *dev, 
			    struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_st, *new_crtc_st;

	struct drm_crtc_state *new_crtc_st;

	int i, err;



	err = drm_atomic_helper_check_modeset(dev, state);
@@ -217,7 +215,7 @@ static int komeda_kms_check(struct drm_device *dev, 
	 * so need to add all affected_planes (even unchanged) to

	 * drm_atomic_state.

	 */

	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_st, new_crtc_st, i) {

	for_each_new_crtc_in_state(state, crtc, new_crtc_st, i) {

		err = drm_atomic_add_affected_planes(state, crtc);

		if (err)

			return err;
@@ -308,11 +306,11 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 
			       komeda_kms_irq_handler, IRQF_SHARED,

			       drm->driver->name, drm);

	if (err)

		goto cleanup_mode_config;

		goto free_component_binding;



	err = mdev->funcs->enable_irq(mdev);

	if (err)

		goto cleanup_mode_config;

		goto free_component_binding;



	drm->irq_enabled = true;
@@ -320,15 +318,21 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 


	err = drm_dev_register(drm, 0);

	if (err)

		goto cleanup_mode_config;

		goto free_interrupts;



	return kms;



cleanup_mode_config:

free_interrupts:

	drm_kms_helper_poll_fini(drm);

	drm->irq_enabled = false;

	mdev->funcs->disable_irq(mdev);

free_component_binding:

	component_unbind_all(mdev->dev, drm);

cleanup_mode_config:

	drm_mode_config_cleanup(drm);

	komeda_kms_cleanup_private_objs(kms);

	drm->dev_private = NULL;

	drm_dev_put(drm);

free_kms:

	kfree(kms);

	return ERR_PTR(err);
@@ -339,13 +343,14 @@ void komeda_kms_detach(struct komeda_kms_dev *kms) 
	struct drm_device *drm = &kms->base;

	struct komeda_dev *mdev = drm->dev_private;



	drm->irq_enabled = false;

	mdev->funcs->disable_irq(mdev);

	drm_dev_unregister(drm);

	drm_kms_helper_poll_fini(drm);

	drm_atomic_helper_shutdown(drm);

	drm->irq_enabled = false;

	mdev->funcs->disable_irq(mdev);

	component_unbind_all(mdev->dev, drm);

	komeda_kms_cleanup_private_objs(kms);

	drm_mode_config_cleanup(drm);

	komeda_kms_cleanup_private_objs(kms);

	drm->dev_private = NULL;

	drm_dev_put(drm);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ void komeda_pipeline_dump_register(struct komeda_pipeline *pipe, 
				   struct seq_file *sf);



/* component APIs */

extern __printf(10, 11)

struct komeda_component *

komeda_component_add(struct komeda_pipeline *pipe,

		     size_t comp_sz, u32 id, u32 hw_id,

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, 
	if (!kcrtc->master->wb_layer)

		return 0;



	kwb_conn = kzalloc(sizeof(*wb_conn), GFP_KERNEL);

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

	if (!kwb_conn)

		return -ENOMEM;

drivers/gpu/drm/omapdrm/dss/output.c

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Author: Archit Taneja <archit@ti.com>

 */



#include <linux/bitops.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>
@@ -20,7 +21,8 @@ int omapdss_device_init_output(struct omap_dss_device *out) 
{

	struct device_node *remote_node;



	remote_node = of_graph_get_remote_node(out->dev->of_node, 0, 0);

	remote_node = of_graph_get_remote_node(out->dev->of_node,

					       ffs(out->of_ports) - 1, 0);

	if (!remote_node) {

		dev_dbg(out->dev, "failed to find video sink\n");

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE