Commit 9b7c880c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2018-11-23' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular drm fixes:

  amdgpu:
   - Vega20 fixes
   - firmware loading fix
   - panel display fix
   - override fix

  i915:
   - Sandybridge lockup fix
   - fastboot DSI panel fix
   - GPU hang on Broxton
   - GPU reloc fixes on pineview/bearlake

  ast:
   - screen blurring fix
   - cursor appearance fix

  udmabuf:
   - mmap fix

  vc4:
   - NULL deref fix
   - async cursor update fix

  All seems pretty normal at this stage"

* tag 'drm-fixes-2018-11-23' of git://anongit.freedesktop.org/drm/drm:
  drm/ast: fixed cursor may disappear sometimes
  drm/ast: change resolution may cause screen blurred
  drm/i915: Add rotation readout for plane initial config
  drm/i915: Force a LUT update in intel_initial_commit()
  drm/fb-helper: Blacklist writeback when adding connectors to fbdev
  drm/i915: Write GPU relocs harder with gen3
  drm/amdgpu: Enable HDP memory light sleep
  drm/i915: Prevent machine hang from Broxton's vtd w/a and error capture
  drm/amd/pp: handle negative values when reading OD
  drm/amdgpu: Add missing firmware entry for HAINAN
  drm/amd/powerplay: disable Vega20 DS related features
  drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset
  drm/i915: Disable LP3 watermarks on all SNB machines
  drm/ast: Remove existing framebuffers before loading driver
  udmabuf: set read/write flag when exporting
  drm/amd/display: Support amdgpu "max bpc" connector property (v2)
  drm/amdgpu: Add amdgpu "max bpc" connector property (v2)
  drm/vc4: Set ->legacy_cursor_update to false when doing non-async updates
  drm/vc4: Fix NULL pointer dereference in the async update path
parents edeca3a7 98c9cdfd

drivers/dma-buf/udmabuf.c

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static long udmabuf_create(const struct udmabuf_create_list *head, 
	exp_info.ops  = &udmabuf_ops;

	exp_info.size = ubuf->pagecount << PAGE_SHIFT;

	exp_info.priv = ubuf;

	exp_info.flags = O_RDWR;



	buf = dma_buf_export(&exp_info);

	if (IS_ERR(buf)) {

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

+5 −2
Original line number Diff line number Diff line
@@ -501,8 +501,11 @@ void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	if (adev->powerplay.pp_funcs &&

	    adev->powerplay.pp_funcs->switch_power_profile)

		amdgpu_dpm_switch_power_profile(adev,

					PP_SMC_POWER_PROFILE_COMPUTE, !idle);

						PP_SMC_POWER_PROFILE_COMPUTE,

						!idle);

}



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)

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

+7 −0
Original line number Diff line number Diff line
@@ -626,6 +626,13 @@ int amdgpu_display_modeset_create_props(struct amdgpu_device *adev) 
					 "dither",

					 amdgpu_dither_enum_list, sz);



	if (amdgpu_device_has_dc_support(adev)) {

		adev->mode_info.max_bpc_property =

			drm_property_create_range(adev->ddev, 0, "max bpc", 8, 16);

		if (!adev->mode_info.max_bpc_property)

			return -ENOMEM;

	}



	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ struct amdgpu_mode_info { 
	struct drm_property *audio_property;

	/* FMT dithering */

	struct drm_property *dither_property;

	/* maximum number of bits per channel for monitor color */

	struct drm_property *max_bpc_property;

	/* hardcoded DFP edid from BIOS */

	struct edid *bios_hardcoded_edid;

	int bios_hardcoded_edid_size;

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ MODULE_FIRMWARE("amdgpu/tahiti_mc.bin"); 
MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");

MODULE_FIRMWARE("amdgpu/verde_mc.bin");

MODULE_FIRMWARE("amdgpu/oland_mc.bin");

MODULE_FIRMWARE("amdgpu/hainan_mc.bin");

MODULE_FIRMWARE("amdgpu/si58_mc.bin");



#define MC_SEQ_MISC0__MT__MASK   0xf0000000