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

Commit 9f8cf165 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel into drm-next 

Just random misc stuff that Sean/Sumit&Archit picked up while I relaxed.
Well except for one commit:

* tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel:
  drm: Only use compat ioctl for addfb2 on X86/IA64
  drm/qxl: squash lines for simple wrapper functions
  drm/bridge: analogix_dp: squash lines for simple wrapper functions
  drm/radeon: squash lines for simple wrapper functions
  drm/amdgpu: squash lines for simple wrapper functions
  dma-buf/sync-file: Avoid enable fence signaling if poll(.timeout=0)
  drm/fence: allow fence waiting to be interrupted by userspace
  drm: Move property validation to a helper, v2.
  drm/bridge: adv7511: add support for the 2nd chip
parents 8506912b a988588b

drivers/dma-buf/sync_file.c

+2 −1
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) 


	poll_wait(file, &sync_file->wq, wait);



	if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

	if (!poll_does_not_wait(wait) &&

	    !test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

		if (fence_add_callback(sync_file->fence, &sync_file->cb,

				       fence_check_cb_func) < 0)

			wake_up_all(&sync_file->wq);

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

+1 −5
Original line number Diff line number Diff line
@@ -466,11 +466,7 @@ static int dce_virtual_suspend(void *handle) 


static int dce_virtual_resume(void *handle)

{

	int ret;



	ret = dce_virtual_hw_init(handle);



	return ret;

	return dce_virtual_hw_init(handle);

}



static bool dce_virtual_is_idle(void *handle)

drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c

+1 −5
Original line number Diff line number Diff line
@@ -190,12 +190,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev) 
 */

static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)

{

	u32 rptr;



	/* XXX check if swapping is necessary on BE */

	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;



	return rptr;

	return ring->adev->wb.wb[ring->rptr_offs] >> 2;

}



/**

drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c

+1 −5
Original line number Diff line number Diff line
@@ -335,12 +335,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) 
 */

static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)

{

	u32 rptr;



	/* XXX check if swapping is necessary on BE */

	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;



	return rptr;

	return ring->adev->wb.wb[ring->rptr_offs] >> 2;

}



/**

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -922,15 +922,13 @@ static int adv7511_parse_dt(struct device_node *np, 
	return 0;

}



static const int edid_i2c_addr = 0x7e;

static const int packet_i2c_addr = 0x70;

static const int cec_i2c_addr = 0x78;



static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	struct adv7511_link_config link_config;

	struct adv7511 *adv7511;

	struct device *dev = &i2c->dev;

	unsigned int main_i2c_addr = i2c->addr << 1;

	unsigned int edid_i2c_addr = main_i2c_addr + 4;

	unsigned int val;

	int ret;
@@ -991,8 +989,10 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 


	regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr);

	regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR,

		     packet_i2c_addr);

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, cec_i2c_addr);

		     main_i2c_addr - 0xa);

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR,

		     main_i2c_addr - 2);



	adv7511_packet_disable(adv7511, 0xffff);



	adv7511->i2c_main = i2c;