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

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

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Just general fixes: radeon, i915, atmel, tegra, amdkfd and one core
  fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (28 commits)
  drm: atmel-hlcdc: remove clock polarity from crtc driver
  drm/radeon: only enable DP audio if the monitor supports it
  drm/radeon: fix atom aux payload size check for writes (v2)
  drm/radeon: fix 1 RB harvest config setup for TN/RL
  drm/radeon: enable SRBM timeout interrupt on EG/NI
  drm/radeon: enable SRBM timeout interrupt on SI
  drm/radeon: enable SRBM timeout interrupt on CIK v2
  drm/radeon: dump full IB if we hit a packet error
  drm/radeon: disable mclk switching with 120hz+ monitors
  drm/radeon: use drm_mode_vrefresh() rather than mode->vrefresh
  drm/radeon: enable native backlight control on old macs
  drm/i915: Fix frontbuffer false positve.
  drm/i915: Align initial plane backing objects correctly
  drm/i915: avoid processing spurious/shared interrupts in low-power states
  drm/i915: Check obj->vma_list under the struct_mutex
  drm/i915: Fix a use after free, and unbalanced refcounting
  drm: atmel-hlcdc: remove useless pm_runtime_put_sync in probe
  drm: atmel-hlcdc: reset layer A2Q and UPDATE bits when disabling it
  drm: Fix deadlock due to getconnector locking changes
  drm/i915: Dell Chromebook 11 has PWM backlight
  ...
parents a015d33c 21689a44

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+8 −2
Original line number Diff line number Diff line
@@ -62,12 +62,18 @@ enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type) 
	return KFD_MQD_TYPE_CP;

}



static inline unsigned int get_first_pipe(struct device_queue_manager *dqm)

unsigned int get_first_pipe(struct device_queue_manager *dqm)

{

	BUG_ON(!dqm);

	BUG_ON(!dqm || !dqm->dev);

	return dqm->dev->shared_resources.first_compute_pipe;

}



unsigned int get_pipes_num(struct device_queue_manager *dqm)

{

	BUG_ON(!dqm || !dqm->dev);

	return dqm->dev->shared_resources.compute_pipe_count;

}



static inline unsigned int get_pipes_num_cpsch(void)

{

	return PIPE_PER_ME_CP_SCHEDULING;

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

+2 −6
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ void program_sh_mem_settings(struct device_queue_manager *dqm, 
					struct qcm_process_device *qpd);

int init_pipelines(struct device_queue_manager *dqm,

		unsigned int pipes_num, unsigned int first_pipe);

unsigned int get_first_pipe(struct device_queue_manager *dqm);

unsigned int get_pipes_num(struct device_queue_manager *dqm);



extern inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)

{
@@ -175,10 +177,4 @@ get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd) 
	return (pdd->lds_base >> 60) & 0x0E;

}



extern inline unsigned int get_pipes_num(struct device_queue_manager *dqm)

{

	BUG_ON(!dqm || !dqm->dev);

	return dqm->dev->shared_resources.compute_pipe_count;

}



#endif /* KFD_DEVICE_QUEUE_MANAGER_H_ */

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c

+1 −1
Original line number Diff line number Diff line
@@ -131,5 +131,5 @@ static int register_process_cik(struct device_queue_manager *dqm, 


static int initialize_cpsch_cik(struct device_queue_manager *dqm)

{

	return init_pipelines(dqm, get_pipes_num(dqm), 0);

	return init_pipelines(dqm, get_pipes_num(dqm), get_first_pipe(dqm));

}

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int atmel_hlcdc_crtc_mode_set(struct drm_crtc *c, 
		     (adj->crtc_hdisplay - 1) |

		     ((adj->crtc_vdisplay - 1) << 16));



	cfg = ATMEL_HLCDC_CLKPOL;

	cfg = 0;



	prate = clk_get_rate(crtc->dc->hlcdc->sys_clk);

	mode_rate = mode->crtc_clock * 1000;

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

+0 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) 


	pm_runtime_enable(dev->dev);



	pm_runtime_put_sync(dev->dev);



	ret = atmel_hlcdc_dc_modeset_init(dev);

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize mode setting\n");