mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-20 03:16:47 +07:00
drm/i915: split out display quirks to a new file
Reduce intel_display.c by splitting out intel_quirks.c. No functional changes. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181016144228.18267-1-jani.nikula@intel.com
This commit is contained in:
parent
410ed5731a
commit
593a21a04f
@ -124,6 +124,7 @@ i915-y += intel_audio.o \
|
||||
intel_hotplug.o \
|
||||
intel_overlay.o \
|
||||
intel_psr.o \
|
||||
intel_quirks.o \
|
||||
intel_sideband.o \
|
||||
intel_sprite.o
|
||||
i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
|
||||
|
@ -24,7 +24,6 @@
|
||||
* Eric Anholt <eric@anholt.net>
|
||||
*/
|
||||
|
||||
#include <linux/dmi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/i2c.h>
|
||||
@ -14710,174 +14709,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
|
||||
dev_priv->display.update_crtcs = intel_update_crtcs;
|
||||
}
|
||||
|
||||
/*
|
||||
* Some machines (Lenovo U160) do not work with SSC on LVDS for some reason
|
||||
*/
|
||||
static void quirk_ssc_force_disable(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE;
|
||||
DRM_INFO("applying lvds SSC disable quirk\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* A machine (e.g. Acer Aspire 5734Z) may need to invert the panel backlight
|
||||
* brightness value
|
||||
*/
|
||||
static void quirk_invert_brightness(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS;
|
||||
DRM_INFO("applying inverted panel brightness quirk\n");
|
||||
}
|
||||
|
||||
/* Some VBT's incorrectly indicate no backlight is present */
|
||||
static void quirk_backlight_present(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT;
|
||||
DRM_INFO("applying backlight present quirk\n");
|
||||
}
|
||||
|
||||
/* Toshiba Satellite P50-C-18C requires T12 delay to be min 800ms
|
||||
* which is 300 ms greater than eDP spec T12 min.
|
||||
*/
|
||||
static void quirk_increase_t12_delay(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
|
||||
dev_priv->quirks |= QUIRK_INCREASE_T12_DELAY;
|
||||
DRM_INFO("Applying T12 delay quirk\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* GeminiLake NUC HDMI outputs require additional off time
|
||||
* this allows the onboard retimer to correctly sync to signal
|
||||
*/
|
||||
static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
|
||||
dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
|
||||
DRM_INFO("Applying Increase DDI Disabled quirk\n");
|
||||
}
|
||||
|
||||
struct intel_quirk {
|
||||
int device;
|
||||
int subsystem_vendor;
|
||||
int subsystem_device;
|
||||
void (*hook)(struct drm_device *dev);
|
||||
};
|
||||
|
||||
/* For systems that don't have a meaningful PCI subdevice/subvendor ID */
|
||||
struct intel_dmi_quirk {
|
||||
void (*hook)(struct drm_device *dev);
|
||||
const struct dmi_system_id (*dmi_id_list)[];
|
||||
};
|
||||
|
||||
static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
|
||||
{
|
||||
DRM_INFO("Backlight polarity reversed on %s\n", id->ident);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct intel_dmi_quirk intel_dmi_quirks[] = {
|
||||
{
|
||||
.dmi_id_list = &(const struct dmi_system_id[]) {
|
||||
{
|
||||
.callback = intel_dmi_reverse_brightness,
|
||||
.ident = "NCR Corporation",
|
||||
.matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, ""),
|
||||
},
|
||||
},
|
||||
{ } /* terminating entry */
|
||||
},
|
||||
.hook = quirk_invert_brightness,
|
||||
},
|
||||
};
|
||||
|
||||
static struct intel_quirk intel_quirks[] = {
|
||||
/* Lenovo U160 cannot use SSC on LVDS */
|
||||
{ 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable },
|
||||
|
||||
/* Sony Vaio Y cannot use SSC on LVDS */
|
||||
{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },
|
||||
|
||||
/* Acer Aspire 5734Z must invert backlight brightness */
|
||||
{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
|
||||
|
||||
/* Acer/eMachines G725 */
|
||||
{ 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
|
||||
|
||||
/* Acer/eMachines e725 */
|
||||
{ 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
|
||||
|
||||
/* Acer/Packard Bell NCL20 */
|
||||
{ 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
|
||||
|
||||
/* Acer Aspire 4736Z */
|
||||
{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
|
||||
|
||||
/* Acer Aspire 5336 */
|
||||
{ 0x2a42, 0x1025, 0x048a, quirk_invert_brightness },
|
||||
|
||||
/* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */
|
||||
{ 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },
|
||||
|
||||
/* Acer C720 Chromebook (Core i3 4005U) */
|
||||
{ 0x0a16, 0x1025, 0x0a11, quirk_backlight_present },
|
||||
|
||||
/* Apple Macbook 2,1 (Core 2 T7400) */
|
||||
{ 0x27a2, 0x8086, 0x7270, quirk_backlight_present },
|
||||
|
||||
/* Apple Macbook 4,1 */
|
||||
{ 0x2a02, 0x106b, 0x00a1, quirk_backlight_present },
|
||||
|
||||
/* Toshiba CB35 Chromebook (Celeron 2955U) */
|
||||
{ 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },
|
||||
|
||||
/* HP Chromebook 14 (Celeron 2955U) */
|
||||
{ 0x0a06, 0x103c, 0x21ed, quirk_backlight_present },
|
||||
|
||||
/* Dell Chromebook 11 */
|
||||
{ 0x0a06, 0x1028, 0x0a35, quirk_backlight_present },
|
||||
|
||||
/* Dell Chromebook 11 (2015 version) */
|
||||
{ 0x0a16, 0x1028, 0x0a35, quirk_backlight_present },
|
||||
|
||||
/* Toshiba Satellite P50-C-18C */
|
||||
{ 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
|
||||
|
||||
/* GeminiLake NUC */
|
||||
{ 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
{ 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
/* ASRock ITX*/
|
||||
{ 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
{ 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
};
|
||||
|
||||
static void intel_init_quirks(struct drm_device *dev)
|
||||
{
|
||||
struct pci_dev *d = dev->pdev;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(intel_quirks); i++) {
|
||||
struct intel_quirk *q = &intel_quirks[i];
|
||||
|
||||
if (d->device == q->device &&
|
||||
(d->subsystem_vendor == q->subsystem_vendor ||
|
||||
q->subsystem_vendor == PCI_ANY_ID) &&
|
||||
(d->subsystem_device == q->subsystem_device ||
|
||||
q->subsystem_device == PCI_ANY_ID))
|
||||
q->hook(dev);
|
||||
}
|
||||
for (i = 0; i < ARRAY_SIZE(intel_dmi_quirks); i++) {
|
||||
if (dmi_check_system(*intel_dmi_quirks[i].dmi_id_list) != 0)
|
||||
intel_dmi_quirks[i].hook(dev);
|
||||
}
|
||||
}
|
||||
|
||||
/* Disable the VGA plane that we never use */
|
||||
static void i915_disable_vga(struct drm_i915_private *dev_priv)
|
||||
{
|
||||
|
@ -1981,6 +1981,9 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp);
|
||||
int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
|
||||
u32 *out_value);
|
||||
|
||||
/* intel_quirks.c */
|
||||
void intel_init_quirks(struct drm_device *dev);
|
||||
|
||||
/* intel_runtime_pm.c */
|
||||
int intel_power_domains_init(struct drm_i915_private *);
|
||||
void intel_power_domains_cleanup(struct drm_i915_private *dev_priv);
|
||||
|
176
drivers/gpu/drm/i915/intel_quirks.c
Normal file
176
drivers/gpu/drm/i915/intel_quirks.c
Normal file
@ -0,0 +1,176 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
/*
|
||||
* Copyright © 2018 Intel Corporation
|
||||
*/
|
||||
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#include "intel_drv.h"
|
||||
|
||||
/*
|
||||
* Some machines (Lenovo U160) do not work with SSC on LVDS for some reason
|
||||
*/
|
||||
static void quirk_ssc_force_disable(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE;
|
||||
DRM_INFO("applying lvds SSC disable quirk\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* A machine (e.g. Acer Aspire 5734Z) may need to invert the panel backlight
|
||||
* brightness value
|
||||
*/
|
||||
static void quirk_invert_brightness(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS;
|
||||
DRM_INFO("applying inverted panel brightness quirk\n");
|
||||
}
|
||||
|
||||
/* Some VBT's incorrectly indicate no backlight is present */
|
||||
static void quirk_backlight_present(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT;
|
||||
DRM_INFO("applying backlight present quirk\n");
|
||||
}
|
||||
|
||||
/* Toshiba Satellite P50-C-18C requires T12 delay to be min 800ms
|
||||
* which is 300 ms greater than eDP spec T12 min.
|
||||
*/
|
||||
static void quirk_increase_t12_delay(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
|
||||
dev_priv->quirks |= QUIRK_INCREASE_T12_DELAY;
|
||||
DRM_INFO("Applying T12 delay quirk\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* GeminiLake NUC HDMI outputs require additional off time
|
||||
* this allows the onboard retimer to correctly sync to signal
|
||||
*/
|
||||
static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
|
||||
dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
|
||||
DRM_INFO("Applying Increase DDI Disabled quirk\n");
|
||||
}
|
||||
|
||||
struct intel_quirk {
|
||||
int device;
|
||||
int subsystem_vendor;
|
||||
int subsystem_device;
|
||||
void (*hook)(struct drm_device *dev);
|
||||
};
|
||||
|
||||
/* For systems that don't have a meaningful PCI subdevice/subvendor ID */
|
||||
struct intel_dmi_quirk {
|
||||
void (*hook)(struct drm_device *dev);
|
||||
const struct dmi_system_id (*dmi_id_list)[];
|
||||
};
|
||||
|
||||
static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
|
||||
{
|
||||
DRM_INFO("Backlight polarity reversed on %s\n", id->ident);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct intel_dmi_quirk intel_dmi_quirks[] = {
|
||||
{
|
||||
.dmi_id_list = &(const struct dmi_system_id[]) {
|
||||
{
|
||||
.callback = intel_dmi_reverse_brightness,
|
||||
.ident = "NCR Corporation",
|
||||
.matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, ""),
|
||||
},
|
||||
},
|
||||
{ } /* terminating entry */
|
||||
},
|
||||
.hook = quirk_invert_brightness,
|
||||
},
|
||||
};
|
||||
|
||||
static struct intel_quirk intel_quirks[] = {
|
||||
/* Lenovo U160 cannot use SSC on LVDS */
|
||||
{ 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable },
|
||||
|
||||
/* Sony Vaio Y cannot use SSC on LVDS */
|
||||
{ 0x0046, 0x104d, 0x9076, quirk_ssc_force_disable },
|
||||
|
||||
/* Acer Aspire 5734Z must invert backlight brightness */
|
||||
{ 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
|
||||
|
||||
/* Acer/eMachines G725 */
|
||||
{ 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
|
||||
|
||||
/* Acer/eMachines e725 */
|
||||
{ 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
|
||||
|
||||
/* Acer/Packard Bell NCL20 */
|
||||
{ 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
|
||||
|
||||
/* Acer Aspire 4736Z */
|
||||
{ 0x2a42, 0x1025, 0x0260, quirk_invert_brightness },
|
||||
|
||||
/* Acer Aspire 5336 */
|
||||
{ 0x2a42, 0x1025, 0x048a, quirk_invert_brightness },
|
||||
|
||||
/* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */
|
||||
{ 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },
|
||||
|
||||
/* Acer C720 Chromebook (Core i3 4005U) */
|
||||
{ 0x0a16, 0x1025, 0x0a11, quirk_backlight_present },
|
||||
|
||||
/* Apple Macbook 2,1 (Core 2 T7400) */
|
||||
{ 0x27a2, 0x8086, 0x7270, quirk_backlight_present },
|
||||
|
||||
/* Apple Macbook 4,1 */
|
||||
{ 0x2a02, 0x106b, 0x00a1, quirk_backlight_present },
|
||||
|
||||
/* Toshiba CB35 Chromebook (Celeron 2955U) */
|
||||
{ 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },
|
||||
|
||||
/* HP Chromebook 14 (Celeron 2955U) */
|
||||
{ 0x0a06, 0x103c, 0x21ed, quirk_backlight_present },
|
||||
|
||||
/* Dell Chromebook 11 */
|
||||
{ 0x0a06, 0x1028, 0x0a35, quirk_backlight_present },
|
||||
|
||||
/* Dell Chromebook 11 (2015 version) */
|
||||
{ 0x0a16, 0x1028, 0x0a35, quirk_backlight_present },
|
||||
|
||||
/* Toshiba Satellite P50-C-18C */
|
||||
{ 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
|
||||
|
||||
/* GeminiLake NUC */
|
||||
{ 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
{ 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
|
||||
/* ASRock ITX*/
|
||||
{ 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
{ 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
|
||||
};
|
||||
|
||||
void intel_init_quirks(struct drm_device *dev)
|
||||
{
|
||||
struct pci_dev *d = dev->pdev;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(intel_quirks); i++) {
|
||||
struct intel_quirk *q = &intel_quirks[i];
|
||||
|
||||
if (d->device == q->device &&
|
||||
(d->subsystem_vendor == q->subsystem_vendor ||
|
||||
q->subsystem_vendor == PCI_ANY_ID) &&
|
||||
(d->subsystem_device == q->subsystem_device ||
|
||||
q->subsystem_device == PCI_ANY_ID))
|
||||
q->hook(dev);
|
||||
}
|
||||
for (i = 0; i < ARRAY_SIZE(intel_dmi_quirks); i++) {
|
||||
if (dmi_check_system(*intel_dmi_quirks[i].dmi_id_list) != 0)
|
||||
intel_dmi_quirks[i].hook(dev);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user