Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.8-2020-05-12: amdgpu: - Misc cleanups - RAS fixes - Expose FP16 for modesetting - DP 1.4 compliance test fixes - Clockgating fixes - MAINTAINERS update - Soft recovery for gfx10 - Runtime PM cleanups - PSP code cleanups amdkfd: - Track GPU memory utilization per process - Report PCI domain in topology Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexdeucher@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200512213703.4039-1-alexander.deucher@amd.com
This commit is contained in:
@@ -1211,8 +1211,7 @@ static int atom_execute_table_locked(struct atom_context *ctx, int index, uint32
|
||||
SDEBUG("<<\n");
|
||||
|
||||
free:
|
||||
if (ws)
|
||||
kfree(ectx.ws);
|
||||
kfree(ectx.ws);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@@ -828,7 +828,7 @@ int radeon_enable_vblank_kms(struct drm_crtc *crtc)
|
||||
unsigned long irqflags;
|
||||
int r;
|
||||
|
||||
if (pipe < 0 || pipe >= rdev->num_crtc) {
|
||||
if (pipe >= rdev->num_crtc) {
|
||||
DRM_ERROR("Invalid crtc %d\n", pipe);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -854,7 +854,7 @@ void radeon_disable_vblank_kms(struct drm_crtc *crtc)
|
||||
struct radeon_device *rdev = dev->dev_private;
|
||||
unsigned long irqflags;
|
||||
|
||||
if (pipe < 0 || pipe >= rdev->num_crtc) {
|
||||
if (pipe >= rdev->num_crtc) {
|
||||
DRM_ERROR("Invalid crtc %d\n", pipe);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user