summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Glisse <glisse@freedesktop.org>2008-04-06 19:01:31 +0200
committerJerome Glisse <glisse@freedesktop.org>2008-04-06 19:01:31 +0200
commit91bfd69745dbb62dc28c57f940ff44da867e96ea (patch)
tree29d69e8c520417029fc39abd0123f4564ba8abe6
parentdfc8d2b2fe70a84de53f72f0eeff911c58469089 (diff)
radeon_ms: check for NULL fb
-rw-r--r--shared-core/radeon_ms_crtc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/shared-core/radeon_ms_crtc.c b/shared-core/radeon_ms_crtc.c
index 63bd4a0a..83dd0777 100644
--- a/shared-core/radeon_ms_crtc.c
+++ b/shared-core/radeon_ms_crtc.c
@@ -537,6 +537,10 @@ static void radeon_ms_crtc1_mode_set(struct drm_crtc *crtc,
adjusted_mode->hsync_end, adjusted_mode->htotal,
adjusted_mode->vdisplay, adjusted_mode->vsync_start,
adjusted_mode->vsync_end, adjusted_mode->vtotal, adjusted_mode->type);
+ if (crtc->fb == NULL) {
+ DRM_INFO("[radeon_ms] no FB bound\n");
+ return;
+ }
/* only support RGB555,RGB565,ARGB8888 should satisfy all users */
switch (crtc->fb->bits_per_pixel) {
@@ -551,7 +555,7 @@ static void radeon_ms_crtc1_mode_set(struct drm_crtc *crtc,
format = 6;
break;
default:
- DRM_ERROR("Unknown color depth\n");
+ DRM_ERROR("Unknown color depth %d\n", crtc->fb->bits_per_pixel);
return;
}
radeon_pll1_compute(crtc, adjusted_mode);
@@ -665,6 +669,7 @@ static void radeon_ms_crtc_gamma_set(struct drm_crtc *crtc, u16 r,
if (regno >= 256) {
return;
}
+ DRM_INFO("[radeon_ms] gamma[%d]=(%d, %d, %d)\n", regno, r, g, b);
switch(radeon_ms_crtc->crtc) {
case 1:
state->dac_cntl2 &= ~DAC_CNTL2__PALETTE_ACCESS_CNTL;