← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xserver-xorg-video-intel/karmic-proposed

« back to all changes in this revision

Viewing changes to uxa/uxa.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Tormod Volden
  • Date: 2009-10-07 20:09:54 UTC
  • mfrom: (1.5.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091007200954-y15k4c4uq5bq1u19
Tags: 2:2.9.0-1ubuntu1
https://launchpad.net/bugs/410455
https://launchpad.net/bugs/397617
[Tormod Volden]
* Merge with Debian. Remaining Ubuntu changes:
  + debian/control: Add lpia architecture
* Drop patches now included upstream:
  + 100_8xx_perf_pict_a8.patch
  + 101_reload_cursors.patch
  + 102_dont_destroy_bufmgr_at_closescreen_time.patch
* Ubuntu bugs fixed in this release:
  + Calculate the DVO relative offset in LVDS data entry to get the DVO
    timing.  Fixes black screen at boot on i855 due to not finding LVDS
    modes.
    (LP: #410455)
  + Fix brightness by enabling BACKLIGHT property for KMS.
    (LP: #397617)

Show diffs side-by-side

added added

removed removed

Lines of Context:
uxa/uxa.c
244
244
        /* We can't inline stipple handling like we do for GCTile because it sets
245
245
         * fbgc privates.
246
246
         */
247
 
        uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW);
248
 
        fbValidateGC (pGC, changes, pDrawable);
249
 
        uxa_finish_access(&pGC->stipple->drawable);
 
247
        if (uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW)) {
 
248
            fbValidateGC (pGC, changes, pDrawable);
 
249
            uxa_finish_access(&pGC->stipple->drawable);
 
250
        }
250
251
    } else {
251
252
        fbValidateGC (pGC, changes, pDrawable);
252
253
    }