diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-03 10:48:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-03 11:03:24 +1000 |
| commit | 00d6a9b6be5885ad38234cd171f6fb18a87faa7c (patch) | |
| tree | 4a374cad934066f4549cf80006c0ac596a30cb46 /drivers/gpu/drm/radeon/radeon_kms.c | |
| parent | 8b62c8c6df08ca567c78afa51aa7bbc554cede06 (diff) | |
| parent | f5475cc43c899e33098d4db44b7c5e710f16589d (diff) | |
| download | linux-00d6a9b6be5885ad38234cd171f6fb18a87faa7c.tar.gz | |
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
A few more small fixes for 3.18.
* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
drm/radeon: Ignore RADEON_GEM_GTT_WC on 32-bit x86
drm/radeon: sync all BOs involved in a CS v2
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 8309b11e674d..03586763ee86 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -795,6 +795,8 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, /* Get associated drm_crtc: */ drmcrtc = &rdev->mode_info.crtcs[crtc]->base; + if (!drmcrtc) + return -EINVAL; /* Helper routine in DRM core does all the work: */ return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error, |