dri-devel June 2015

dri-devel@lists.freedesktop.org

188 participants
1140 discussions

[PATCH] Add device enumeration interface (v3)
by Jammy Zhou 04 Jun '15

04 Jun '15

From: frank <frank.min(a)amd.com> v3: switch to udev/sysfs for the enumeration Signed-off-by: Frank Min <frank.min(a)amd.com> Reviewed-by: Christian König <christian.koenig(a)amd.com> Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou(a)amd.com> --- Makefile.am | 7 +++-- xf86drm.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xf86drm.h | 19 +++++++++++ 3 files changed, 127 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 13df80c..ffd334a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,12 +95,15 @@ SUBDIRS = \ libdrm_la_LTLIBRARIES = libdrm.la libdrm_ladir = $(libdir) libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined -libdrm_la_LIBADD = @CLOCK_LIB@ +libdrm_la_LIBADD = \ + @CLOCK_LIB@ \ + @LIBUDEV_LIBS@ libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm AM_CFLAGS = \ $(WARN_CFLAGS) \ - $(VALGRIND_CFLAGS) + $(VALGRIND_CFLAGS) \ + $(LIBUDEV_CFLAGS) libdrm_la_SOURCES = $(LIBDRM_FILES) diff --git a/xf86drm.c b/xf86drm.c index f7c45f8..d2704de 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -63,6 +63,7 @@ #include "xf86drm.h" #include "libdrm_macros.h" +#include "libudev.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #define DRM_MAJOR 145 @@ -2817,3 +2818,105 @@ char *drmGetRenderDeviceNameFromFd(int fd) { return drmGetMinorNameForFD(fd, DRM_NODE_RENDER); } + +/** +* Enumerate the GPU devices on the system +* +* \param devs device array set to return the device information +* (if NULL, the number of device is returned) +* \param vendor the vendor ID for GPU devices to list +* (optional, if not specified, all GPU devices are returned) +* +* \return the number of GPU devices +*/ +int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId) +{ + struct udev *udev = NULL; + struct udev_enumerate *udev_enumerate; + struct udev_list_entry *list_entry; + struct udev_device *device; + int drmDevCount = 0; + int vendor = 0; + int devid = 0; + int devclass = 0; + int subvendor = 0; + int subdevid = 0; + int revid = 0xff; + int domain = 0; + int bus = 0; + int dev = 0; + int func = 0; + char config[64] = {0}; + char node[128] = {'\0'}; + char slot[] = "0000:00:00.0"; + char *info = NULL; + int minor = 0xff; + int fd = 0; + int ret = 0; + + udev = udev_new(); + if (udev == NULL) { + fprintf(stderr, "no context\n"); + return -EINVAL; + } + udev_enumerate = udev_enumerate_new(udev); + if (udev_enumerate == NULL) + return -EINVAL; + udev_enumerate_add_match_subsystem(udev_enumerate, "drm"); + udev_enumerate_add_match_property(udev_enumerate, "DEVTYPE", "drm_minor"); + + udev_enumerate_scan_devices(udev_enumerate); + + udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) { + device = udev_device_new_from_syspath(udev_enumerate_get_udev(udev_enumerate), + udev_list_entry_get_name(list_entry)); + if (device != NULL) { + info = udev_device_get_property_value(device, "MINOR"); + if (!strcmp(info, "0")) { + strcpy(node, udev_device_get_syspath(device)); + info = strstr(node, "/drm"); + strncpy(slot, info - strlen(slot), strlen(slot)); + if (sscanf(slot, "%4x:%2x:%2x.%1x", &domain, &bus, &dev, &func) != 4) { + domain = 0; + bus = 0; + dev = 0; + func = 0; + } + strcpy(node + strlen(node), "/device/config"); + + fd = open(node, O_RDONLY); + if (fd >= 0) { + ret = read(fd, config, 64); + if (ret == 64) { + vendor = config[0] + (config[1] << 8); + devid = config[2] + (config[3] << 8); + revid = config[8]; + devclass = config[9] + (config[10] << 8) + (config[11] << 16); + subdevid = config[44] + (config[45] << 8); + } + close(fd); + } + + if((vendorId == 0) || (vendorId == vendor)) { + if(devSet != NULL) { + devSet[drmDevCount].domain = domain; + devSet[drmDevCount].bus = bus; + devSet[drmDevCount].dev = dev; + devSet[drmDevCount].func = func; + devSet[drmDevCount].vendor_id = vendor; + devSet[drmDevCount].device_id = devid; + devSet[drmDevCount].subdevice_id = subdevid; + devSet[drmDevCount].subvendor_id = subvendor; + devSet[drmDevCount].revision_id = revid; + } + drmDevCount++; + } + } + } + udev_device_unref(device); + } + udev_enumerate_unref(udev_enumerate); + udev_unref(udev); + + return drmDevCount; +} diff --git a/xf86drm.h b/xf86drm.h index 40c55c9..2610934 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -342,6 +342,24 @@ typedef struct _drmSetVersion { int drm_dd_minor; } drmSetVersion, *drmSetVersionPtr; +/** + * Structure to a general pci gpu device + * + * \sa drmGetDevices() + * +*/ +typedef struct _drmPciDevice { + uint16_t domain; + uint8_t bus; + uint8_t dev; + uint8_t func; + uint16_t vendor_id; + uint16_t device_id; + uint16_t subvendor_id; + uint16_t subdevice_id; + uint8_t revision_id; +} drmPciDevice, *drmPciDevicePtr; + #define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ @@ -552,6 +570,7 @@ do { register unsigned int __old __asm("o0"); \ /* General user-level programmer's API: unprivileged */ extern int drmAvailable(void); extern int drmOpen(const char *name, const char *busid); +extern int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId); #define DRM_NODE_PRIMARY 0 #define DRM_NODE_CONTROL 1 -- 1.9.1

5 10

[pull] radeon drm-fixes-4.1
by Alex Deucher 04 Jun '15

04 Jun '15

Hi Dave, One more small r7xx audio regression fix for 4.1 The following changes since commit 1fe7142063517dfb17bfd3ada394e1dd7ee44ba7: Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2015-05-29 11:13:52 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-4.1 for you to fetch changes up to 091f0a70ffe2a1297d52fe32d6c6794d955e01e5: drm/radeon: use proper ACR regisiter for DCE3.2 (2015-06-01 23:16:22 -0400) ---------------------------------------------------------------- Alex Deucher (1): drm/radeon: use proper ACR regisiter for DCE3.2 drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

-next slippages
by Dave Airlie 03 Jun '15

03 Jun '15

Hey, so remember aim for rc5? Can we get a bit more on target shooting here, I don't think I've seen, exynos, msm or nouveau this cycle, and I've probably forgotten some of the others. though I know I'd prefer exynos atomic to land at all than hang on another cycle, Otherwise I know amdgpu is coming and virtgpu is here so I think that should be all I have. Dave.

1 0

[PATCH] drm/msm/mdp: Add support for more 32-bit RGB formats
by Stephane Viau 03 Jun '15

03 Jun '15

That will complete the lists of Alpha + RGB formats. Signed-off-by: Stephane Viau <sviau(a)codeaurora.org> --- drivers/gpu/drm/msm/mdp/mdp_format.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/msm/mdp/mdp_format.c b/drivers/gpu/drm/msm/mdp/mdp_format.c index f683433..7b0524d 100644 --- a/drivers/gpu/drm/msm/mdp/mdp_format.c +++ b/drivers/gpu/drm/msm/mdp/mdp_format.c @@ -96,6 +96,12 @@ static const struct mdp_format formats[] = { /* name a r g b e0 e1 e2 e3 alpha tight cpp cnt ... */ FMT(ARGB8888, 8, 8, 8, 8, 1, 0, 2, 3, true, true, 4, 4, MDP_PLANE_INTERLEAVED, CHROMA_RGB), + FMT(ABGR8888, 8, 8, 8, 8, 2, 0, 1, 3, true, true, 4, 4, + MDP_PLANE_INTERLEAVED, CHROMA_RGB), + FMT(RGBA8888, 8, 8, 8, 8, 3, 1, 0, 2, true, true, 4, 4, + MDP_PLANE_INTERLEAVED, CHROMA_RGB), + FMT(BGRA8888, 8, 8, 8, 8, 3, 2, 0, 1, true, true, 4, 4, + MDP_PLANE_INTERLEAVED, CHROMA_RGB), FMT(XRGB8888, 8, 8, 8, 8, 1, 0, 2, 3, false, true, 4, 4, MDP_PLANE_INTERLEAVED, CHROMA_RGB), FMT(RGB888, 0, 8, 8, 8, 1, 0, 2, 0, false, true, 3, 3, -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

1 0

[PULL] drm-amdkfd-fixes
by Oded Gabbay 03 Jun '15

03 Jun '15

Hi Dave, One minor fix for last -rc of 4.1. The fix moves the update of an attribute in topology to *after* it is actually initialized. Thanks, Oded The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) are available in the git repository at: git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-fixes-2015-06-03 for you to fetch changes up to 826f5de84ceb6f96306ce4081b75a0539d8edd00: drm/amdkfd: fix topology bug with capability attr. (2015-06-03 21:45:54 +0300) ---------------------------------------------------------------- Alexey Skidanov (1): drm/amdkfd: fix topology bug with capability attr. drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

intel_check_page_flip() - WARN_ON(!in_interrupt())
by Shuah Khan 03 Jun '15

03 Jun '15

I am seeing the following in the dmesg on 4.0.4 with rt patch [ 5.720319] ------------[ cut here ]------------ [ 5.720347] WARNING: CPU: 6 PID: 466 at drivers/gpu/drm/i915/intel_display.c:9748 intel_check_page_flip+0xaa/0xf0 [i915]() [ 5.720349] WARN_ON(!in_interrupt()) [ 5.720350] Modules linked in: [ 5.720376] binfmt_misc rfcomm bnep arc4 eeepc_wmi hid_generic asus_wmi sparse_keymap iwlmvm intel_powerclamp coretemp kvm_intel kvm mac80211 crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 lrw gf128mul dm_multipath glue_helper snd_hda_codec_hdmi scsi_dh ablk_helper cryptd microcode btusb iwlwifi bluetooth serio_raw cfg80211 i915 snd_hda_codec_realtek snd_hda_codec_generic lpc_ich snd_hda_intel snd_hda_controller snd_hda_codec snd_hwdep snd_pcm snd_seq_midi snd_seq_midi_event snd_rawmidi drm_kms_helper snd_seq drm video snd_seq_device mac_hid snd_timer snd mei_me wmi mei shpchp soundcore i2c_algo_bit usbhid hid parport_pc ppdev lp parport autofs4 btrfs xor raid6_pq psmouse dm_mirror r8169 ahci dm_region_hash libahci mii dm_log [ 5.720379] CPU: 6 PID: 466 Comm: irq/32-i915 Not tainted 4.0.4-rt1+ #8 [ 5.720380] Hardware name: System76, Inc. Wild Dog Performance/H87-PLUS, BIOS 0705 12/05/2013 [ 5.720382] 0000000000000009 ffff8803ea39bc98 ffffffff817c0694 0000000000000002 [ 5.720383] ffff8803ea39bce8 ffff8803ea39bcd8 ffffffff81073d8a 0000000000000001 [ 5.720384] ffff8803eb184000 ffff8800d7804800 0000000000000000 0000000000000000 [ 5.720385] Call Trace: [ 5.720390] [<ffffffff817c0694>] dump_stack+0x4f/0x90 [ 5.720393] [<ffffffff81073d8a>] warn_slowpath_common+0x8a/0xe0 [ 5.720395] [<ffffffff81073e26>] warn_slowpath_fmt+0x46/0x50 [ 5.720410] [<ffffffffa040bdba>] intel_check_page_flip+0xaa/0xf0 [i915] [ 5.720420] [<ffffffffa03d7888>] ironlake_irq_handler+0x2e8/0x1000 [i915] [ 5.720423] [<ffffffff813e7787>] ? debug_smp_processor_id+0x17/0x20 [ 5.720424] [<ffffffff81074512>] ? pin_current_cpu+0x92/0x1d0 [ 5.720426] [<ffffffff810d0690>] ? irq_thread_fn+0x50/0x50 [ 5.720428] [<ffffffff810d06b7>] irq_forced_thread_fn+0x27/0x80 [ 5.720429] [<ffffffff810d0c4f>] irq_thread+0x10f/0x160 [ 5.720430] [<ffffffff810d0740>] ? wake_threads_waitq+0x30/0x30 [ 5.720432] [<ffffffff810d0b40>] ? irq_thread_check_affinity+0x90/0x90 [ 5.720433] [<ffffffff81093d7b>] kthread+0xbb/0xe0 [ 5.720434] [<ffffffff81093cc0>] ? kthread_worker_fn+0x1a0/0x1a0 [ 5.720436] [<ffffffff817c6bd8>] ret_from_fork+0x58/0x90 [ 5.720437] [<ffffffff81093cc0>] ? kthread_worker_fn+0x1a0/0x1a0 [ 5.720437] ---[ end trace 0000000000000002 ]--- There seem to be few past bug reports on this issue. Has this been fixed? Should I be concerned about this? thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh(a)osg.samsung.com | (970) 217-8978

3 2

[PULL] Add virtio gpu driver.
by Gerd Hoffmann 03 Jun '15

03 Jun '15

Hi Dave, Here comes the pull request for the virtio-gpu driver, as discusses yesterday. cheers, Gerd The following changes since commit 95872b49ce14169a1ce0dfaac62e284cbdc6eea8: Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next (2015-05-29 09:19:59 +1000) are available in the git repository at: git://git.kraxel.org/linux virtio-gpu-drm-next for you to fetch changes up to 4ad6ee91aa9f730136eccc02dfc1df4ad56baa57: Add MAINTAINERS entry for virtio-gpu. (2015-06-03 14:17:38 +0200) ---------------------------------------------------------------- Dave Airlie (1): Add virtio gpu driver. Gerd Hoffmann (3): break kconfig dependency loop drm_vblank_get: don't WARN_ON in case vblanks are not initialized Add MAINTAINERS entry for virtio-gpu. MAINTAINERS | 9 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_irq.c | 3 + drivers/gpu/drm/virtio/Kconfig | 14 + drivers/gpu/drm/virtio/Makefile | 11 + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 64 ++++ drivers/gpu/drm/virtio/virtgpu_display.c | 473 ++++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 91 +++++ drivers/gpu/drm/virtio/virtgpu_drv.c | 136 +++++++ drivers/gpu/drm/virtio/virtgpu_drv.h | 350 ++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_fb.c | 431 ++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_fence.c | 119 ++++++ drivers/gpu/drm/virtio/virtgpu_gem.c | 140 +++++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 173 +++++++++ drivers/gpu/drm/virtio/virtgpu_object.c | 170 +++++++++ drivers/gpu/drm/virtio/virtgpu_plane.c | 120 ++++++ drivers/gpu/drm/virtio/virtgpu_ttm.c | 469 +++++++++++++++++++++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 614 +++++++++++++++++++++++++++++++ drivers/iommu/Kconfig | 3 + drivers/media/platform/Kconfig | 2 +- include/drm/drmP.h | 1 + include/uapi/linux/Kbuild | 1 + include/uapi/linux/virtio_gpu.h | 204 ++++++++++ include/uapi/linux/virtio_ids.h | 1 + 25 files changed, 3601 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/virtio/Kconfig create mode 100644 drivers/gpu/drm/virtio/Makefile create mode 100644 drivers/gpu/drm/virtio/virtgpu_debugfs.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_display.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.h create mode 100644 drivers/gpu/drm/virtio/virtgpu_fb.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_fence.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_gem.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_kms.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_object.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_plane.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c create mode 100644 drivers/gpu/drm/virtio/virtgpu_vq.c create mode 100644 include/uapi/linux/virtio_gpu.h

1 0

Re: [PATCH 5/7] drm/i915: Add pipe level Gamma correction for CHV/BSW
by Jindal, Sonika 03 Jun '15

03 Jun '15

On 6/2/2015 1:22 AM, Kausal Malladi wrote: > From: Kausal Malladi <Kausal.Malladi(a)intel.com> > > This patch does the following: > 1. Adds the core function to program Gamma correction values for CHV/BSW > platform > 2. Adds Gamma correction macros/defines > 3. Adds drm_mode_crtc_update_color_property function, which replaces the > old blob for the property with the new one > 4. Adds a pointer to hold blob for Gamma property in drm_crtc > > Signed-off-by: Shashank Sharma <shashank.sharma(a)intel.com> > Signed-off-by: Kausal Malladi <Kausal.Malladi(a)intel.com> > --- > drivers/gpu/drm/drm_crtc.c | 14 ++ > drivers/gpu/drm/i915/intel_color_manager.c | 194 ++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_color_manager.h | 61 +++++++++ > drivers/gpu/drm/i915/intel_display.c | 9 +- > include/drm/drm_crtc.h | 8 ++ > 5 files changed, 285 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 77f87b2..50b925b 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -4691,6 +4691,20 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector) > } > EXPORT_SYMBOL(drm_mode_connector_set_tile_property); > > +int drm_mode_crtc_update_color_property(struct drm_device *dev, > + struct drm_property_blob **blob, > + size_t length, const void *color_data, > + struct drm_mode_object *obj_holds_id, > + struct drm_property *prop_holds_id) This can be simplified.. No need to pass so many params. > +{ > + int ret; > + > + ret = drm_property_replace_global_blob(dev, > + blob, length, color_data, obj_holds_id, prop_holds_id); > + > + return ret; > +} > + Split the patch to add drm specific changes in a separate patch. Also you need to export this function. Will review the rest of the file in some time. Regards, Sonika > /** > * drm_mode_connector_update_edid_property - update the edid property of a connector > * @connector: drm connector > diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c > index b0eb679..f46857f 100644 > --- a/drivers/gpu/drm/i915/intel_color_manager.c > +++ b/drivers/gpu/drm/i915/intel_color_manager.c > @@ -27,6 +27,200 @@ > > #include "intel_color_manager.h" > > +int chv_set_gamma(struct drm_device *dev, uint64_t blob_id, > + struct drm_crtc *crtc) > +{ > + struct drm_intel_gamma *gamma_data; > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_property_blob *blob; > + struct drm_mode_config *config = &dev->mode_config; > + > + u32 cgm_control_reg = 0; > + u32 cgm_gamma_reg = 0; > + u32 reg, val, pipe; > + u16 red, green, blue; > + struct rgb_pixel correct_rgb; > + u32 count = 0; > + struct rgb_pixel *correction_values = NULL; > + u32 num_samples; > + u32 word; > + u32 palette; > + int ret = 0, length; > + > + blob = drm_property_lookup_blob(dev, blob_id); > + if (!blob) { > + DRM_ERROR("Invalid Blob ID\n"); > + return -EINVAL; > + } > + > + gamma_data = kzalloc(sizeof(struct drm_intel_gamma), GFP_KERNEL); > + if (!gamma_data) { > + DRM_ERROR("Memory unavailable\n"); > + return -ENOMEM; > + } > + gamma_data = (struct drm_intel_gamma *)blob->data; > + pipe = to_intel_crtc(crtc)->pipe; > + num_samples = gamma_data->num_samples; > + length = num_samples * sizeof(struct rgb_pixel); > + > + if (gamma_data->gamma_precision == I915_GAMMA_PRECISION_UNKNOWN) { > + > + /* Disable Gamma functionality on Pipe - CGM Block */ > + cgm_control_reg = I915_READ(_PIPE_CGM_CONTROL(pipe)); > + cgm_control_reg &= ~CGM_GAMMA_EN; > + I915_WRITE(_PIPE_CGM_CONTROL(pipe), cgm_control_reg); > + > + DRM_DEBUG_DRIVER("Gamma disabled on Pipe %c\n", > + pipe_name(pipe)); > + ret = 0; > + goto release_memory; > + } > + > + if (pipe >= CHV_MAX_PIPES) { > + DRM_ERROR("Incorrect Pipe ID\n"); > + ret = -EFAULT; > + goto release_memory; > + } > + > + correction_values = kzalloc(length, GFP_KERNEL); > + if (!correction_values) { > + DRM_ERROR("Out of Memory\n"); > + ret = -ENOMEM; > + goto release_memory; > + } > + > + ret = copy_from_user((void *)correction_values, > + (const void __user *)gamma_data->gamma_ptr, length); > + if (ret) { > + DRM_ERROR("Error copying user data\n"); > + ret = -EFAULT; > + goto release_memory; > + } > + > + ret = drm_mode_crtc_update_color_property(dev, > + &crtc->gamma_blob, length, (void *) correction_values, > + &crtc->base, config->gamma_property); > + if (ret) { > + DRM_ERROR("Error updating Gamma blob\n"); > + ret = -EFAULT; > + goto release_memory; > + } > + > + if (gamma_data->gamma_precision == I915_GAMMA_PRECISION_LEGACY) { > + > + if (num_samples != CHV_8BIT_GAMMA_MAX_VALS) { > + DRM_ERROR("Incorrect number of samples received\n"); > + goto release_memory; > + } > + > + /* First, disable CGM Gamma, if already set */ > + cgm_control_reg = I915_READ(_PIPE_CGM_CONTROL(pipe)); > + cgm_control_reg &= ~CGM_GAMMA_EN; > + I915_WRITE(_PIPE_CGM_CONTROL(pipe), cgm_control_reg); > + > + /* Enable (Legacy) Gamma on Pipe gamma_data.__obj_id */ > + palette = _PIPE_GAMMA_BASE(pipe); > + > + count = 0; > + while (count < num_samples) { > + correct_rgb = correction_values[count]; > + blue = correct_rgb.blue; > + green = correct_rgb.green; > + red = correct_rgb.red; > + > + blue = blue >> CHV_8BIT_GAMMA_MSB_SHIFT; > + green = green >> CHV_8BIT_GAMMA_MSB_SHIFT; > + red = red >> CHV_8BIT_GAMMA_MSB_SHIFT; > + > + /* Red (23:16), Green (15:8), Blue (7:0) */ > + word = (red << CHV_8BIT_GAMMA_SHIFT_RED_REG) | > + (green << > + CHV_8BIT_GAMMA_SHIFT_GREEN_REG) | > + blue; > + I915_WRITE(palette, word); > + > + palette += 4; > + count++; > + } > + reg = PIPECONF(pipe); > + val = I915_READ(reg) | PIPECONF_GAMMA; > + I915_WRITE(reg, val); > + > + DRM_DEBUG_DRIVER("Gamma LUT loaded successfully for Pipe %c\n", > + pipe_name(pipe)); > + ret = 0; > + goto release_memory; > + } else if (gamma_data->gamma_precision == I915_GAMMA_PRECISION_10BIT) { > + > + if (num_samples != CHV_10BIT_GAMMA_MAX_VALS) { > + DRM_ERROR("Incorrect number of samples received\n"); > + ret = -EINVAL; > + goto release_memory; > + } > + > + /* Enable (CGM) Gamma on Pipe gamma_data.__obj_id */ > + cgm_gamma_reg = _PIPE_GAMMA_BASE(pipe); > + > + count = 0; > + while (count < num_samples) { > + correct_rgb = correction_values[count]; > + blue = correct_rgb.blue; > + green = correct_rgb.green; > + red = correct_rgb.red; > + > + blue = blue >> CHV_10BIT_GAMMA_MSB_SHIFT; > + green = green >> CHV_10BIT_GAMMA_MSB_SHIFT; > + red = red >> CHV_10BIT_GAMMA_MSB_SHIFT; > + > + /* Green (25:16) and Blue (9:0) to be written */ > + word = (green << CHV_GAMMA_SHIFT_GREEN) | blue; > + I915_WRITE(cgm_gamma_reg, word); > + cgm_gamma_reg += 4; > + > + /* Red (9:0) to be written */ > + word = red; > + I915_WRITE(cgm_gamma_reg, word); > + > + cgm_gamma_reg += 4; > + count++; > + } > + > + I915_WRITE(_PIPE_CGM_CONTROL(pipe), > + I915_READ(_PIPE_CGM_CONTROL(pipe)) > + | CGM_GAMMA_EN); > + > + DRM_DEBUG_DRIVER("Gamma LUT loaded successfully for Pipe %c\n", > + pipe_name(pipe)); > + ret = 0; > + goto release_memory; > + } else { > + DRM_ERROR("Invalid gamma_level received\n"); > + ret = -EFAULT; > + goto release_memory; > + } > + > +release_memory: > + > + /* kfree is NULL protected */ > + kfree(correction_values); > + kfree(gamma_data); > + > + return ret; > +} > + > +int intel_color_manager_set_gamma(struct drm_device *dev, > + struct drm_mode_object *obj, uint64_t blob_id) > +{ > + struct drm_crtc *crtc = obj_to_crtc(obj); > + > + if (IS_CHERRYVIEW(dev)) > + return chv_set_gamma(dev, blob_id, crtc); > + else > + DRM_ERROR("This platform is not yet supported\n"); > + > + return -EINVAL; > +} > + > void intel_color_manager_attach(struct drm_device *dev, > struct drm_mode_object *mode_obj) > { > diff --git a/drivers/gpu/drm/i915/intel_color_manager.h b/drivers/gpu/drm/i915/intel_color_manager.h > index e5876fa..2c8b7da 100644 > --- a/drivers/gpu/drm/i915/intel_color_manager.h > +++ b/drivers/gpu/drm/i915/intel_color_manager.h > @@ -27,8 +27,69 @@ > > #include <drm/drmP.h> > #include <drm/drm_crtc_helper.h> > +#include "i915_drv.h" > + > +/* Color Management macros for Gamma */ > +#define I915_GAMMA_FLAG_DEGAMMA (1 << 0) > +#define I915_PIPE_GAMMA (1 << 0) > +#define I915_PLANE_GAMMA (1 << 1) > +#define I915_GAMMA_PRECISION_UNKNOWN 0 > +#define I915_GAMMA_PRECISION_CURRENT 0xFFFFFFFF > +#define I915_GAMMA_PRECISION_LEGACY (1 << 0) > +#define I915_GAMMA_PRECISION_10BIT (1 << 1) > +#define I915_GAMMA_PRECISION_12BIT (1 << 2) > +#define I915_GAMMA_PRECISION_14BIT (1 << 3) > +#define I915_GAMMA_PRECISION_16BIT (1 << 4) > + > +#define CHV_MAX_PIPES 3 > +#define CHV_DISPLAY_BASE 0x180000 > + > +struct rgb_pixel { > + u16 red; > + u16 green; > + u16 blue; > +}; > + > +/* CHV CGM Block */ > +/* Bit 2 to be enabled in CGM block for CHV */ > +#define CGM_GAMMA_EN 4 > + > +/* Gamma */ > +#define CHV_GAMMA_VALS 257 > +#define CHV_10BIT_GAMMA_MAX_INDEX 256 > +#define CHV_8BIT_GAMMA_MAX_INDEX 255 > +#define CHV_10BIT_GAMMA_MSB_SHIFT 6 > +#define CHV_GAMMA_EVEN_MASK 0xFF > +#define CHV_GAMMA_SHIFT_BLUE 0 > +#define CHV_GAMMA_SHIFT_GREEN 16 > +#define CHV_GAMMA_SHIFT_RED 0 > +#define CHV_GAMMA_ODD_SHIFT 8 > +#define CHV_CLRMGR_GAMMA_GCMAX_SHIFT 17 > +#define CHV_GAMMA_GCMAX_MASK 0x1FFFF > +#define CHV_GAMMA_GCMAX_MAX 0x400 > +#define CHV_10BIT_GAMMA_MAX_VALS (CHV_10BIT_GAMMA_MAX_INDEX + 1) > +#define CHV_8BIT_GAMMA_MAX_VALS (CHV_8BIT_GAMMA_MAX_INDEX + 1) > +#define CHV_8BIT_GAMMA_MSB_SHIFT 8 > +#define CHV_8BIT_GAMMA_SHIFT_GREEN_REG 8 > +#define CHV_8BIT_GAMMA_SHIFT_RED_REG 16 > + > +/* CGM Registers */ > +#define CGM_OFFSET 0x2000 > +#define GAMMA_OFFSET 0x2000 > +#define PIPEA_CGM_CONTROL (CHV_DISPLAY_BASE + 0x67A00) > +#define PIPEA_CGM_GAMMA_MIN (CHV_DISPLAY_BASE + 0x67000) > +#define _PIPE_CGM_CONTROL(pipe) \ > + (PIPEA_CGM_CONTROL + (pipe * CGM_OFFSET)) > +#define _PIPE_GAMMA_BASE(pipe) \ > + (PIPEA_CGM_GAMMA_MIN + (pipe * GAMMA_OFFSET)) > > /* Generic Function prototypes */ > int intel_color_manager_init(struct drm_device *dev); > void intel_color_manager_attach(struct drm_device *dev, > struct drm_mode_object *mode_obj); > +extern int intel_color_manager_set_gamma(struct drm_device *dev, > + struct drm_mode_object *obj, uint64_t blob_id); > + > +/* Platform specific function prototypes */ > +extern int chv_set_gamma(struct drm_device *dev, > + uint64_t blob_id, struct drm_crtc *crtc); > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 21e67da..876fde0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -12981,7 +12981,14 @@ out: > static int intel_crtc_set_property(struct drm_crtc *crtc, > struct drm_property *property, uint64_t val) > { > - DRM_DEBUG_KMS("Unknown crtc property '%s'\n", property->name); > + struct drm_device *dev = crtc->dev; > + struct drm_mode_config *config = &dev->mode_config; > + > + if (property == config->gamma_property) > + return intel_color_manager_set_gamma(dev, &crtc->base, val); > + else > + DRM_DEBUG_KMS("Unknown crtc property '%s'\n", property->name); > + > return -EINVAL; > } > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 4085339..654c098 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -483,6 +483,9 @@ struct drm_crtc { > * acquire context. > */ > struct drm_modeset_acquire_ctx *acquire_ctx; > + > + /* Color Management Blobs */ > + struct drm_property_blob *gamma_blob; > }; > > /** > @@ -1341,6 +1344,11 @@ extern void drm_mode_config_cleanup(struct drm_device *dev); > extern int drm_mode_connector_set_path_property(struct drm_connector *connector, > const char *path); > int drm_mode_connector_set_tile_property(struct drm_connector *connector); > +extern int drm_mode_crtc_update_color_property(struct drm_device *dev, > + struct drm_property_blob **blob, > + size_t length, const void *color_data, > + struct drm_mode_object *obj_holds_id, > + struct drm_property *prop_holds_id); > extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, > const struct edid *edid); > >

3 3

[PATCH] drm/exynos: add a dependency on FB_S3C to DECON driver
by Inki Dae 03 Jun '15

03 Jun '15

This patch makes one of Linux framebuffer and DRM CRTC drivers to be enabled. Display controllers, FIMD and DECON, can be controlled by Linux framebuffer or DRM CRTC drivers so only one of them should be enabled. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/exynos/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 0a67803..8203283 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -26,7 +26,7 @@ config DRM_EXYNOS_FIMD config DRM_EXYNOS7_DECON bool "Exynos DRM DECON" - depends on DRM_EXYNOS + depends on DRM_EXYNOS && !FB_S3C select FB_MODE_HELPERS help Choose this option if you want to use Exynos DECON for DRM. -- 1.7.9.5

2 1

[PATCH] drm/exynos: vidi: remove unused varables
by Inki Dae 03 Jun '15

03 Jun '15

This patch removes unnsed varables in vidi_disable function. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index abe4ee0..16dc68c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -179,8 +179,6 @@ static void vidi_enable(struct exynos_drm_crtc *crtc) static void vidi_disable(struct exynos_drm_crtc *crtc) { struct vidi_context *ctx = crtc->ctx; - struct exynos_drm_plane *plane; - int i; mutex_lock(&ctx->lock); -- 1.7.9.5

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2015