Commit cf80a6fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.12-rc2' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Mostly nouveau and i915, fairly quiet as usual for rc2"

* tag 'drm-fixes-for-v4.12-rc2' of git://people.freedesktop.org/~airlied/linux:
  drm/atmel-hlcdc: Fix output initialization
  gpu: host1x: select IOMMU_IOVA
  drm/nouveau/fifo/gk104-: Silence a locking warning
  drm/nouveau/secboot: plug memory leak in ls_ucode_img_load_gr() error path
  drm/nouveau: Fix drm poll_helper handling
  drm/i915: don't do allocate_va_range again on PIN_UPDATE
  drm/i915: Fix rawclk readout for g4x
  drm/i915: Fix runtime PM for LPE audio
  drm/i915/glk: Fix DSI "*ERROR* ULPS is still active" messages
  drm/i915/gvt: avoid unnecessary vgpu switch
  drm/i915/gvt: not to restore in-context mmio
  drm/etnaviv: don't put fence in case of submit failure
  drm/i915/gvt: fix typo: "supporte" -> "support"
  drm: hdlcd: Fix the calculation of the scanout start address
parents 6fe1de43 d51aff16

drivers/gpu/drm/arm/hdlcd_crtc.c

+31 −16
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>
@@ -226,16 +227,33 @@ static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = { 
static int hdlcd_plane_atomic_check(struct drm_plane *plane,

				    struct drm_plane_state *state)

{

	u32 src_w, src_h;

	struct drm_rect clip = { 0 };

	struct drm_crtc_state *crtc_state;

	u32 src_h = state->src_h >> 16;



	src_w = state->src_w >> 16;

	src_h = state->src_h >> 16;



	/* we can't do any scaling of the plane source */

	if ((src_w != state->crtc_w) || (src_h != state->crtc_h))

	/* only the HDLCD_REG_FB_LINE_COUNT register has a limit */

	if (src_h >= HDLCD_MAX_YRES) {

		DRM_DEBUG_KMS("Invalid source width: %d\n", src_h);

		return -EINVAL;

	}



	if (!state->fb || !state->crtc)

		return 0;



	crtc_state = drm_atomic_get_existing_crtc_state(state->state,

							state->crtc);

	if (!crtc_state) {

		DRM_DEBUG_KMS("Invalid crtc state\n");

		return -EINVAL;

	}



	clip.x2 = crtc_state->adjusted_mode.hdisplay;

	clip.y2 = crtc_state->adjusted_mode.vdisplay;



	return drm_plane_helper_check_state(state, &clip,

					    DRM_PLANE_HELPER_NO_SCALING,

					    DRM_PLANE_HELPER_NO_SCALING,

					    false, true);

}



static void hdlcd_plane_atomic_update(struct drm_plane *plane,
@@ -244,21 +262,20 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane, 
	struct drm_framebuffer *fb = plane->state->fb;

	struct hdlcd_drm_private *hdlcd;

	struct drm_gem_cma_object *gem;

	u32 src_w, src_h, dest_w, dest_h;

	u32 src_x, src_y, dest_h;

	dma_addr_t scanout_start;



	if (!fb)

		return;



	src_w = plane->state->src_w >> 16;

	src_h = plane->state->src_h >> 16;

	dest_w = plane->state->crtc_w;

	dest_h = plane->state->crtc_h;

	src_x = plane->state->src.x1 >> 16;

	src_y = plane->state->src.y1 >> 16;

	dest_h = drm_rect_height(&plane->state->dst);

	gem = drm_fb_cma_get_gem_obj(fb, 0);



	scanout_start = gem->paddr + fb->offsets[0] +

		plane->state->crtc_y * fb->pitches[0] +

		plane->state->crtc_x *

		fb->format->cpp[0];

			src_y * fb->pitches[0] +

			src_x *	fb->format->cpp[0];



	hdlcd = plane->dev->dev_private;

	hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]);
@@ -305,7 +322,6 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) 
				       formats, ARRAY_SIZE(formats),

				       DRM_PLANE_TYPE_PRIMARY, NULL);

	if (ret) {

		devm_kfree(drm->dev, plane);

		return ERR_PTR(ret);

	}
@@ -329,7 +345,6 @@ int hdlcd_setup_crtc(struct drm_device *drm) 
					&hdlcd_crtc_funcs, NULL);

	if (ret) {

		hdlcd_plane_destroy(primary);

		devm_kfree(drm->dev, primary);

		return ret;

	}

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

+14 −22
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ static const struct drm_connector_funcs atmel_hlcdc_panel_connector_funcs = { 
	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static int atmel_hlcdc_attach_endpoint(struct drm_device *dev,

				       const struct device_node *np)

static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)

{

	struct atmel_hlcdc_dc *dc = dev->dev_private;

	struct atmel_hlcdc_rgb_output *output;
@@ -161,6 +160,11 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, 
	struct drm_bridge *bridge;

	int ret;



	ret = drm_of_find_panel_or_bridge(dev->dev->of_node, 0, endpoint,

					  &panel, &bridge);

	if (ret)

		return ret;



	output = devm_kzalloc(dev->dev, sizeof(*output), GFP_KERNEL);

	if (!output)

		return -EINVAL;
@@ -177,10 +181,6 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, 


	output->encoder.possible_crtcs = 0x1;



	ret = drm_of_find_panel_or_bridge(np, 0, 0, &panel, &bridge);

	if (ret)

		return ret;



	if (panel) {

		output->connector.dpms = DRM_MODE_DPMS_OFF;

		output->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
@@ -220,22 +220,14 @@ err_encoder_cleanup: 


int atmel_hlcdc_create_outputs(struct drm_device *dev)

{

	struct device_node *remote;

	int ret = -ENODEV;

	int endpoint = 0;



	while (true) {

		/* Loop thru possible multiple connections to the output */

		remote = of_graph_get_remote_node(dev->dev->of_node, 0,

						  endpoint++);

		if (!remote)

			break;



		ret = atmel_hlcdc_attach_endpoint(dev, remote);

		of_node_put(remote);

		if (ret)

			return ret;

	}

	int endpoint, ret = 0;



	for (endpoint = 0; !ret; endpoint++)

		ret = atmel_hlcdc_attach_endpoint(dev, endpoint);



	/* At least one device was successfully attached.*/

	if (ret == -ENODEV && endpoint)

		return 0;



	return ret;

}

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static struct etnaviv_gem_submit *submit_create(struct drm_device *dev, 


		/* initially, until copy_from_user() and bo lookup succeeds: */

		submit->nr_bos = 0;

		submit->fence = NULL;



		ww_acquire_init(&submit->ticket, &reservation_ww_class);

	}
@@ -294,6 +295,7 @@ static void submit_cleanup(struct etnaviv_gem_submit *submit) 
	}



	ww_acquire_fini(&submit->ticket);

	if (submit->fence)

		dma_fence_put(submit->fence);

	kfree(submit);

}

drivers/gpu/drm/i915/gvt/handlers.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static int dma_ctrl_write(struct intel_vgpu *vgpu, unsigned int offset, 
	mode = vgpu_vreg(vgpu, offset);



	if (GFX_MODE_BIT_SET_IN_MASK(mode, START_DMA)) {

		WARN_ONCE(1, "VM(%d): iGVT-g doesn't supporte GuC\n",

		WARN_ONCE(1, "VM(%d): iGVT-g doesn't support GuC\n",

				vgpu->id);

		return 0;

	}

drivers/gpu/drm/i915/gvt/render.c

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ void intel_gvt_restore_render_mmio(struct intel_vgpu *vgpu, int ring_id) 
		} else

			v = mmio->value;



		if (mmio->in_context)

			continue;



		I915_WRITE(mmio->reg, v);

		POSTING_READ(mmio->reg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE