Merge tag 'drm-intel-next-2020-03-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
UAPI Changes: On i915 we have a new UAPI to allow userspace to specify CS ring buffer size on construction (I915_CONTEXT_PARAM_RINGSIZE) and also new sysfs entries exposing various engine properties GVT Changes: VFIO edid getting expanded to all platforms and a big cleanup around attr group, unused vblank complete, kvmgt, Intel engine and dev_priv usages. i915 Changes: - new UAPI to allow userspace to specify CS ring buffer size on construction (I915_CONTEXT_PARAM_RINGSIZE) - (Chris) - New sysfs entries exposing various engine properties (Chris) - Tiger Lake is out of require_force_probe protection (Jose) - Changes in many places around active requests, reset and heartbeat (Chris) - Stop assigning drm-dev_private pointer (Jani) - Many code refactor in many places, including intel_modeset_init, increasing use of intel_uncore_*, vgpu, and gvt stuff (Jani) - Fixes around display pipe iterators (Anshuman) - Tigerlake enabling work (Matt Ropper, Matt Atwood, Ville, Lucas, Daniele, Jose, Anusha, Vivek, Swathi, Caz. Kai) - Code clean-up like reducing use of drm/i915_drv.h, removing unused registers, removing garbage warns, and some other code polishing (Jani, Lucas, Ville) - Selftests fixes, improvements and additions (Chris, Dan, Aditya, Matt Auld) - Fix plane possible_crtcs bit mask (Anshuman) - Fixes and cleanup on GLK pre production identification and w/a (Ville) - Fix display orientation on few cases (Hans, Ville) - dbuf clean-up and improvements for slice arrays handling (Ville) - Improvement around min cdclk calculation (Stanislav) - Fixes and refactor around display PLLs (Imre) - Other execlists and perf fixes (Chris) - Documentation fixes (Jani, Chris) - Fix build issue (Anshuman) - Many more fixes around the locking mechanisms (Chris) - Other fixes and debugability info around preemption (Chris, Tvrtko) - Add mechanism to submit a context WA on ring submission (Mika) - Clear all Eu/L3 resitual context (Prathap) - More changes around local memory (Abdiel, Matt, Chris) - Fix RPS (Chris) - DP MST fix (Lyude) - Display FBC fixes (Jose, RK) - debugfs cleanup (Tvrtko) - More convertion towards drm_debive based loggin (Wambui, Ram) - Avoid potential buffer overflow (Takashi) - Ice Lake and Elkhart Lake workarounds (Matt Roper) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200314001535.GA2969344@intel.com
此提交包含在:
@@ -1498,13 +1498,16 @@ struct drm_dp_desc {
|
||||
|
||||
int drm_dp_read_desc(struct drm_dp_aux *aux, struct drm_dp_desc *desc,
|
||||
bool is_branch);
|
||||
u32 drm_dp_get_edid_quirks(const struct edid *edid);
|
||||
|
||||
/**
|
||||
* enum drm_dp_quirk - Display Port sink/branch device specific quirks
|
||||
*
|
||||
* Display Port sink and branch devices in the wild have a variety of bugs, try
|
||||
* to collect them here. The quirks are shared, but it's up to the drivers to
|
||||
* implement workarounds for them.
|
||||
* implement workarounds for them. Note that because some devices have
|
||||
* unreliable OUIDs, the EDID of sinks should also be checked for quirks using
|
||||
* drm_dp_get_edid_quirks().
|
||||
*/
|
||||
enum drm_dp_quirk {
|
||||
/**
|
||||
@@ -1535,19 +1538,31 @@ enum drm_dp_quirk {
|
||||
* The DSC caps can be read from the physical aux instead.
|
||||
*/
|
||||
DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD,
|
||||
/**
|
||||
* @DP_QUIRK_FORCE_DPCD_BACKLIGHT:
|
||||
*
|
||||
* The device is telling the truth when it says that it uses DPCD
|
||||
* backlight controls, even if the system's firmware disagrees. This
|
||||
* quirk should be checked against both the ident and panel EDID.
|
||||
* When present, the driver should honor the DPCD backlight
|
||||
* capabilities advertised.
|
||||
*/
|
||||
DP_QUIRK_FORCE_DPCD_BACKLIGHT,
|
||||
};
|
||||
|
||||
/**
|
||||
* drm_dp_has_quirk() - does the DP device have a specific quirk
|
||||
* @desc: Device decriptor filled by drm_dp_read_desc()
|
||||
* @edid_quirks: Optional quirk bitmask filled by drm_dp_get_edid_quirks()
|
||||
* @quirk: Quirk to query for
|
||||
*
|
||||
* Return true if DP device identified by @desc has @quirk.
|
||||
*/
|
||||
static inline bool
|
||||
drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
|
||||
drm_dp_has_quirk(const struct drm_dp_desc *desc, u32 edid_quirks,
|
||||
enum drm_dp_quirk quirk)
|
||||
{
|
||||
return desc->quirks & BIT(quirk);
|
||||
return (desc->quirks | edid_quirks) & BIT(quirk);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DRM_DP_CEC
|
||||
|
新增問題並參考
封鎖使用者