Merge branch 'drm-intel-next-fixes' into drm-intel-fixes (a190d703) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,11 +121,11 @@ static const char *cache_level_str(int type)
		static void
		describe_obj(struct seq_file m, struct drm_i915_gem_object obj)
		{
		seq_printf(m, "%p: %s%s %8zd %04x %04x %d %d%s%s%s",
		seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d%s%s%s",
		&obj->base,
		get_pin_flag(obj),
		get_tiling_flag(obj),
		obj->base.size,
		obj->base.size / 1024,
		obj->base.read_domains,
		obj->base.write_domain,
		obj->last_rendering_seqno,

+6 −1

Original line number	Diff line number	Diff line
		@@ -28,14 +28,19 @@
		#include "drm.h"
		#include "i915_drm.h"
		#include "intel_drv.h"
		#include "i915_reg.h"

		static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
		{
		struct drm_i915_private *dev_priv = dev->dev_private;
		u32 dpll_reg;

		/* On IVB, 3rd pipe shares PLL with another one */
		if (pipe > 1)
		return false;

		if (HAS_PCH_SPLIT(dev))
		dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B;
		dpll_reg = PCH_DPLL(pipe);
		else
		dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;

+23 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		* Eric Anholt <eric@anholt.net>
		*/

		#include <linux/dmi.h>
		#include <linux/i2c.h>
		#include <linux/slab.h>
		#include "drmP.h"
		@@ -540,6 +541,24 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {
		.destroy = intel_encoder_destroy,
		};

		static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)
		{
		DRM_DEBUG_KMS("Skipping CRT initialization for %s\n", id->ident);
		return 1;
		}

		static const struct dmi_system_id intel_no_crt[] = {
		{
		.callback = intel_no_crt_dmi_callback,
		.ident = "ACER ZGB",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
		DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
		},
		},
		{ }
		};

		void intel_crt_init(struct drm_device *dev)
		{
		struct drm_connector *connector;
		@@ -547,6 +566,10 @@ void intel_crt_init(struct drm_device *dev)
		struct intel_connector *intel_connector;
		struct drm_i915_private *dev_priv = dev->dev_private;

		/* Skip machines without VGA that falsely report hotplug events */
		if (dmi_check_system(intel_no_crt))
		return;

		crt = kzalloc(sizeof(struct intel_crt), GFP_KERNEL);
		if (!crt)
		return;

+8 −0

Original line number	Diff line number	Diff line
		@@ -707,6 +707,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "U800"),
		},
		},
		{
		.callback = intel_no_lvds_dmi_callback,
		.ident = "Clientron E830",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Clientron"),
		DMI_MATCH(DMI_PRODUCT_NAME, "E830"),
		},
		},
		{
		.callback = intel_no_lvds_dmi_callback,
		.ident = "Asus EeeBox PC EB1007",

+3 −5

Original line number	Diff line number	Diff line
		@@ -1066,15 +1066,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,

		/* Set the SDVO control regs. */
		if (INTEL_INFO(dev)->gen >= 4) {
		sdvox = 0;
		/* The real mode polarity is set by the SDVO commands, using
		* struct intel_sdvo_dtd. */
		sdvox = SDVO_VSYNC_ACTIVE_HIGH \| SDVO_HSYNC_ACTIVE_HIGH;
		if (intel_sdvo->is_hdmi)
		sdvox \|= intel_sdvo->color_range;
		if (INTEL_INFO(dev)->gen < 5)
		sdvox \|= SDVO_BORDER_ENABLE;
		if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
		sdvox \|= SDVO_VSYNC_ACTIVE_HIGH;
		if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
		sdvox \|= SDVO_HSYNC_ACTIVE_HIGH;
		} else {
		sdvox = I915_READ(intel_sdvo->sdvo_reg);
		switch (intel_sdvo->sdvo_reg) {