Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be53bfdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 

Pull drm main changes from Dave Airlie:
 "This is the main drm pull request, I'm probably going to send two more
  smaller ones, will explain below.

  This contains a patch that is also in the fbdev tree, but it should be
  the same patch, it added an API for hot unplugging framebuffer
  devices, and I need that API for a new driver.

  It also contains some changes to the i2c tree which Jean has acked,
  and one change to moorestown platform stuff in x86.

  Highlights:
   - new drivers: UDL driver for USB displaylink devices, kms only,
     should support correct hotplug operations.
   - core: i2c speedups + better hotplug support, EDID overriding via
     firmware interface - allows user to load a firmware for a broken
     monitor/kvm from userspace, it even has documentation for it.
   - exynos: new HDMI audio + hdmi 1.4 + virtual output driver
   - gma500: code cleanup
   - radeon: cleanups, CS optimisations, streamout support and pageflip
     fix
   - nouveau: NVD9 displayport support + more reclocking work
   - i915: re-enabling GMBUS, finish gpu patch (might help hibernation
     who knows), missed irq fixes, stencil tiling fixes, interlaced
     support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,
     semaphore fixes

  As well as the usual bunch of cleanups and fixes all over the place.

  I've got two things I'd like to merge a bit later:

   a) AMD support for all their new radeonhd 7000 series GPU and APUs.
      AMD dropped this a bit late due to insane internal review
      processes, (please AMD just follow Intel and let open source guys
      ship stuff early) however I don't want to penalise people who own
      this hardware (since its been on sale for 3-4 months and GPU hw
      doesn't exactly have a lifetime in years) and consign them to
      using closed drivers for longer than necessary.  The changes are
      well contained and just plug into the driver new gpu functionality
      so they should be fairly regression proof.  I just want to give
      them a bit of a run on the hw AMD kindly sent me.

   b) drm prime/dma-buf interface code.  This is just infrastructure
      code to expose the dma-buf stuff to drm drivers and to userspace.
      I'm not planning on pushing any driver support in this cycle
      (except maybe exynos), but I'd like to get the infrastructure code
      in so for the next cycle I can start getting the driver support
      into the individual drivers.  We have started driver support for
      i915, nouveau and udl along with I think exynos and omap in
      staging.  However this code relies on the dma-buf tree being
      pulled into your tree first since it needs the latest interfaces
      from that tree.  I'll push to get that tree sent asap.

  (oh and any warnings you see in i915 are gcc's fault from what anyone
  can see)."

Fix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new
msic_thermal_platform_data() thermal function being added next to the
tc35876x_platform_data() i2c device function..

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (326 commits)
  drm/i915: use DDC_ADDR instead of hard-coding it
  drm/radeon: use DDC_ADDR instead of hard-coding it
  drm: remove unneeded redefinition of DDC_ADDR
  drm/exynos: added virtual display driver.
  drm: allow loading an EDID as firmware to override broken monitor
  drm/exynos: enable hdmi audio feature
  drm/exynos: add default pixel format for plane
  drm/exynos: cleanup exynos_hdmi.h
  drm/exynos: add is_local member in exynos_drm_subdrv struct
  drm/exynos: add subdrv open/close functions
  drm/exynos: remove module of exynos drm subdrv
  drm/exynos: release pending pageflip events when closed
  drm/exynos: added new funtion to get/put dma address.
  drm/exynos: update gem and buffer framework.
  drm/exynos: added mode_fixup feature and code clean.
  drm/exynos: add HDMI version 1.4 support
  drm/exynos: remove exynos_mixer.h
  gma500: Fix mmap frambuffer
  drm/radeon: Drop radeon_gem_object_(un)pin.
  drm/radeon: Restrict offset for legacy display engine.
  ...
parents b2094ef8 5466c7b1

Documentation/EDID/1024x768.S

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

   1024x768.S: EDID data set for standard 1024x768 60 Hz monitor



   Copyright (C) 2011 Carsten Emde <C.Emde@osadl.org>



   This program is free software; you can redistribute it and/or

   modify it under the terms of the GNU General Public License

   as published by the Free Software Foundation; either version 2

   of the License, or (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.

*/



/* EDID */

#define VERSION 1

#define REVISION 3



/* Display */

#define CLOCK 65000 /* kHz */

#define XPIX 1024

#define YPIX 768

#define XY_RATIO XY_RATIO_4_3

#define XBLANK 320

#define YBLANK 38

#define XOFFSET 8

#define XPULSE 144

#define YOFFSET (63+3)

#define YPULSE (63+6)

#define DPI 72

#define VFREQ 60 /* Hz */

#define TIMING_NAME "Linux XGA"

#define ESTABLISHED_TIMINGS_BITS 0x08 /* Bit 3 -> 1024x768 @60 Hz */

#define HSYNC_POL 0

#define VSYNC_POL 0

#define CRC 0x55



#include "edid.S"

Documentation/EDID/1280x1024.S

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

   1280x1024.S: EDID data set for standard 1280x1024 60 Hz monitor



   Copyright (C) 2011 Carsten Emde <C.Emde@osadl.org>



   This program is free software; you can redistribute it and/or

   modify it under the terms of the GNU General Public License

   as published by the Free Software Foundation; either version 2

   of the License, or (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.

*/



/* EDID */

#define VERSION 1

#define REVISION 3



/* Display */

#define CLOCK 108000 /* kHz */

#define XPIX 1280

#define YPIX 1024

#define XY_RATIO XY_RATIO_5_4

#define XBLANK 408

#define YBLANK 42

#define XOFFSET 48

#define XPULSE 112

#define YOFFSET (63+1)

#define YPULSE (63+3)

#define DPI 72

#define VFREQ 60 /* Hz */

#define TIMING_NAME "Linux SXGA"

#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */

#define HSYNC_POL 1

#define VSYNC_POL 1

#define CRC 0xa0



#include "edid.S"

Documentation/EDID/1680x1050.S

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

   1680x1050.S: EDID data set for standard 1680x1050 60 Hz monitor



   Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>



   This program is free software; you can redistribute it and/or

   modify it under the terms of the GNU General Public License

   as published by the Free Software Foundation; either version 2

   of the License, or (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.

*/



/* EDID */

#define VERSION 1

#define REVISION 3



/* Display */

#define CLOCK 146250 /* kHz */

#define XPIX 1680

#define YPIX 1050

#define XY_RATIO XY_RATIO_16_10

#define XBLANK 560

#define YBLANK 39

#define XOFFSET 104

#define XPULSE 176

#define YOFFSET (63+3)

#define YPULSE (63+6)

#define DPI 96

#define VFREQ 60 /* Hz */

#define TIMING_NAME "Linux WSXGA"

#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */

#define HSYNC_POL 1

#define VSYNC_POL 1

#define CRC 0x26



#include "edid.S"

Documentation/EDID/1920x1080.S

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

   1920x1080.S: EDID data set for standard 1920x1080 60 Hz monitor



   Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>



   This program is free software; you can redistribute it and/or

   modify it under the terms of the GNU General Public License

   as published by the Free Software Foundation; either version 2

   of the License, or (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.

*/



/* EDID */

#define VERSION 1

#define REVISION 3



/* Display */

#define CLOCK 148500 /* kHz */

#define XPIX 1920

#define YPIX 1080

#define XY_RATIO XY_RATIO_16_9

#define XBLANK 280

#define YBLANK 45

#define XOFFSET 88

#define XPULSE 44

#define YOFFSET (63+4)

#define YPULSE (63+5)

#define DPI 96

#define VFREQ 60 /* Hz */

#define TIMING_NAME "Linux FHD"

#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */

#define HSYNC_POL 1

#define VSYNC_POL 1

#define CRC 0x05



#include "edid.S"

Documentation/EDID/HOWTO.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
In the good old days when graphics parameters were configured explicitly

in a file called xorg.conf, even broken hardware could be managed.



Today, with the advent of Kernel Mode Setting, a graphics board is

either correctly working because all components follow the standards -

or the computer is unusable, because the screen remains dark after

booting or it displays the wrong area. Cases when this happens are:

- The graphics board does not recognize the monitor.

- The graphics board is unable to detect any EDID data.

- The graphics board incorrectly forwards EDID data to the driver.

- The monitor sends no or bogus EDID data.

- A KVM sends its own EDID data instead of querying the connected monitor.

Adding the kernel parameter "nomodeset" helps in most cases, but causes

restrictions later on.



As a remedy for such situations, the kernel configuration item

CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an

individually prepared or corrected EDID data set in the /lib/firmware

directory from where it is loaded via the firmware interface. The code

(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for

commonly used screen resolutions (1024x768, 1280x1024, 1680x1050,

1920x1080) as binary blobs, but the kernel source tree does not contain

code to create these data. In order to elucidate the origin of the

built-in binary EDID blobs and to facilitate the creation of individual

data for a specific misbehaving monitor, commented sources and a

Makefile environment are given here.



To create binary EDID and C source code files from the existing data

material, simply type "make".



If you want to create your own EDID file, copy the file 1024x768.S and

replace the settings with your own data. The CRC value in the last line

  #define CRC 0x55

is a bit tricky. After a first version of the binary data set is

created, it must be be checked with the "edid-decode" utility which will

most probably complain about a wrong CRC. Fortunately, the utility also

displays the correct CRC which must then be inserted into the source

file. After the make procedure is repeated, the EDID data set is ready

to be used.