diff options
| author | Alan Cox | 2011-07-05 16:44:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-05 17:20:44 +0200 |
| commit | 93b68b67739d40346756fe9b7423f084a1b22bce (patch) | |
| tree | 333cd6f2505a5f476db9040b5824a13126edcb52 /drivers/staging/gma500/psb_intel_display.c | |
| parent | gma500: move the power header (diff) | |
| download | kernel-qcow2-linux-93b68b67739d40346756fe9b7423f084a1b22bce.tar.gz kernel-qcow2-linux-93b68b67739d40346756fe9b7423f084a1b22bce.tar.xz kernel-qcow2-linux-93b68b67739d40346756fe9b7423f084a1b22bce.zip | |
gma500: begin adding CDV specific code
A lot of the intel_display stuff is duplicated, but we will add it first,
clean it up and then investigate the best way to merge stuff.
This first block integrates the various basic chunks of the CDV display setup.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_intel_display.c')
| -rw-r--r-- | drivers/staging/gma500/psb_intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 883880d5185f..65426682c44c 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -1039,14 +1039,13 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc, } /* unpin the old bo */ - if (psb_intel_crtc->cursor_obj && psb_intel_crtc->cursor_obj != obj) { + if (psb_intel_crtc->cursor_obj) { gt = container_of(psb_intel_crtc->cursor_obj, struct gtt_range, gem); psb_gtt_unpin(gt); drm_gem_object_unreference(psb_intel_crtc->cursor_obj); psb_intel_crtc->cursor_obj = obj; } - return 0; } |