Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull more drm fixes from Dave Airlie: "Some more fixes trickled in: A bunch of VC4 ones since it's a pretty new driver not much chance of regressions, and it fixes GPU resets. Also one atomic fix, one set of fixes for a common bug in TTM cleanup, and one i915 hotplug fix" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau: use post-decrement in error handling drm/atomic: Allow for holes in connector state, v2. drm/i915: Fix hpd live status bits for g4x drm/vc4: Use runtime PM to power cycle the device when the GPU hangs. drm/vc4: Enable runtime PM. drm/vc4: Fix spurious GPU resets due to BO reuse. drm/vc4: Drop error message on seqno wait timeouts. drm/vc4: Fix -ERESTARTSYS error return from BO waits. drm/vc4: Return an ERR_PTR from BO creation instead of NULL. drm/vc4: Fix the clear color for the first tile rendered. drm/vc4: Validate that WAIT_BO padding is cleared. drm/radeon: use post-decrement in error handling drm/amdgpu: use post-decrement in error handling
This commit is contained in:
Коммит
a703f42d6c
|
@ -712,7 +712,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm)
|
|||
0, PAGE_SIZE,
|
||||
PCI_DMA_BIDIRECTIONAL);
|
||||
if (pci_dma_mapping_error(adev->pdev, gtt->ttm.dma_address[i])) {
|
||||
while (--i) {
|
||||
while (i--) {
|
||||
pci_unmap_page(adev->pdev, gtt->ttm.dma_address[i],
|
||||
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
|
||||
gtt->ttm.dma_address[i] = 0;
|
||||
|
|
|
@ -65,8 +65,6 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
|
|||
*/
|
||||
state->allow_modeset = true;
|
||||
|
||||
state->num_connector = ACCESS_ONCE(dev->mode_config.num_connector);
|
||||
|
||||
state->crtcs = kcalloc(dev->mode_config.num_crtc,
|
||||
sizeof(*state->crtcs), GFP_KERNEL);
|
||||
if (!state->crtcs)
|
||||
|
@ -83,16 +81,6 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
|
|||
sizeof(*state->plane_states), GFP_KERNEL);
|
||||
if (!state->plane_states)
|
||||
goto fail;
|
||||
state->connectors = kcalloc(state->num_connector,
|
||||
sizeof(*state->connectors),
|
||||
GFP_KERNEL);
|
||||
if (!state->connectors)
|
||||
goto fail;
|
||||
state->connector_states = kcalloc(state->num_connector,
|
||||
sizeof(*state->connector_states),
|
||||
GFP_KERNEL);
|
||||
if (!state->connector_states)
|
||||
goto fail;
|
||||
|
||||
state->dev = dev;
|
||||
|
||||
|
@ -823,19 +811,27 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
|
|||
|
||||
index = drm_connector_index(connector);
|
||||
|
||||
/*
|
||||
* Construction of atomic state updates can race with a connector
|
||||
* hot-add which might overflow. In this case flip the table and just
|
||||
* restart the entire ioctl - no one is fast enough to livelock a cpu
|
||||
* with physical hotplug events anyway.
|
||||
*
|
||||
* Note that we only grab the indexes once we have the right lock to
|
||||
* prevent hotplug/unplugging of connectors. So removal is no problem,
|
||||
* at most the array is a bit too large.
|
||||
*/
|
||||
if (index >= state->num_connector) {
|
||||
DRM_DEBUG_ATOMIC("Hot-added connector would overflow state array, restarting\n");
|
||||
return ERR_PTR(-EAGAIN);
|
||||
struct drm_connector **c;
|
||||
struct drm_connector_state **cs;
|
||||
int alloc = max(index + 1, config->num_connector);
|
||||
|
||||
c = krealloc(state->connectors, alloc * sizeof(*state->connectors), GFP_KERNEL);
|
||||
if (!c)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
state->connectors = c;
|
||||
memset(&state->connectors[state->num_connector], 0,
|
||||
sizeof(*state->connectors) * (alloc - state->num_connector));
|
||||
|
||||
cs = krealloc(state->connector_states, alloc * sizeof(*state->connector_states), GFP_KERNEL);
|
||||
if (!cs)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
state->connector_states = cs;
|
||||
memset(&state->connector_states[state->num_connector], 0,
|
||||
sizeof(*state->connector_states) * (alloc - state->num_connector));
|
||||
state->num_connector = alloc;
|
||||
}
|
||||
|
||||
if (state->connector_states[index])
|
||||
|
|
|
@ -1493,7 +1493,7 @@ void drm_atomic_helper_swap_state(struct drm_device *dev,
|
|||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < dev->mode_config.num_connector; i++) {
|
||||
for (i = 0; i < state->num_connector; i++) {
|
||||
struct drm_connector *connector = state->connectors[i];
|
||||
|
||||
if (!connector)
|
||||
|
|
|
@ -918,12 +918,19 @@ int drm_connector_init(struct drm_device *dev,
|
|||
connector->base.properties = &connector->properties;
|
||||
connector->dev = dev;
|
||||
connector->funcs = funcs;
|
||||
|
||||
connector->connector_id = ida_simple_get(&config->connector_ida, 0, 0, GFP_KERNEL);
|
||||
if (connector->connector_id < 0) {
|
||||
ret = connector->connector_id;
|
||||
goto out_put;
|
||||
}
|
||||
|
||||
connector->connector_type = connector_type;
|
||||
connector->connector_type_id =
|
||||
ida_simple_get(connector_ida, 1, 0, GFP_KERNEL);
|
||||
if (connector->connector_type_id < 0) {
|
||||
ret = connector->connector_type_id;
|
||||
goto out_put;
|
||||
goto out_put_id;
|
||||
}
|
||||
connector->name =
|
||||
kasprintf(GFP_KERNEL, "%s-%d",
|
||||
|
@ -931,7 +938,7 @@ int drm_connector_init(struct drm_device *dev,
|
|||
connector->connector_type_id);
|
||||
if (!connector->name) {
|
||||
ret = -ENOMEM;
|
||||
goto out_put;
|
||||
goto out_put_type_id;
|
||||
}
|
||||
|
||||
INIT_LIST_HEAD(&connector->probed_modes);
|
||||
|
@ -959,7 +966,12 @@ int drm_connector_init(struct drm_device *dev,
|
|||
}
|
||||
|
||||
connector->debugfs_entry = NULL;
|
||||
|
||||
out_put_type_id:
|
||||
if (ret)
|
||||
ida_remove(connector_ida, connector->connector_type_id);
|
||||
out_put_id:
|
||||
if (ret)
|
||||
ida_remove(&config->connector_ida, connector->connector_id);
|
||||
out_put:
|
||||
if (ret)
|
||||
drm_mode_object_put(dev, &connector->base);
|
||||
|
@ -996,6 +1008,9 @@ void drm_connector_cleanup(struct drm_connector *connector)
|
|||
ida_remove(&drm_connector_enum_list[connector->connector_type].ida,
|
||||
connector->connector_type_id);
|
||||
|
||||
ida_remove(&dev->mode_config.connector_ida,
|
||||
connector->connector_id);
|
||||
|
||||
kfree(connector->display_info.bus_formats);
|
||||
drm_mode_object_put(dev, &connector->base);
|
||||
kfree(connector->name);
|
||||
|
@ -1012,32 +1027,6 @@ void drm_connector_cleanup(struct drm_connector *connector)
|
|||
}
|
||||
EXPORT_SYMBOL(drm_connector_cleanup);
|
||||
|
||||
/**
|
||||
* drm_connector_index - find the index of a registered connector
|
||||
* @connector: connector to find index for
|
||||
*
|
||||
* Given a registered connector, return the index of that connector within a DRM
|
||||
* device's list of connectors.
|
||||
*/
|
||||
unsigned int drm_connector_index(struct drm_connector *connector)
|
||||
{
|
||||
unsigned int index = 0;
|
||||
struct drm_connector *tmp;
|
||||
struct drm_mode_config *config = &connector->dev->mode_config;
|
||||
|
||||
WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
|
||||
|
||||
drm_for_each_connector(tmp, connector->dev) {
|
||||
if (tmp == connector)
|
||||
return index;
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
BUG();
|
||||
}
|
||||
EXPORT_SYMBOL(drm_connector_index);
|
||||
|
||||
/**
|
||||
* drm_connector_register - register a connector
|
||||
* @connector: the connector to register
|
||||
|
@ -5789,6 +5778,7 @@ void drm_mode_config_init(struct drm_device *dev)
|
|||
INIT_LIST_HEAD(&dev->mode_config.plane_list);
|
||||
idr_init(&dev->mode_config.crtc_idr);
|
||||
idr_init(&dev->mode_config.tile_idr);
|
||||
ida_init(&dev->mode_config.connector_ida);
|
||||
|
||||
drm_modeset_lock_all(dev);
|
||||
drm_mode_create_standard_properties(dev);
|
||||
|
@ -5869,6 +5859,7 @@ void drm_mode_config_cleanup(struct drm_device *dev)
|
|||
crtc->funcs->destroy(crtc);
|
||||
}
|
||||
|
||||
ida_destroy(&dev->mode_config.connector_ida);
|
||||
idr_destroy(&dev->mode_config.tile_idr);
|
||||
idr_destroy(&dev->mode_config.crtc_idr);
|
||||
drm_modeset_lock_fini(&dev->mode_config.connection_mutex);
|
||||
|
|
|
@ -3287,19 +3287,20 @@ enum skl_disp_power_wells {
|
|||
|
||||
#define PORT_HOTPLUG_STAT _MMIO(dev_priv->info.display_mmio_offset + 0x61114)
|
||||
/*
|
||||
* HDMI/DP bits are gen4+
|
||||
* HDMI/DP bits are g4x+
|
||||
*
|
||||
* WARNING: Bspec for hpd status bits on gen4 seems to be completely confused.
|
||||
* Please check the detailed lore in the commit message for for experimental
|
||||
* evidence.
|
||||
*/
|
||||
#define PORTD_HOTPLUG_LIVE_STATUS_G4X (1 << 29)
|
||||
/* Bspec says GM45 should match G4X/VLV/CHV, but reality disagrees */
|
||||
#define PORTD_HOTPLUG_LIVE_STATUS_GM45 (1 << 29)
|
||||
#define PORTC_HOTPLUG_LIVE_STATUS_GM45 (1 << 28)
|
||||
#define PORTB_HOTPLUG_LIVE_STATUS_GM45 (1 << 27)
|
||||
/* G4X/VLV/CHV DP/HDMI bits again match Bspec */
|
||||
#define PORTD_HOTPLUG_LIVE_STATUS_G4X (1 << 27)
|
||||
#define PORTC_HOTPLUG_LIVE_STATUS_G4X (1 << 28)
|
||||
#define PORTB_HOTPLUG_LIVE_STATUS_G4X (1 << 27)
|
||||
/* VLV DP/HDMI bits again match Bspec */
|
||||
#define PORTD_HOTPLUG_LIVE_STATUS_VLV (1 << 27)
|
||||
#define PORTC_HOTPLUG_LIVE_STATUS_VLV (1 << 28)
|
||||
#define PORTB_HOTPLUG_LIVE_STATUS_VLV (1 << 29)
|
||||
#define PORTB_HOTPLUG_LIVE_STATUS_G4X (1 << 29)
|
||||
#define PORTD_HOTPLUG_INT_STATUS (3 << 21)
|
||||
#define PORTD_HOTPLUG_INT_LONG_PULSE (2 << 21)
|
||||
#define PORTD_HOTPLUG_INT_SHORT_PULSE (1 << 21)
|
||||
|
|
|
@ -4493,20 +4493,20 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv,
|
|||
return I915_READ(PORT_HOTPLUG_STAT) & bit;
|
||||
}
|
||||
|
||||
static bool vlv_digital_port_connected(struct drm_i915_private *dev_priv,
|
||||
struct intel_digital_port *port)
|
||||
static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv,
|
||||
struct intel_digital_port *port)
|
||||
{
|
||||
u32 bit;
|
||||
|
||||
switch (port->port) {
|
||||
case PORT_B:
|
||||
bit = PORTB_HOTPLUG_LIVE_STATUS_VLV;
|
||||
bit = PORTB_HOTPLUG_LIVE_STATUS_GM45;
|
||||
break;
|
||||
case PORT_C:
|
||||
bit = PORTC_HOTPLUG_LIVE_STATUS_VLV;
|
||||
bit = PORTC_HOTPLUG_LIVE_STATUS_GM45;
|
||||
break;
|
||||
case PORT_D:
|
||||
bit = PORTD_HOTPLUG_LIVE_STATUS_VLV;
|
||||
bit = PORTD_HOTPLUG_LIVE_STATUS_GM45;
|
||||
break;
|
||||
default:
|
||||
MISSING_CASE(port->port);
|
||||
|
@ -4558,8 +4558,8 @@ bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
|
|||
return cpt_digital_port_connected(dev_priv, port);
|
||||
else if (IS_BROXTON(dev_priv))
|
||||
return bxt_digital_port_connected(dev_priv, port);
|
||||
else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
|
||||
return vlv_digital_port_connected(dev_priv, port);
|
||||
else if (IS_GM45(dev_priv))
|
||||
return gm45_digital_port_connected(dev_priv, port);
|
||||
else
|
||||
return g4x_digital_port_connected(dev_priv, port);
|
||||
}
|
||||
|
|
|
@ -1520,7 +1520,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm)
|
|||
DMA_BIDIRECTIONAL);
|
||||
|
||||
if (dma_mapping_error(pdev, addr)) {
|
||||
while (--i) {
|
||||
while (i--) {
|
||||
dma_unmap_page(pdev, ttm_dma->dma_address[i],
|
||||
PAGE_SIZE, DMA_BIDIRECTIONAL);
|
||||
ttm_dma->dma_address[i] = 0;
|
||||
|
|
|
@ -758,7 +758,7 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
|
|||
0, PAGE_SIZE,
|
||||
PCI_DMA_BIDIRECTIONAL);
|
||||
if (pci_dma_mapping_error(rdev->pdev, gtt->ttm.dma_address[i])) {
|
||||
while (--i) {
|
||||
while (i--) {
|
||||
pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
|
||||
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
|
||||
gtt->ttm.dma_address[i] = 0;
|
||||
|
|
|
@ -215,7 +215,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size,
|
|||
struct drm_gem_cma_object *cma_obj;
|
||||
|
||||
if (size == 0)
|
||||
return NULL;
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
/* First, try to get a vc4_bo from the kernel BO cache. */
|
||||
if (from_cache) {
|
||||
|
@ -237,7 +237,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size,
|
|||
if (IS_ERR(cma_obj)) {
|
||||
DRM_ERROR("Failed to allocate from CMA:\n");
|
||||
vc4_bo_stats_dump(vc4);
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -259,8 +259,8 @@ int vc4_dumb_create(struct drm_file *file_priv,
|
|||
args->size = args->pitch * args->height;
|
||||
|
||||
bo = vc4_bo_create(dev, args->size, false);
|
||||
if (!bo)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(bo))
|
||||
return PTR_ERR(bo);
|
||||
|
||||
ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
|
||||
drm_gem_object_unreference_unlocked(&bo->base.base);
|
||||
|
@ -443,8 +443,8 @@ int vc4_create_bo_ioctl(struct drm_device *dev, void *data,
|
|||
* get zeroed, and that might leak data between users.
|
||||
*/
|
||||
bo = vc4_bo_create(dev, args->size, false);
|
||||
if (!bo)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(bo))
|
||||
return PTR_ERR(bo);
|
||||
|
||||
ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
|
||||
drm_gem_object_unreference_unlocked(&bo->base.base);
|
||||
|
@ -496,8 +496,8 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,
|
|||
}
|
||||
|
||||
bo = vc4_bo_create(dev, args->size, true);
|
||||
if (!bo)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(bo))
|
||||
return PTR_ERR(bo);
|
||||
|
||||
ret = copy_from_user(bo->base.vaddr,
|
||||
(void __user *)(uintptr_t)args->data,
|
||||
|
|
|
@ -91,8 +91,12 @@ struct vc4_dev {
|
|||
struct vc4_bo *overflow_mem;
|
||||
struct work_struct overflow_mem_work;
|
||||
|
||||
int power_refcount;
|
||||
|
||||
/* Mutex controlling the power refcount. */
|
||||
struct mutex power_lock;
|
||||
|
||||
struct {
|
||||
uint32_t last_ct0ca, last_ct1ca;
|
||||
struct timer_list timer;
|
||||
struct work_struct reset_work;
|
||||
} hangcheck;
|
||||
|
@ -142,6 +146,7 @@ struct vc4_seqno_cb {
|
|||
};
|
||||
|
||||
struct vc4_v3d {
|
||||
struct vc4_dev *vc4;
|
||||
struct platform_device *pdev;
|
||||
void __iomem *regs;
|
||||
};
|
||||
|
@ -192,6 +197,11 @@ struct vc4_exec_info {
|
|||
/* Sequence number for this bin/render job. */
|
||||
uint64_t seqno;
|
||||
|
||||
/* Last current addresses the hardware was processing when the
|
||||
* hangcheck timer checked on us.
|
||||
*/
|
||||
uint32_t last_ct0ca, last_ct1ca;
|
||||
|
||||
/* Kernel-space copy of the ioctl arguments */
|
||||
struct drm_vc4_submit_cl *args;
|
||||
|
||||
|
@ -434,7 +444,6 @@ void vc4_plane_async_set_fb(struct drm_plane *plane,
|
|||
extern struct platform_driver vc4_v3d_driver;
|
||||
int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused);
|
||||
int vc4_v3d_debugfs_regs(struct seq_file *m, void *unused);
|
||||
int vc4_v3d_set_power(struct vc4_dev *vc4, bool on);
|
||||
|
||||
/* vc4_validate.c */
|
||||
int
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
|
@ -228,8 +229,16 @@ vc4_reset(struct drm_device *dev)
|
|||
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
||||
|
||||
DRM_INFO("Resetting GPU.\n");
|
||||
vc4_v3d_set_power(vc4, false);
|
||||
vc4_v3d_set_power(vc4, true);
|
||||
|
||||
mutex_lock(&vc4->power_lock);
|
||||
if (vc4->power_refcount) {
|
||||
/* Power the device off and back on the by dropping the
|
||||
* reference on runtime PM.
|
||||
*/
|
||||
pm_runtime_put_sync_suspend(&vc4->v3d->pdev->dev);
|
||||
pm_runtime_get_sync(&vc4->v3d->pdev->dev);
|
||||
}
|
||||
mutex_unlock(&vc4->power_lock);
|
||||
|
||||
vc4_irq_reset(dev);
|
||||
|
||||
|
@ -257,10 +266,17 @@ vc4_hangcheck_elapsed(unsigned long data)
|
|||
struct drm_device *dev = (struct drm_device *)data;
|
||||
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
||||
uint32_t ct0ca, ct1ca;
|
||||
unsigned long irqflags;
|
||||
struct vc4_exec_info *exec;
|
||||
|
||||
spin_lock_irqsave(&vc4->job_lock, irqflags);
|
||||
exec = vc4_first_job(vc4);
|
||||
|
||||
/* If idle, we can stop watching for hangs. */
|
||||
if (list_empty(&vc4->job_list))
|
||||
if (!exec) {
|
||||
spin_unlock_irqrestore(&vc4->job_lock, irqflags);
|
||||
return;
|
||||
}
|
||||
|
||||
ct0ca = V3D_READ(V3D_CTNCA(0));
|
||||
ct1ca = V3D_READ(V3D_CTNCA(1));
|
||||
|
@ -268,14 +284,16 @@ vc4_hangcheck_elapsed(unsigned long data)
|
|||
/* If we've made any progress in execution, rearm the timer
|
||||
* and wait.
|
||||
*/
|
||||
if (ct0ca != vc4->hangcheck.last_ct0ca ||
|
||||
ct1ca != vc4->hangcheck.last_ct1ca) {
|
||||
vc4->hangcheck.last_ct0ca = ct0ca;
|
||||
vc4->hangcheck.last_ct1ca = ct1ca;
|
||||
if (ct0ca != exec->last_ct0ca || ct1ca != exec->last_ct1ca) {
|
||||
exec->last_ct0ca = ct0ca;
|
||||
exec->last_ct1ca = ct1ca;
|
||||
spin_unlock_irqrestore(&vc4->job_lock, irqflags);
|
||||
vc4_queue_hangcheck(dev);
|
||||
return;
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&vc4->job_lock, irqflags);
|
||||
|
||||
/* We've gone too long with no progress, reset. This has to
|
||||
* be done from a work struct, since resetting can sleep and
|
||||
* this timer hook isn't allowed to.
|
||||
|
@ -340,12 +358,7 @@ vc4_wait_for_seqno(struct drm_device *dev, uint64_t seqno, uint64_t timeout_ns,
|
|||
finish_wait(&vc4->job_wait_queue, &wait);
|
||||
trace_vc4_wait_for_seqno_end(dev, seqno);
|
||||
|
||||
if (ret && ret != -ERESTARTSYS) {
|
||||
DRM_ERROR("timeout waiting for render thread idle\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -578,9 +591,9 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec)
|
|||
}
|
||||
|
||||
bo = vc4_bo_create(dev, exec_size, true);
|
||||
if (!bo) {
|
||||
if (IS_ERR(bo)) {
|
||||
DRM_ERROR("Couldn't allocate BO for binning\n");
|
||||
ret = -ENOMEM;
|
||||
ret = PTR_ERR(bo);
|
||||
goto fail;
|
||||
}
|
||||
exec->exec_bo = &bo->base;
|
||||
|
@ -617,6 +630,7 @@ fail:
|
|||
static void
|
||||
vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
|
||||
{
|
||||
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
||||
unsigned i;
|
||||
|
||||
/* Need the struct lock for drm_gem_object_unreference(). */
|
||||
|
@ -635,6 +649,11 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
|
|||
}
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
|
||||
mutex_lock(&vc4->power_lock);
|
||||
if (--vc4->power_refcount == 0)
|
||||
pm_runtime_put(&vc4->v3d->pdev->dev);
|
||||
mutex_unlock(&vc4->power_lock);
|
||||
|
||||
kfree(exec);
|
||||
}
|
||||
|
||||
|
@ -746,6 +765,9 @@ vc4_wait_bo_ioctl(struct drm_device *dev, void *data,
|
|||
struct drm_gem_object *gem_obj;
|
||||
struct vc4_bo *bo;
|
||||
|
||||
if (args->pad != 0)
|
||||
return -EINVAL;
|
||||
|
||||
gem_obj = drm_gem_object_lookup(dev, file_priv, args->handle);
|
||||
if (!gem_obj) {
|
||||
DRM_ERROR("Failed to look up GEM BO %d\n", args->handle);
|
||||
|
@ -772,7 +794,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
|
|||
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
||||
struct drm_vc4_submit_cl *args = data;
|
||||
struct vc4_exec_info *exec;
|
||||
int ret;
|
||||
int ret = 0;
|
||||
|
||||
if ((args->flags & ~VC4_SUBMIT_CL_USE_CLEAR_COLOR) != 0) {
|
||||
DRM_ERROR("Unknown flags: 0x%02x\n", args->flags);
|
||||
|
@ -785,6 +807,15 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
mutex_lock(&vc4->power_lock);
|
||||
if (vc4->power_refcount++ == 0)
|
||||
ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev);
|
||||
mutex_unlock(&vc4->power_lock);
|
||||
if (ret < 0) {
|
||||
kfree(exec);
|
||||
return ret;
|
||||
}
|
||||
|
||||
exec->args = args;
|
||||
INIT_LIST_HEAD(&exec->unref_list);
|
||||
|
||||
|
@ -839,6 +870,8 @@ vc4_gem_init(struct drm_device *dev)
|
|||
(unsigned long)dev);
|
||||
|
||||
INIT_WORK(&vc4->job_done_work, vc4_job_done_work);
|
||||
|
||||
mutex_init(&vc4->power_lock);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -57,7 +57,7 @@ vc4_overflow_mem_work(struct work_struct *work)
|
|||
struct vc4_bo *bo;
|
||||
|
||||
bo = vc4_bo_create(dev, 256 * 1024, true);
|
||||
if (!bo) {
|
||||
if (IS_ERR(bo)) {
|
||||
DRM_ERROR("Couldn't allocate binner overflow mem\n");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -316,20 +316,11 @@ static int vc4_create_rcl_bo(struct drm_device *dev, struct vc4_exec_info *exec,
|
|||
size += xtiles * ytiles * loop_body_size;
|
||||
|
||||
setup->rcl = &vc4_bo_create(dev, size, true)->base;
|
||||
if (!setup->rcl)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(setup->rcl))
|
||||
return PTR_ERR(setup->rcl);
|
||||
list_add_tail(&to_vc4_bo(&setup->rcl->base)->unref_head,
|
||||
&exec->unref_list);
|
||||
|
||||
rcl_u8(setup, VC4_PACKET_TILE_RENDERING_MODE_CONFIG);
|
||||
rcl_u32(setup,
|
||||
(setup->color_write ? (setup->color_write->paddr +
|
||||
args->color_write.offset) :
|
||||
0));
|
||||
rcl_u16(setup, args->width);
|
||||
rcl_u16(setup, args->height);
|
||||
rcl_u16(setup, args->color_write.bits);
|
||||
|
||||
/* The tile buffer gets cleared when the previous tile is stored. If
|
||||
* the clear values changed between frames, then the tile buffer has
|
||||
* stale clear values in it, so we have to do a store in None mode (no
|
||||
|
@ -349,6 +340,15 @@ static int vc4_create_rcl_bo(struct drm_device *dev, struct vc4_exec_info *exec,
|
|||
rcl_u32(setup, 0); /* no address, since we're in None mode */
|
||||
}
|
||||
|
||||
rcl_u8(setup, VC4_PACKET_TILE_RENDERING_MODE_CONFIG);
|
||||
rcl_u32(setup,
|
||||
(setup->color_write ? (setup->color_write->paddr +
|
||||
args->color_write.offset) :
|
||||
0));
|
||||
rcl_u16(setup, args->width);
|
||||
rcl_u16(setup, args->height);
|
||||
rcl_u16(setup, args->color_write.bits);
|
||||
|
||||
for (y = min_y_tile; y <= max_y_tile; y++) {
|
||||
for (x = min_x_tile; x <= max_x_tile; x++) {
|
||||
bool first = (x == min_x_tile && y == min_y_tile);
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
*/
|
||||
|
||||
#include "linux/component.h"
|
||||
#include "linux/pm_runtime.h"
|
||||
#include "vc4_drv.h"
|
||||
#include "vc4_regs.h"
|
||||
|
||||
|
@ -144,18 +145,6 @@ int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused)
|
|||
}
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
|
||||
int
|
||||
vc4_v3d_set_power(struct vc4_dev *vc4, bool on)
|
||||
{
|
||||
/* XXX: This interface is needed for GPU reset, and the way to
|
||||
* do it is to turn our power domain off and back on. We
|
||||
* can't just reset from within the driver, because the reset
|
||||
* bits are in the power domain's register area, and get set
|
||||
* during the poweron process.
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vc4_v3d_init_hw(struct drm_device *dev)
|
||||
{
|
||||
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
||||
|
@ -167,6 +156,29 @@ static void vc4_v3d_init_hw(struct drm_device *dev)
|
|||
V3D_WRITE(V3D_VPMBASE, 0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int vc4_v3d_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct vc4_v3d *v3d = dev_get_drvdata(dev);
|
||||
struct vc4_dev *vc4 = v3d->vc4;
|
||||
|
||||
vc4_irq_uninstall(vc4->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vc4_v3d_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct vc4_v3d *v3d = dev_get_drvdata(dev);
|
||||
struct vc4_dev *vc4 = v3d->vc4;
|
||||
|
||||
vc4_v3d_init_hw(vc4->dev);
|
||||
vc4_irq_postinstall(vc4->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
|
@ -179,6 +191,8 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
|
|||
if (!v3d)
|
||||
return -ENOMEM;
|
||||
|
||||
dev_set_drvdata(dev, v3d);
|
||||
|
||||
v3d->pdev = pdev;
|
||||
|
||||
v3d->regs = vc4_ioremap_regs(pdev, 0);
|
||||
|
@ -186,6 +200,7 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
|
|||
return PTR_ERR(v3d->regs);
|
||||
|
||||
vc4->v3d = v3d;
|
||||
v3d->vc4 = vc4;
|
||||
|
||||
if (V3D_READ(V3D_IDENT0) != V3D_EXPECTED_IDENT0) {
|
||||
DRM_ERROR("V3D_IDENT0 read 0x%08x instead of 0x%08x\n",
|
||||
|
@ -207,6 +222,8 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
|
|||
return ret;
|
||||
}
|
||||
|
||||
pm_runtime_enable(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -216,6 +233,8 @@ static void vc4_v3d_unbind(struct device *dev, struct device *master,
|
|||
struct drm_device *drm = dev_get_drvdata(master);
|
||||
struct vc4_dev *vc4 = to_vc4_dev(drm);
|
||||
|
||||
pm_runtime_disable(dev);
|
||||
|
||||
drm_irq_uninstall(drm);
|
||||
|
||||
/* Disable the binner's overflow memory address, so the next
|
||||
|
@ -228,6 +247,10 @@ static void vc4_v3d_unbind(struct device *dev, struct device *master,
|
|||
vc4->v3d = NULL;
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops vc4_v3d_pm_ops = {
|
||||
SET_RUNTIME_PM_OPS(vc4_v3d_runtime_suspend, vc4_v3d_runtime_resume, NULL)
|
||||
};
|
||||
|
||||
static const struct component_ops vc4_v3d_ops = {
|
||||
.bind = vc4_v3d_bind,
|
||||
.unbind = vc4_v3d_unbind,
|
||||
|
@ -255,5 +278,6 @@ struct platform_driver vc4_v3d_driver = {
|
|||
.driver = {
|
||||
.name = "vc4_v3d",
|
||||
.of_match_table = vc4_v3d_dt_match,
|
||||
.pm = &vc4_v3d_pm_ops,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -401,8 +401,8 @@ validate_tile_binning_config(VALIDATE_ARGS)
|
|||
tile_bo = vc4_bo_create(dev, exec->tile_alloc_offset + tile_alloc_size,
|
||||
true);
|
||||
exec->tile_bo = &tile_bo->base;
|
||||
if (!exec->tile_bo)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(exec->tile_bo))
|
||||
return PTR_ERR(exec->tile_bo);
|
||||
list_add_tail(&tile_bo->unref_head, &exec->unref_list);
|
||||
|
||||
/* tile alloc address. */
|
||||
|
|
|
@ -1166,6 +1166,7 @@ struct drm_connector {
|
|||
struct drm_mode_object base;
|
||||
|
||||
char *name;
|
||||
int connector_id;
|
||||
int connector_type;
|
||||
int connector_type_id;
|
||||
bool interlace_allowed;
|
||||
|
@ -2047,6 +2048,7 @@ struct drm_mode_config {
|
|||
struct list_head fb_list;
|
||||
|
||||
int num_connector;
|
||||
struct ida connector_ida;
|
||||
struct list_head connector_list;
|
||||
int num_encoder;
|
||||
struct list_head encoder_list;
|
||||
|
@ -2200,7 +2202,11 @@ int drm_connector_register(struct drm_connector *connector);
|
|||
void drm_connector_unregister(struct drm_connector *connector);
|
||||
|
||||
extern void drm_connector_cleanup(struct drm_connector *connector);
|
||||
extern unsigned int drm_connector_index(struct drm_connector *connector);
|
||||
static inline unsigned drm_connector_index(struct drm_connector *connector)
|
||||
{
|
||||
return connector->connector_id;
|
||||
}
|
||||
|
||||
/* helper to unplug all connectors from sysfs for device */
|
||||
extern void drm_connector_unplug_all(struct drm_device *dev);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче