Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "The biggest thing in this is the AMD Navi GPU support, this again contains a bunch of header files that are large. These are the new AMD RX5700 GPUs that just recently became available. New drivers: - ST-Ericsson MCDE driver - Ingenic JZ47xx SoC UAPI change: - HDR source metadata property Core: - HDR inforframes and EDID parsing - drm hdmi infoframe unpacking - remove prime sg_table caching into dma-buf - New gem vram helpers to reduce driver code - Lots of drmP.h removal - reservation fencing fix - documentation updates - drm_fb_helper_connector removed - mode name command handler rewrite fbcon: - Remove the fbcon notifiers ttm: - forward progress fixes dma-buf: - make mmap call optional - debugfs refcount fixes - dma-fence free with pending signals fix - each dma-buf gets an inode Panels: - Lots of additional panel bindings amdgpu: - initial navi10 support - avoid hw reset - HDR metadata support - new thermal sensors for vega asics - RAS fixes - use HMM rather than MMU notifier - xgmi topology via kfd - SR-IOV fixes - driver reload fixes - DC use a core bpc attribute - Aux fixes for DC - Bandwidth calc updates for DC - Clock handling refactor - kfd VEGAM support vmwgfx: - Coherent memory support changes i915: - HDR Support - HDMI i2c link - Icelake multi-segmented gamma support - GuC firmware update - Mule Creek Canyon PCH support for EHL - EHL platform updtes - move i915.alpha_support to i915.force_probe - runtime PM refactoring - VBT parsing refactoring - DSI fixes - struct mutex dependency reduction - GEM code reorg mali-dp: - Komeda driver features msm: - dsi vs EPROBE_DEFER fixes - msm8998 snapdragon 835 support - a540 gpu support - mdp5 and dpu interconnect support exynos: - drmP.h removal tegra: - misc fixes tda998x: - audio support improvements - pixel repeated mode support - quantisation range handling corrections - HDMI vendor info fix armada: - interlace support fix - overlay/video plane register handling refactor - add gamma support rockchip: - RX3328 support panfrost: - expose perf counters via hidden ioctls vkms: - enumerate CRC sources list ast: - rework BO handling mgag200: - rework BO handling dw-hdmi: - suspend/resume support rcar-du: - R8A774A1 Soc Support - LVDS dual-link mode support - Additional formats - Misc fixes omapdrm: - DSI command mode display support stm - fb modifier support - runtime PM support sun4i: - use vmap ops vc4: - binner bo binding rework v3d: - compute shader support - resync/sync fixes - job management refactoring lima: - NULL pointer in irq handler fix - scheduler default timeout virtio: - fence seqno support - trace events bochs: - misc fixes tc458767: - IRQ/HDP handling sii902x: - HDMI audio support atmel-hlcdc: - misc fixes meson: - zpos support" * tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm: (1815 commits) Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next" Revert "mm: adjust apply_to_pfn_range interface for dropped token." mm: adjust apply_to_pfn_range interface for dropped token. drm/amdgpu/navi10: add uclk activity sensor drm/amdgpu: properly guard the generic discovery code drm/amdgpu: add missing documentation on new module parameters drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback drm/amd/display: avoid 64-bit division drm/amdgpu/psp11: simplify the ucode register logic drm/amdgpu: properly guard DC support in navi code drm/amd/powerplay: vega20: fix uninitialized variable use drm/amd/display: dcn20: include linux/delay.h amdgpu: make pmu support optional drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq drm/amd/powerplay: Use memset to initialize metrics structs drm/amdgpu/mes10.1: Fix header guard drm/amd/powerplay: add temperature sensor support for navi10 drm/amdgpu: fix scheduler timeout calc drm/amdgpu: Prepare for hmm_range_register API change (v2) ...
This commit is contained in:
Linus Torvalds
@@ -23,6 +23,9 @@
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
|
||||
static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc,
|
||||
struct drm_crtc_state *state);
|
||||
|
||||
static void tegra_dc_stats_reset(struct tegra_dc_stats *stats)
|
||||
{
|
||||
stats->frames = 0;
|
||||
@@ -1152,20 +1155,12 @@ static void tegra_dc_destroy(struct drm_crtc *crtc)
|
||||
|
||||
static void tegra_crtc_reset(struct drm_crtc *crtc)
|
||||
{
|
||||
struct tegra_dc_state *state;
|
||||
struct tegra_dc_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
|
||||
|
||||
if (crtc->state)
|
||||
__drm_atomic_helper_crtc_destroy_state(crtc->state);
|
||||
|
||||
kfree(crtc->state);
|
||||
crtc->state = NULL;
|
||||
|
||||
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
||||
if (state) {
|
||||
crtc->state = &state->base;
|
||||
crtc->state->crtc = crtc;
|
||||
}
|
||||
tegra_crtc_atomic_destroy_state(crtc, crtc->state);
|
||||
|
||||
__drm_atomic_helper_crtc_reset(crtc, &state->base);
|
||||
drm_crtc_vblank_reset(crtc);
|
||||
}
|
||||
|
||||
|
||||
@@ -482,11 +482,16 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
dpaux->vdd = devm_regulator_get(&pdev->dev, "vdd");
|
||||
dpaux->vdd = devm_regulator_get_optional(&pdev->dev, "vdd");
|
||||
if (IS_ERR(dpaux->vdd)) {
|
||||
dev_err(&pdev->dev, "failed to get VDD supply: %ld\n",
|
||||
PTR_ERR(dpaux->vdd));
|
||||
return PTR_ERR(dpaux->vdd);
|
||||
if (PTR_ERR(dpaux->vdd) != -ENODEV) {
|
||||
if (PTR_ERR(dpaux->vdd) != -EPROBE_DEFER)
|
||||
dev_err(&pdev->dev,
|
||||
"failed to get VDD supply: %ld\n",
|
||||
PTR_ERR(dpaux->vdd));
|
||||
|
||||
return PTR_ERR(dpaux->vdd);
|
||||
}
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, dpaux);
|
||||
|
||||
@@ -124,8 +124,7 @@ struct tegra_output {
|
||||
const struct edid *edid;
|
||||
struct cec_notifier *cec;
|
||||
unsigned int hpd_irq;
|
||||
int hpd_gpio;
|
||||
enum of_gpio_flags hpd_gpio_flags;
|
||||
struct gpio_desc *hpd_gpio;
|
||||
|
||||
struct drm_encoder encoder;
|
||||
struct drm_connector connector;
|
||||
|
||||
@@ -128,18 +128,16 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
|
||||
struct drm_file *file,
|
||||
const struct drm_mode_fb_cmd2 *cmd)
|
||||
{
|
||||
unsigned int hsub, vsub, i;
|
||||
const struct drm_format_info *info = drm_get_format_info(drm, cmd);
|
||||
struct tegra_bo *planes[4];
|
||||
struct drm_gem_object *gem;
|
||||
struct drm_framebuffer *fb;
|
||||
unsigned int i;
|
||||
int err;
|
||||
|
||||
hsub = drm_format_horz_chroma_subsampling(cmd->pixel_format);
|
||||
vsub = drm_format_vert_chroma_subsampling(cmd->pixel_format);
|
||||
|
||||
for (i = 0; i < drm_format_num_planes(cmd->pixel_format); i++) {
|
||||
unsigned int width = cmd->width / (i ? hsub : 1);
|
||||
unsigned int height = cmd->height / (i ? vsub : 1);
|
||||
for (i = 0; i < info->num_planes; i++) {
|
||||
unsigned int width = cmd->width / (i ? info->hsub : 1);
|
||||
unsigned int height = cmd->height / (i ? info->vsub : 1);
|
||||
unsigned int size, bpp;
|
||||
|
||||
gem = drm_gem_object_lookup(file, cmd->handles[i]);
|
||||
@@ -148,7 +146,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
|
||||
goto unreference;
|
||||
}
|
||||
|
||||
bpp = drm_format_plane_cpp(cmd->pixel_format, i);
|
||||
bpp = info->cpp[i];
|
||||
|
||||
size = (height - 1) * cmd->pitches[i] +
|
||||
width * bpp + cmd->offsets[i];
|
||||
|
||||
@@ -50,18 +50,11 @@ tegra_output_connector_detect(struct drm_connector *connector, bool force)
|
||||
struct tegra_output *output = connector_to_output(connector);
|
||||
enum drm_connector_status status = connector_status_unknown;
|
||||
|
||||
if (gpio_is_valid(output->hpd_gpio)) {
|
||||
if (output->hpd_gpio_flags & OF_GPIO_ACTIVE_LOW) {
|
||||
if (gpio_get_value(output->hpd_gpio) != 0)
|
||||
status = connector_status_disconnected;
|
||||
else
|
||||
status = connector_status_connected;
|
||||
} else {
|
||||
if (gpio_get_value(output->hpd_gpio) == 0)
|
||||
status = connector_status_disconnected;
|
||||
else
|
||||
status = connector_status_connected;
|
||||
}
|
||||
if (output->hpd_gpio) {
|
||||
if (gpiod_get_value(output->hpd_gpio) == 0)
|
||||
status = connector_status_disconnected;
|
||||
else
|
||||
status = connector_status_connected;
|
||||
} else {
|
||||
if (!output->panel)
|
||||
status = connector_status_disconnected;
|
||||
@@ -99,6 +92,7 @@ static irqreturn_t hpd_irq(int irq, void *data)
|
||||
int tegra_output_probe(struct tegra_output *output)
|
||||
{
|
||||
struct device_node *ddc, *panel;
|
||||
unsigned long flags;
|
||||
int err, size;
|
||||
|
||||
if (!output->of_node)
|
||||
@@ -127,23 +121,18 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
of_node_put(ddc);
|
||||
}
|
||||
|
||||
output->hpd_gpio = of_get_named_gpio_flags(output->of_node,
|
||||
"nvidia,hpd-gpio", 0,
|
||||
&output->hpd_gpio_flags);
|
||||
if (gpio_is_valid(output->hpd_gpio)) {
|
||||
unsigned long flags;
|
||||
output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev,
|
||||
output->of_node,
|
||||
"nvidia,hpd-gpio", 0,
|
||||
GPIOD_IN,
|
||||
"HDMI hotplug detect");
|
||||
if (IS_ERR(output->hpd_gpio))
|
||||
return PTR_ERR(output->hpd_gpio);
|
||||
|
||||
err = gpio_request_one(output->hpd_gpio, GPIOF_DIR_IN,
|
||||
"HDMI hotplug detect");
|
||||
if (output->hpd_gpio) {
|
||||
err = gpiod_to_irq(output->hpd_gpio);
|
||||
if (err < 0) {
|
||||
dev_err(output->dev, "gpio_request_one(): %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = gpio_to_irq(output->hpd_gpio);
|
||||
if (err < 0) {
|
||||
dev_err(output->dev, "gpio_to_irq(): %d\n", err);
|
||||
gpio_free(output->hpd_gpio);
|
||||
dev_err(output->dev, "gpiod_to_irq(): %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -157,7 +146,6 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
if (err < 0) {
|
||||
dev_err(output->dev, "failed to request IRQ#%u: %d\n",
|
||||
output->hpd_irq, err);
|
||||
gpio_free(output->hpd_gpio);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -183,10 +171,8 @@ void tegra_output_remove(struct tegra_output *output)
|
||||
if (output->cec)
|
||||
cec_notifier_put(output->cec);
|
||||
|
||||
if (gpio_is_valid(output->hpd_gpio)) {
|
||||
if (output->hpd_gpio)
|
||||
free_irq(output->hpd_irq, output);
|
||||
gpio_free(output->hpd_gpio);
|
||||
}
|
||||
|
||||
if (output->ddc)
|
||||
put_device(&output->ddc->dev);
|
||||
@@ -206,7 +192,7 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output)
|
||||
* The connector is now registered and ready to receive hotplug events
|
||||
* so the hotplug interrupt can be enabled.
|
||||
*/
|
||||
if (gpio_is_valid(output->hpd_gpio))
|
||||
if (output->hpd_gpio)
|
||||
enable_irq(output->hpd_irq);
|
||||
|
||||
return 0;
|
||||
@@ -218,7 +204,7 @@ void tegra_output_exit(struct tegra_output *output)
|
||||
* The connector is going away, so the interrupt must be disabled to
|
||||
* prevent the hotplug interrupt handler from potentially crashing.
|
||||
*/
|
||||
if (gpio_is_valid(output->hpd_gpio))
|
||||
if (output->hpd_gpio)
|
||||
disable_irq(output->hpd_irq);
|
||||
|
||||
if (output->panel)
|
||||
|
||||
Reference in New Issue
Block a user