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

Commit 59b0b70f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91 into drm-fixes 

Two bug fixes for the atmel-hlcdc driver.

* tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91:
  drm: atmel-hlcdc: Fix OF graph parsing
  drm: atmel-hlcdc: actually disable scaling when no scaling is required
parents f762bfda 0b1e1eb7

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

+6 −4
Original line number Diff line number Diff line
@@ -266,20 +266,22 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev) 
		if (!ret)

			ret = atmel_hlcdc_check_endpoint(dev, &ep);



		if (ret) {

			of_node_put(ep_np);

		if (ret)

			return ret;

		}

	}



	for_each_endpoint_of_node(dev->dev->of_node, ep_np) {

		ret = of_graph_parse_endpoint(ep_np, &ep);

		if (!ret)

			ret = atmel_hlcdc_attach_endpoint(dev, &ep);



		if (ret) {

			of_node_put(ep_np);

		if (ret)

			return ret;

		}

	}



	return 0;

}

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane, 


		atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff,

					     factor_reg);

	} else {

		atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0);

	}

}